ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/raspi: Use RaspiProcessorId to set the firmware load address 

The firmware load address depends on the SoC ("processor id") used,
not on the version of the board.

Suggested-by: Luc Michel <luc.michel@greensocs.com>
Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200924111808.77168-8-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:07 +02:00 committed by Peter Maydell
parent 696788d6a9
commit 1af702690e
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

@ -238,7 +238,8 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
* the normal Linux boot process * the normal Linux boot process
*/ */
if (machine->firmware) { if (machine->firmware) {
hwaddr firmware_addr = version == 3 ? FIRMWARE_ADDR_3 : FIRMWARE_ADDR_2; hwaddr firmware_addr = processor_id <= PROCESSOR_ID_BCM2836
? FIRMWARE_ADDR_2 : FIRMWARE_ADDR_3;
/* load the firmware image (typically kernel.img) */ /* load the firmware image (typically kernel.img) */
r = load_image_targphys(machine->firmware, firmware_addr, r = load_image_targphys(machine->firmware, firmware_addr,
ram_size - firmware_addr); ram_size - firmware_addr);