From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 20 Apr 2018 10:03:48 +0000 (+0300)
Subject: rpi: Fix fdt_high & initrd_high for 64-bit builds
X-Git-Tag: v2018.07-rc1~11^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=722742598bb1402caa0c4a6139d7b30ad856a0f2;p=u-boot

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 <tuomas@tuxera.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

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" \