[U-Boot] [PATCH 5/6] ARM: tegra: Skip FDT and initrd relocation on 64-bit

Thierry Reding thierry.reding at gmail.com
Fri Mar 20 13:24:21 CET 2015


From: Thierry Reding <treding at nvidia.com>

U-Boot inspects the initrd_high and fdt_high environment variables and
skips relocation of the initial ramdisk and FDT, respectively, if these
variables are set to all-ones. The Tegra configuration sets these
variables to ffffffff in the default environment. However on 64-bit SoC
generations this will cause the all-ones match to fail, so extend these
variables to 64 ones on 64-bit SoCs.

Cc: Tom Warren <twarren at nvidia.com>
Signed-off-by: Thierry Reding <treding at nvidia.com>
---
 include/configs/tegra-common-post.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index c3ad8beb903d..c1272a0d5b64 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -50,11 +50,19 @@
 #define BOARD_EXTRA_ENV_SETTINGS
 #endif
 
+#ifdef CONFIG_ARM64
+#define FDT_HIGH "ffffffffffffffff"
+#define INITRD_HIGH "ffffffffffffffff"
+#else
+#define FDT_HIGH "ffffffff"
+#define INITRD_HIGH "ffffffff"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	TEGRA_DEVICE_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
-	"fdt_high=ffffffff\0" \
-	"initrd_high=ffffffff\0" \
+	"fdt_high=" FDT_HIGH "\0" \
+	"initrd_high=" INITRD_HIGH "\0" \
 	BOOTENV \
 	BOARD_EXTRA_ENV_SETTINGS
 
-- 
2.3.2



More information about the U-Boot mailing list