From 722742598bb1402caa0c4a6139d7b30ad856a0f2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 20 Apr 2018 13:03:48 +0300 Subject: [PATCH] rpi: Fix fdt_high & initrd_high for 64-bit builds The magic value that disables relocation is dependent on the CPU word size, so the current 'ffffffff' is doing the wrong thing on aarch64. Signed-off-by: Tuomas Tynkkynen Signed-off-by: Alexander Graf --- include/configs/rpi.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 649a425bcd..a97550b732 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -90,6 +90,14 @@ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" +#ifdef CONFIG_ARM64 +#define FDT_HIGH "ffffffffffffffff" +#define INITRD_HIGH "ffffffffffffffff" +#else +#define FDT_HIGH "ffffffff" +#define INITRD_HIGH "ffffffff" +#endif + /* * Memory layout for where various images get loaded by boot scripts: * @@ -132,8 +140,8 @@ * large initrds before they start colliding with U-Boot. */ #define ENV_MEM_LAYOUT_SETTINGS \ - "fdt_high=ffffffff\0" \ - "initrd_high=ffffffff\0" \ + "fdt_high=" FDT_HIGH "\0" \ + "initrd_high=" INITRD_HIGH "\0" \ "kernel_addr_r=0x00080000\0" \ "scriptaddr=0x02400000\0" \ "pxefile_addr_r=0x02500000\0" \ -- 2.25.1