| Message ID | 1475733316-9508-3-git-send-email-hs@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Thu, Oct 06, 2016 at 07:55:16AM +0200, Heiko Schocher wrote: > Move SYS_OS_BASE to Kconfig and cleanup existing > uses. > > Signed-off-by: Heiko Schocher <hs@denx.de> After also fixing a4m2k (a variant of a3m071 that I guess moveconfig missed due to it being selected via CONFIG_SYS_EXTRA_OPTIONS), applied to u-boot/master, thanks!
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 5e2890e..36544cc 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -367,6 +367,16 @@ config SPL_OS_BOOT 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_BOOTDELAY=3 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=y 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 8514b0e..c437c4a 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -331,7 +331,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)
Move SYS_OS_BASE to Kconfig and cleanup existing uses. Signed-off-by: Heiko Schocher <hs@denx.de> --- common/spl/Kconfig | 10 ++++++++++ configs/a3m071_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + include/configs/a3m071.h | 1 - include/configs/microblaze-generic.h | 2 -- 5 files changed, 12 insertions(+), 3 deletions(-)