summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2016-04-15 20:42:59 -0600
committerTom Rini <trini@konsulko.com>2016-04-16 09:02:17 -0400
commit108f8418597350bd98357f25acaa8ab8a0435779 (patch)
tree787e568539c9fe73b1487e30acdcd7bbdedc2843
parent7e019daf7ab9dca3bf782d6de866b36d44ede95e (diff)
downloadtalos-obmc-uboot-108f8418597350bd98357f25acaa8ab8a0435779.tar.gz
talos-obmc-uboot-108f8418597350bd98357f25acaa8ab8a0435779.zip
ARM: rpi: fix 64-bit CONFIG_SYS_TEXT_BASE
The Pi firmware has changed the default "kernel" load address for 64-bit mode. The authors have confirmed that this is a deliberate and long-term change. Adapt U-Boot to the new value. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
-rw-r--r--include/configs/rpi.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index b83d622b97..19ca606214 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -48,7 +48,11 @@
/* Memory layout */
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#ifdef CONFIG_ARM64
+#define CONFIG_SYS_TEXT_BASE 0x00080000
+#else
#define CONFIG_SYS_TEXT_BASE 0x00008000
+#endif
#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
/*
* The board really has 256M. However, the VC (VideoCore co-processor) shares
OpenPOWER on IntegriCloud