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>
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index 37b375c..dbd1f17 100644
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -66,6 +66,36 @@
pr_warn("\"fdt_file\" environment variable was not set correctly\n");
}
+static void uniphier_set_env_addr(const char *env, const char *offset_env)
+{
+ unsigned long offset = 0;
+ const char *str;
+ char *end;
+ int ret;
+
+ if (env_get(env))
+ return; /* do nothing if it is already set */
+
+ if (offset_env) {
+ str = env_get(offset_env);
+ if (!str)
+ goto fail;
+
+ offset = simple_strtoul(str, &end, 16);
+ if (*end)
+ goto fail;
+ }
+
+ ret = env_set_hex(env, gd->ram_base + offset);
+ if (ret)
+ goto fail;
+
+ return;
+
+fail:
+ pr_warn("\"%s\" environment variable was not set correctly\n", env);
+}
+
int board_late_init(void)
{
puts("MODE: ");
@@ -105,5 +135,7 @@
uniphier_set_env_fdt_file();
+ uniphier_set_env_addr("loadaddr", "loadaddr_offset");
+
return 0;
}