spl: move SYS_OS_BASE to Kconfig
Move SYS_OS_BASE to Kconfig and cleanup existing
uses.
Signed-off-by: Heiko Schocher <hs@denx.de>
[trini: Also migrate a4m2k]
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 74f7abc..bb99f1f 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -389,6 +389,16 @@
Enable booting directly to an OS from SPL.
for more info read doc/README.falcon
+if SPL_OS_BOOT
+config SYS_OS_BASE
+ hex "addr, where OS is found"
+ depends on SPL && SPL_NOR_SUPPORT
+ help
+ Specify the address, where the OS image is found, which
+ gets booted.
+
+endif # SPL_OS_BOOT
+
config SPL_POST_MEM_SUPPORT
bool "Support POST drivers"
depends on SPL
diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index 5356489..ae696b5 100644
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -11,6 +11,7 @@
CONFIG_SPL=y
CONFIG_SPL_NOR_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_OS_BASE=0xfc200000
CONFIG_HUSH_PARSER=y
CONFIG_LOOPW=y
# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index c54689d..144291e 100644
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -12,6 +12,7 @@
CONFIG_SPL=y
CONFIG_SPL_NOR_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_OS_BASE=0xfc200000
CONFIG_HUSH_PARSER=y
CONFIG_LOOPW=y
# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index bc97f60..3dbf48a 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -16,6 +16,7 @@
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_NOR_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_OS_BASE=0x2c060000
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot-mONStR> "
CONFIG_CMD_ASKENV=y
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index 93be3d6..ee75785 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -330,7 +330,6 @@
#undef CONFIG_BOOTARGS
-#define CONFIG_SYS_OS_BASE 0xfc200000
#define CONFIG_SYS_FDT_BASE 0xfc1e0000
#define CONFIG_SYS_FDT_SIZE (16<<10)
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 32b0c62..2a7006f 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -293,8 +293,6 @@
/* for booting directly linux */
-#define CONFIG_SYS_OS_BASE (CONFIG_SYS_FLASH_BASE + \
- 0x60000)
#define CONFIG_SYS_FDT_BASE (CONFIG_SYS_FLASH_BASE + \
0x40000)
#define CONFIG_SYS_FDT_SIZE (16<<10)