Re: [PATCH v3 7/8] hw/arm/raspi: Use RaspiProcessorId to set the firmware load address

[Luc Michel]

Hi Phil,

Just two small typos in the commit message.

On 9/21/20 9:56 AM, Philippe Mathieu-Daudé wrote:

The firmware load address depends of the SoC ("processor id") used,

"depends on"

not of the version of the board.

"not on"

Otherwise:

Reviewed-by: Luc Michel <luc.mic...@greensocs.com>

Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
---
  hw/arm/raspi.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 0d8e5a34c78..ae98a2fbfca 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -238,7 +238,8 @@ static void setup_boot(MachineState *machine, int version, 
size_t ram_size)
       * the normal Linux boot process
       */
      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) */
          r = load_image_targphys(machine->firmware, firmware_addr,
                                  ram_size - firmware_addr);