aboutsummaryrefslogtreecommitdiff
path: root/include/configs/uniphier.h
diff options
context:
space:
mode:
authorMasahiro Yamada2019-07-10 20:07:48 +0900
committerMasahiro Yamada2019-07-10 22:42:07 +0900
commit3cc936d8ab508855b095bbd7fecb02b21cf82f32 (patch)
tree3f6d78a628db83704009792325c71e3a0afeedd4 /include/configs/uniphier.h
parent72cd83ab81969b970247c6c74e710cdce2c2bdae (diff)
ARM: uniphier: set loadaddr at boot-time
The base of DRAM will be changed for the next generation SoC. To support it along with existing SoCs in the single defconfig, set 'loadaddr' at boot-time by adding the offset to the DRAM base. CONFIG_SYS_LOAD_ADDR is still hard-coded for compilation, but the value from environment variable 'loadaddr' should be used. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include/configs/uniphier.h')
-rw-r--r--include/configs/uniphier.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 46d576d54aa..6d3d9b31888 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -98,8 +98,7 @@
#define CONFIG_GATEWAYIP 192.168.11.1
#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_LOADADDR 0x85000000
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR 0x85000000
#define CONFIG_SYS_BOOTM_LEN (32 << 20)
#if defined(CONFIG_ARM64)
@@ -158,6 +157,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"initrd_high=0xffffffffffffffff\0" \
+ "loadaddr_offset=0x05000000\0" \
"script=boot.scr\0" \
"scriptaddr=0x85000000\0" \
"nor_base=0x42000000\0" \