haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hw/arm/raspi: Load the firmware on the first core

Browse source 
The 'first_cpu' is more a QEMU accelerator-related concept
than a variable the machine requires to use.
Since the machine is aware of its CPUs, directly use the
first one to load the firmware.

Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200924111808.77168-3-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-09-24 13:18:02 +02:00 committed by Peter Maydell
parent 62f06f7137
commit 02058e4b40
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hw/arm/raspi.c
View file

@ -205,6 +205,7 @@ static void reset_secondary(ARMCPU *cpu, const struct arm_boot_info *info)
static void setup_boot(MachineState *machine, int version, size_t ram_size)
{
RaspiMachineState *s = RASPI_MACHINE(machine);
static struct arm_boot_info binfo;
int r;
@ -253,7 +254,7 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
binfo.firmware_loaded = true;
}
arm_load_kernel(ARM_CPU(first_cpu), machine, &binfo);
arm_load_kernel(&s->soc.cpu[0].core, machine, &binfo);
}
static void raspi_machine_init(MachineState *machine)