* [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig
@ 2016-10-06 5:55 Heiko Schocher
2016-10-06 5:55 ` [U-Boot] [PATCH v1 1/2] spl: move SPL_OS_BOOT " Heiko Schocher
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Heiko Schocher @ 2016-10-06 5:55 UTC (permalink / raw)
To: u-boot
This 2 patches move SPL_OS_BOOT and SYS_OS_BASE
to Kconfig. Checked with tbot testcase:
https://github.com/hsdenx/tbot/blob/master/src/tc/uboot/tc_uboot_check_kconfig.py
result:
Boards : 1213
compile err : 13
not checked : 1
U-Boot good : 1185 bad 14
SPL good : 1199 bad 0
Boards not checked, as they had compile errors:
['adp-ag101p', 'bf533-stamp', 'cm-bf527', 'colibri_pxa270', 'omap4_sdp4430', 'openrisc-generic', 'qemu-x86_efi_payload64', 'sandbox', 'sandbox_noblk', 'sandbox_spl', 'smdk5250', 'snow', 'spring']
Boards not checked, as no toolchain:
['xtfpga']
Boards which have differences in the resulting U-Boot bin:
['am335x_baltos', 'am335x_evm_spiboot', 'am335x_igep0033', 'cm_t335', 'cm_t43', 'cm_t54', 'duovero', 'k2e_evm', 'k2g_evm', 'k2hk_evm', 'k2l_evm', 'omap3_pandora', 'omap3_zoom1', 'pepper']
I looked into the Boards with differences in the resulting U-Boot bin,
but could not find the reason, why they are different :-(
for example am335x_baltos:
$ make am335x_baltos_defconfig
$ cp .config config_org
$ make mrproper
- applied the 2 patches
$ make am335x_baltos_defconfig
$ diff -pruN config_org .config > gnlmpf
$ cat gnlmpf
--- config_org 2016-10-06 06:58:01.636514195 +0200
+++ .config 2016-10-06 06:58:36.459726538 +0200
@@ -270,6 +270,7 @@ CONFIG_SPL_MTD_SUPPORT=y
# CONFIG_SPL_NO_CPU_SUPPORT is not set
# CONFIG_SPL_NOR_SUPPORT is not set
# CONFIG_SPL_ONENAND_SUPPORT is not set
+# CONFIG_SPL_OS_BOOT is not set
# CONFIG_SPL_POST_MEM_SUPPORT is not set
# CONFIG_SPL_SATA_SUPPORT is not set
# CONFIG_SPL_USBETH_SUPPORT is not set
change in this patchserie for this board:
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 58df571..e69c1b6 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -54,7 +54,6 @@
#undef CONFIG_SYS_OMAP24_I2C_SPEED
#define CONFIG_SYS_OMAP24_I2C_SPEED 1000
-#undef CONFIG_SPL_OS_BOOT
#ifdef CONFIG_NAND
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000
#ifdef CONFIG_SPL_OS_BOOT
Seems Ok to me, but I get a different md5sum for the U-Boot bin ...
Or for example the omap3_pandora board:
$ make omap3_pandora_defconfig
$ cp .config config_org
$ make mrproper
- applied the 2 patches
$ make omap3_pandora_defconfig
$ diff -pruN config_org .config > gnlmpf
$ cat gnlmpf
$
No difference in the .config before and after this patch,
but a difference in the resulting binary ... ?
Seems to me SPL_OS_BOOT, which is a SPL config option
has somewhere an influence to the U-Boot binary ...
Any ideas whats going on here?
Hmm... looking into ".config" after an "make omap3_pandora_defconfig"
There are a lot of CONFIG_SPL symbols defined, but:
#
# SPL / TPL
#
CONFIG_SUPPORT_SPL=y
# CONFIG_SPL is not set
This seems bogus to me! SPL support is deactivated, but
a lot of CONFIG_SPL_* symbols are activated! For example
I find in .config:
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
Does currently the omap3_pandora board boot with
"Prepare v2016.11-rc1" ?
Heiko Schocher (2):
spl: move SPL_OS_BOOT to Kconfig
spl: move SYS_OS_BASE to Kconfig
common/spl/Kconfig | 18 ++++++++++++++++++
configs/a3m071_defconfig | 2 ++
configs/a4m2k_defconfig | 1 +
configs/am335x_boneblack_defconfig | 3 ++-
configs/am335x_boneblack_vboot_defconfig | 3 ++-
configs/am335x_evm_defconfig | 1 +
configs/am335x_evm_nor_defconfig | 1 +
configs/am335x_evm_usbspl_defconfig | 1 +
configs/am335x_shc_defconfig | 3 ++-
configs/am335x_shc_ict_defconfig | 3 ++-
configs/am335x_shc_netboot_defconfig | 3 ++-
configs/am335x_shc_prompt_defconfig | 3 ++-
configs/am335x_shc_sdboot_defconfig | 3 ++-
configs/am335x_shc_sdboot_prompt_defconfig | 3 ++-
configs/am335x_sl50_defconfig | 3 ++-
configs/am43xx_evm_defconfig | 1 +
configs/am43xx_evm_ethboot_defconfig | 1 +
configs/am43xx_evm_usbhost_boot_defconfig | 1 +
configs/am57xx_evm_defconfig | 1 +
configs/am57xx_evm_nodt_defconfig | 1 +
configs/birdland_bav335a_defconfig | 3 ++-
configs/birdland_bav335b_defconfig | 3 ++-
configs/cairo_defconfig | 1 +
configs/devkit8000_defconfig | 1 +
configs/dra7xx_evm_defconfig | 1 +
configs/gwventana_defconfig | 1 +
configs/igep0020_defconfig | 1 +
configs/igep0030_defconfig | 1 +
configs/igep0030_nand_defconfig | 1 +
configs/igep0032_defconfig | 1 +
configs/ipam390_defconfig | 1 +
configs/microblaze-generic_defconfig | 2 ++
configs/omap3_beagle_defconfig | 1 +
configs/omap3_logic_defconfig | 1 +
configs/omap3_overo_defconfig | 1 +
configs/omap4_panda_defconfig | 1 +
configs/omap4_sdp4430_defconfig | 1 +
configs/omap5_uevm_defconfig | 1 +
configs/pcm051_rev1_defconfig | 3 ++-
configs/pcm051_rev3_defconfig | 3 ++-
configs/pengwyn_defconfig | 3 ++-
configs/twister_defconfig | 1 +
configs/xilinx_zynqmp_ep_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
configs/xilinx_zynqmp_zcu102_defconfig | 1 +
configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
configs/zynq_microzed_defconfig | 1 +
configs/zynq_picozed_defconfig | 1 +
configs/zynq_zc702_defconfig | 1 +
configs/zynq_zc706_defconfig | 1 +
configs/zynq_zc770_xm010_defconfig | 1 +
configs/zynq_zc770_xm011_defconfig | 1 +
configs/zynq_zc770_xm012_defconfig | 1 +
configs/zynq_zc770_xm013_defconfig | 1 +
configs/zynq_zed_defconfig | 1 +
configs/zynq_zybo_defconfig | 1 +
include/configs/a3m071.h | 2 --
include/configs/am335x_evm.h | 1 -
include/configs/am335x_igep0033.h | 1 -
include/configs/baltos.h | 1 -
include/configs/bav335x.h | 1 -
include/configs/brppt1.h | 1 -
include/configs/cm_t335.h | 1 -
include/configs/cm_t43.h | 1 -
include/configs/cm_t54.h | 2 --
include/configs/duovero.h | 1 -
include/configs/gw_ventana.h | 1 -
include/configs/ipam390.h | 1 -
include/configs/microblaze-generic.h | 3 ---
include/configs/omap3_zoom1.h | 1 -
include/configs/pepper.h | 1 -
include/configs/smartweb.h | 1 -
include/configs/taurus.h | 1 -
include/configs/ti_armv7_common.h | 3 ---
include/configs/ti_armv7_keystone2.h | 1 -
include/configs/twister.h | 1 -
include/configs/xilinx_zynqmp.h | 1 -
include/configs/zynq-common.h | 1 -
81 files changed, 92 insertions(+), 42 deletions(-)
--
2.5.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v1 1/2] spl: move SPL_OS_BOOT to Kconfig
2016-10-06 5:55 [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig Heiko Schocher
@ 2016-10-06 5:55 ` Heiko Schocher
2016-10-15 12:22 ` [U-Boot] [U-Boot,v1,1/2] " Tom Rini
2016-10-06 5:55 ` [U-Boot] [PATCH v1 2/2] spl: move SYS_OS_BASE " Heiko Schocher
2016-10-06 16:29 ` [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and " Andrew F. Davis
2 siblings, 1 reply; 8+ messages in thread
From: Heiko Schocher @ 2016-10-06 5:55 UTC (permalink / raw)
To: u-boot
Move SPL_OS_BOOT to Kconfig and cleanup existing
uses.
Signed-off-by: Heiko Schocher <hs@denx.de>
---
common/spl/Kconfig | 8 ++++++++
configs/a3m071_defconfig | 1 +
configs/a4m2k_defconfig | 1 +
configs/am335x_boneblack_defconfig | 3 ++-
configs/am335x_boneblack_vboot_defconfig | 3 ++-
configs/am335x_evm_defconfig | 1 +
configs/am335x_evm_nor_defconfig | 1 +
configs/am335x_evm_usbspl_defconfig | 1 +
configs/am335x_shc_defconfig | 3 ++-
configs/am335x_shc_ict_defconfig | 3 ++-
configs/am335x_shc_netboot_defconfig | 3 ++-
configs/am335x_shc_prompt_defconfig | 3 ++-
configs/am335x_shc_sdboot_defconfig | 3 ++-
configs/am335x_shc_sdboot_prompt_defconfig | 3 ++-
configs/am335x_sl50_defconfig | 3 ++-
configs/am43xx_evm_defconfig | 1 +
configs/am43xx_evm_ethboot_defconfig | 1 +
configs/am43xx_evm_usbhost_boot_defconfig | 1 +
configs/am57xx_evm_defconfig | 1 +
configs/am57xx_evm_nodt_defconfig | 1 +
configs/birdland_bav335a_defconfig | 3 ++-
configs/birdland_bav335b_defconfig | 3 ++-
configs/cairo_defconfig | 1 +
configs/devkit8000_defconfig | 1 +
configs/dra7xx_evm_defconfig | 1 +
configs/gwventana_defconfig | 1 +
configs/igep0020_defconfig | 1 +
configs/igep0030_defconfig | 1 +
configs/igep0030_nand_defconfig | 1 +
configs/igep0032_defconfig | 1 +
configs/ipam390_defconfig | 1 +
configs/microblaze-generic_defconfig | 1 +
configs/omap3_beagle_defconfig | 1 +
configs/omap3_logic_defconfig | 1 +
configs/omap3_overo_defconfig | 1 +
configs/omap4_panda_defconfig | 1 +
configs/omap4_sdp4430_defconfig | 1 +
configs/omap5_uevm_defconfig | 1 +
configs/pcm051_rev1_defconfig | 3 ++-
configs/pcm051_rev3_defconfig | 3 ++-
configs/pengwyn_defconfig | 3 ++-
configs/twister_defconfig | 1 +
configs/xilinx_zynqmp_ep_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
configs/xilinx_zynqmp_zcu102_defconfig | 1 +
configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
configs/zynq_microzed_defconfig | 1 +
configs/zynq_picozed_defconfig | 1 +
configs/zynq_zc702_defconfig | 1 +
configs/zynq_zc706_defconfig | 1 +
configs/zynq_zc770_xm010_defconfig | 1 +
configs/zynq_zc770_xm011_defconfig | 1 +
configs/zynq_zc770_xm012_defconfig | 1 +
configs/zynq_zc770_xm013_defconfig | 1 +
configs/zynq_zed_defconfig | 1 +
configs/zynq_zybo_defconfig | 1 +
include/configs/a3m071.h | 1 -
include/configs/am335x_evm.h | 1 -
include/configs/am335x_igep0033.h | 1 -
include/configs/baltos.h | 1 -
include/configs/bav335x.h | 1 -
include/configs/brppt1.h | 1 -
include/configs/cm_t335.h | 1 -
include/configs/cm_t43.h | 1 -
include/configs/cm_t54.h | 2 --
include/configs/duovero.h | 1 -
include/configs/gw_ventana.h | 1 -
include/configs/ipam390.h | 1 -
include/configs/microblaze-generic.h | 1 -
include/configs/omap3_zoom1.h | 1 -
include/configs/pepper.h | 1 -
include/configs/smartweb.h | 1 -
include/configs/taurus.h | 1 -
include/configs/ti_armv7_common.h | 3 ---
include/configs/ti_armv7_keystone2.h | 1 -
include/configs/twister.h | 1 -
include/configs/xilinx_zynqmp.h | 1 -
include/configs/zynq-common.h | 1 -
81 files changed, 80 insertions(+), 39 deletions(-)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 2a8ddbc..5e2890e 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -359,6 +359,14 @@ config SPL_ONENAND_SUPPORT
load U-Boot from supported devices. This enables the drivers in
drivers/mtd/onenand as part of an SPL build.
+config SPL_OS_BOOT
+ bool "Activate Falcon Mode"
+ depends on SPL && !TI_SECURE_DEVICE
+ default n
+ help
+ Enable booting directly to an OS from SPL.
+ for more info read doc/README.falcon
+
config SPL_POST_MEM_SUPPORT
bool "Support POST drivers"
depends on SPL
diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index 9e573a7..5356489 100644
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -10,6 +10,7 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTDELAY=3
CONFIG_SPL=y
CONFIG_SPL_NOR_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_LOOPW=y
# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index aa09bf5..c54689d 100644
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -11,6 +11,7 @@ CONFIG_SYS_EXTRA_OPTIONS="A4M2K"
CONFIG_BOOTDELAY=3
CONFIG_SPL=y
CONFIG_SPL_NOR_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_LOOPW=y
# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index 1049a6d..12b3855 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_AM335X_EVM=y
# CONFIG_SPL_NAND_SUPPORT is not set
+CONFIG_TARGET_AM335X_EVM=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
@@ -9,6 +9,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index e0110d1..10f386d 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_AM335X_EVM=y
# CONFIG_SPL_NAND_SUPPORT is not set
+CONFIG_TARGET_AM335X_EVM=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
CONFIG_FIT=y
@@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index a2cfef3..b5118a4 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -11,6 +11,7 @@ CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index 1f12fac..1046463 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index 1c3e04d..b5d4424 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y
CONFIG_SPL_NET_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_USBETH_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig
index 5eabd99..cbafdb1 100644
--- a/configs/am335x_shc_defconfig
+++ b/configs/am335x_shc_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -11,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SERIES=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
@@ -19,6 +19,7 @@ CONFIG_FIT=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot# "
CONFIG_AUTOBOOT_KEYED=y
diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig
index 93bbf31..2033766 100644
--- a/configs/am335x_shc_ict_defconfig
+++ b/configs/am335x_shc_ict_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -11,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SHC_ICT=y
CONFIG_SERIES=y
@@ -20,6 +20,7 @@ CONFIG_FIT=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="U-Boot# "
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n"
diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig
index 6e8a9bf..c6a6a1d 100644
--- a/configs/am335x_shc_netboot_defconfig
+++ b/configs/am335x_shc_netboot_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -12,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SHC_NETBOOT=y
CONFIG_SERIES=y
@@ -21,6 +21,7 @@ CONFIG_FIT=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="U-Boot# "
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n"
diff --git a/configs/am335x_shc_prompt_defconfig b/configs/am335x_shc_prompt_defconfig
index 1ce8700..374e5a6 100644
--- a/configs/am335x_shc_prompt_defconfig
+++ b/configs/am335x_shc_prompt_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -11,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SERIES=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
@@ -19,6 +19,7 @@ CONFIG_FIT=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n"
CONFIG_AUTOBOOT_DELAY_STR="shc"
diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig
index ee8ed06..356046e 100644
--- a/configs/am335x_shc_sdboot_defconfig
+++ b/configs/am335x_shc_sdboot_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -11,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SHC_SDBOOT=y
CONFIG_SERIES=y
@@ -20,6 +20,7 @@ CONFIG_FIT=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="U-Boot# "
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n"
diff --git a/configs/am335x_shc_sdboot_prompt_defconfig b/configs/am335x_shc_sdboot_prompt_defconfig
index ee8ed06..356046e 100644
--- a/configs/am335x_shc_sdboot_prompt_defconfig
+++ b/configs/am335x_shc_sdboot_prompt_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -11,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SHC_SDBOOT=y
CONFIG_SERIES=y
@@ -20,6 +20,7 @@ CONFIG_FIT=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="U-Boot# "
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n"
diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig
index 9dba3f0..89c45da 100644
--- a/configs/am335x_sl50_defconfig
+++ b/configs/am335x_sl50_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_AM335X_SL50=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -12,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_TARGET_AM335X_SL50=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SPL_YMODEM_SUPPORT=y
@@ -20,6 +20,7 @@ CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
# CONFIG_AUTOBOOT is not set
CONFIG_CMD_BOOTZ=y
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 64e48e9..570bc87 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -11,6 +11,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
index 4ed2ac3..99d0990 100644
--- a/configs/am43xx_evm_ethboot_defconfig
+++ b/configs/am43xx_evm_ethboot_defconfig
@@ -9,6 +9,7 @@ CONFIG_SPL_ETH_SUPPORT=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_NET_SUPPORT=y
CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL"
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 14d874f..b24964e 100644
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_USB_HOST_SUPPORT=y
CONFIG_SPL_USB_SUPPORT=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index 27ea472..8df800c 100644
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_DMA_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig
index 608cc10..9588a55 100644
--- a/configs/am57xx_evm_nodt_defconfig
+++ b/configs/am57xx_evm_nodt_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_SPI_SUPPORT=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_DMA_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index d87c342..5a773ca 100644
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_BAV335X=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -11,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_TARGET_BAV335X=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_BAV_VERSION=1
@@ -19,6 +19,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index f4bc687..f2d9439 100644
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_BAV335X=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -11,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_TARGET_BAV335X=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_BAV_VERSION=2
@@ -19,6 +19,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index e6c0b80..ba13212 100644
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -5,6 +5,7 @@ CONFIG_BOOTDELAY=-2
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Cairo # "
CONFIG_CMD_BOOTZ=y
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index e836e5e..39a35e9 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_DEVKIT8000=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index c74dc18..4996076 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_DMA_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 0f726ae..53a38f0 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -19,6 +19,7 @@ CONFIG_BOOTDELAY=3
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_DMA_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Ventana > "
CONFIG_CMD_BOOTZ=y
diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
index 0ec4ebc..8c1174e 100644
--- a/configs/igep0020_defconfig
+++ b/configs/igep0020_defconfig
@@ -8,6 +8,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_ONENAND_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig
index bc0ec6a..4bc0def 100644
--- a/configs/igep0030_defconfig
+++ b/configs/igep0030_defconfig
@@ -7,6 +7,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_ONENAND_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig
index 0750881..e053e4d 100644
--- a/configs/igep0030_nand_defconfig
+++ b/configs/igep0030_nand_defconfig
@@ -7,6 +7,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_ONENAND_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 280afbd..b2c5c71 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -7,6 +7,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_ONENAND_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index d0fdcac..08c8312 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot > "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index cf6c4b1..bc97f60 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -15,6 +15,7 @@ CONFIG_BOOTDELAY=-1
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_NOR_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot-mONStR> "
CONFIG_CMD_ASKENV=y
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index ece9638..a76a5a3 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 26146d2..30f06bd 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="OMAP Logic # "
CONFIG_CMD_BOOTZ=y
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index a416072..5a7c656 100644
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_OMAP3_OVERO=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Overo # "
CONFIG_CMD_BOOTZ=y
diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index e496afe..fc6dda0 100644
--- a/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@ -6,6 +6,7 @@ CONFIG_OMAP44XX=y
CONFIG_TARGET_OMAP4_PANDA=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig
index ea62104..64c291b 100644
--- a/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@ -5,6 +5,7 @@ CONFIG_OMAP44XX=y
CONFIG_TARGET_OMAP4_SDP4430=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index 63ff1bc..50dda81 100644
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -4,6 +4,7 @@ CONFIG_OMAP54XX=y
CONFIG_TARGET_OMAP5_UEVM=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
index dfe9da3..1c11fde 100644
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_PCM051=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -12,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_TARGET_PCM051=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="REV1"
@@ -20,6 +20,7 @@ CONFIG_SPL=y
CONFIG_SPL_ETH_SUPPORT=y
CONFIG_SPL_NET_SUPPORT=y
CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL"
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index 61102e0..b14754f 100644
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_PCM051=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -12,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_TARGET_PCM051=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="REV3"
@@ -20,6 +20,7 @@ CONFIG_SPL=y
CONFIG_SPL_ETH_SUPPORT=y
CONFIG_SPL_NET_SUPPORT=y
CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL"
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index feec566..5aa9f4b 100644
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
-CONFIG_TARGET_PENGWYN=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -13,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_TARGET_PENGWYN=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_VERSION_VARIABLE=y
@@ -21,6 +21,7 @@ CONFIG_SPL_ETH_SUPPORT=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_NET_SUPPORT=y
CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index f419140..c92bfc8 100644
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -5,6 +5,7 @@ CONFIG_TARGET_TWISTER=y
CONFIG_FIT=y
CONFIG_BOOTDELAY=10
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="twister => "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index 3be5c1b..0cf432d 100644
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -11,6 +11,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_CONSOLE is not set
diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
index 44eaf20..3e4b841 100644
--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
@@ -11,6 +11,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
index 6fcbaa1..f8f5dbd 100644
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
index c717f04..102bdd9 100644
--- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
@@ -9,6 +9,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
index 1a27bd0..2ac00dd 100644
--- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
@@ -10,6 +10,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig
index 3f4b5f9..29e8fa0 100644
--- a/configs/xilinx_zynqmp_zcu102_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_defconfig
@@ -12,6 +12,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
index 2d5fa50..d3ad80e 100644
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -12,6 +12,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index ad0da0b..672b9f4 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_NO_FLASH=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index 3142b58..72e8d0d 100644
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_ZYNQ=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
CONFIG_SYS_NO_FLASH=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index c4f065f..40b6513 100644
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_NO_FLASH=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index e1db0a7..54efa11 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_NO_FLASH=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index a1a2fe4..e574460 100644
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
CONFIG_SYS_NO_FLASH=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig
index b841fdc..e780be4 100644
--- a/configs/zynq_zc770_xm011_defconfig
+++ b/configs/zynq_zc770_xm011_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011"
CONFIG_SYS_NO_FLASH=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 3436c9d..84348cd 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_GPIO=y
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index 7a43e68f..e85fa91 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
CONFIG_SYS_NO_FLASH=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index c930b53..91999e4 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_NO_FLASH=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index f2c0f72..54f47e0 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_NO_FLASH=y
CONFIG_SPL=y
+CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index cc211c5..8514b0e 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -402,7 +402,6 @@
#define CONFIG_SPL_BSS_START_ADDR ((128 - 1) << 20)
#define CONFIG_SPL_BSS_MAX_SIZE (64 << 10)
-#define CONFIG_SPL_OS_BOOT
/* Place patched DT blob (fdt)@this address */
#define CONFIG_SYS_SPL_ARGS_ADDR 0x01800000
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 272c71b..6688fd6 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -380,7 +380,6 @@
*/
#if defined(CONFIG_SPI_BOOT)
/* SPL related */
-#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h
index 18db58a..32aa392 100644
--- a/include/configs/am335x_igep0033.h
+++ b/include/configs/am335x_igep0033.h
@@ -123,7 +123,6 @@
#undef CONFIG_USE_IRQ
/* SPL */
-#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */
#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds"
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 58df571..e69c1b6 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -54,7 +54,6 @@
#undef CONFIG_SYS_OMAP24_I2C_SPEED
#define CONFIG_SYS_OMAP24_I2C_SPEED 1000
-#undef CONFIG_SPL_OS_BOOT
#ifdef CONFIG_NAND
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000
#ifdef CONFIG_SPL_OS_BOOT
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index f1ae1a6..ac47dec 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -513,7 +513,6 @@ DEFAULT_LINUX_BOOT_ENV \
*/
#if defined(CONFIG_SPI_BOOT)
/* SPL related */
-#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index e01d535..ccc5bb4 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -68,7 +68,6 @@
#define CONFIG_CMD_MTDPARTS
#endif /* CONFIG_SPI_BOOT, ... */
-#undef CONFIG_SPL_OS_BOOT
#ifdef CONFIG_SPL_OS_BOOT
#define CONFIG_SYS_SPL_ARGS_ADDR 0x80F80000
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 6dbc9e9..7eed776 100644
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -19,7 +19,6 @@
#undef CONFIG_BOARD_LATE_INIT
#undef CONFIG_SPI
#undef CONFIG_OMAP3_SPI
-#undef CONFIG_SPL_OS_BOOT
#undef CONFIG_BOOTCOUNT_LIMIT
#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 92ff251..3a605f7 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -90,7 +90,6 @@
#define CONFIG_HSMMC2_8BIT
#include <configs/ti_armv7_omap.h>
-#undef CONFIG_SPL_OS_BOOT
#undef CONFIG_SYS_MONITOR_LEN
#undef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
index ddb1e97..a3b1e5f 100644
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -16,8 +16,6 @@
#include <configs/ti_omap5_common.h>
-#undef CONFIG_SPL_OS_BOOT
-
/* EEPROM related defines */
#define CONFIG_SYS_I2C_OMAP34XX
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
diff --git a/include/configs/duovero.h b/include/configs/duovero.h
index 868158b..b5bd3ba 100644
--- a/include/configs/duovero.h
+++ b/include/configs/duovero.h
@@ -21,7 +21,6 @@
#include <configs/ti_omap4_common.h>
-#undef CONFIG_SPL_OS_BOOT
#undef CONFIG_EFI_PARTITION
#undef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index f01a74a..41aa0f3 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -14,7 +14,6 @@
/* Falcon Mode */
#define CONFIG_CMD_SPL
-#define CONFIG_SPL_OS_BOOT
#define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
#define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 5f07629..381fe04 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -297,7 +297,6 @@
/* add FALCON boot mode */
#define CONFIG_CMD_SPL
-#define CONFIG_SPL_OS_BOOT
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000
#define CONFIG_SYS_SPL_ARGS_ADDR LINUX_BOOT_PARAM_ADDR
#define CONFIG_CMD_SPL_NAND_OFS 0x00180000
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index a07bcc6..32b0c62 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -292,7 +292,6 @@
#endif
/* for booting directly linux */
-#define CONFIG_SPL_OS_BOOT
#define CONFIG_SYS_OS_BASE (CONFIG_SYS_FLASH_BASE + \
0x60000)
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 6397051..d605a07 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -26,7 +26,6 @@
/* Remove SPL boot option - we do not support that on LDP yet */
#undef CONFIG_SPL_FRAMEWORK
-#undef CONFIG_SPL_OS_BOOT
/* Generic NAND definition conflicts with debug_base */
#undef CONFIG_SYS_NAND_BASE
diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index 1bc8c4b..4231e28 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -11,7 +11,6 @@
#include <configs/ti_am335x_common.h>
#undef CONFIG_BOARD_LATE_INIT
-#undef CONFIG_SPL_OS_BOOT
/* Clock defines */
#define V_OSCK 24000000 /* Clock output from T2 */
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index fd557a9..41de667 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -276,6 +276,5 @@
#define CONFIG_SYS_THUMB_BUILD
#define CONFIG_SYS_ICACHE_OFF
#define CONFIG_SYS_DCACHE_OFF
-#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */
#endif
#endif /* __CONFIG_H */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 1be4341..1fa9eb3 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -140,7 +140,6 @@
#if defined(CONFIG_SPL_BUILD)
/* SPL related */
-#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index f5602b8..f31d5d3 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -205,9 +205,6 @@
* We also support Falcon Mode so that the Linux kernel can be booted
* directly from SPL. This is not currently available on HS devices.
*/
-#if !defined(CONFIG_TI_SECURE_DEVICE)
-#define CONFIG_SPL_OS_BOOT
-#endif
/*
* Place the image at the start of the ROM defined image space (per
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index c42dedb..79b22cd 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -302,7 +302,6 @@
#include <configs/ti_armv7_common.h>
/* We wont be loading up OS from SPL for now.. */
-#undef CONFIG_SPL_OS_BOOT
/* We do not have MMC support.. yet.. */
#undef CONFIG_MMC
diff --git a/include/configs/twister.h b/include/configs/twister.h
index 66f4680..fd117b8 100644
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -42,7 +42,6 @@
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000
#define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\
0x600000)
-#define CONFIG_SPL_OS_BOOT
#define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100)
#define CONFIG_SPL_BOARD_INIT
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index adc42cf..cbdef6e 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -268,7 +268,6 @@
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_RAM_DEVICE
-#define CONFIG_SPL_OS_BOOT
/* u-boot is like dtb */
#define CONFIG_SPL_FS_LOAD_ARGS_NAME "u-boot.bin"
#define CONFIG_SYS_SPL_ARGS_ADDR 0x8000000
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index f1c9bed..ef446db 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -331,7 +331,6 @@
#endif
/* for booting directly linux */
-#define CONFIG_SPL_OS_BOOT
/* SP location before relocation, must use scratch RAM */
#define CONFIG_SPL_TEXT_BASE 0x0
--
2.5.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v1 2/2] spl: move SYS_OS_BASE to Kconfig
2016-10-06 5:55 [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig Heiko Schocher
2016-10-06 5:55 ` [U-Boot] [PATCH v1 1/2] spl: move SPL_OS_BOOT " Heiko Schocher
@ 2016-10-06 5:55 ` Heiko Schocher
2016-10-15 12:22 ` [U-Boot] [U-Boot,v1,2/2] " Tom Rini
2016-10-06 16:29 ` [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and " Andrew F. Davis
2 siblings, 1 reply; 8+ messages in thread
From: Heiko Schocher @ 2016-10-06 5:55 UTC (permalink / raw)
To: u-boot
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(-)
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)
--
2.5.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig
2016-10-06 5:55 [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig Heiko Schocher
2016-10-06 5:55 ` [U-Boot] [PATCH v1 1/2] spl: move SPL_OS_BOOT " Heiko Schocher
2016-10-06 5:55 ` [U-Boot] [PATCH v1 2/2] spl: move SYS_OS_BASE " Heiko Schocher
@ 2016-10-06 16:29 ` Andrew F. Davis
2016-10-06 19:12 ` Tom Rini
2016-10-07 5:26 ` Heiko Schocher
2 siblings, 2 replies; 8+ messages in thread
From: Andrew F. Davis @ 2016-10-06 16:29 UTC (permalink / raw)
To: u-boot
On 10/06/2016 12:55 AM, Heiko Schocher wrote:
> This 2 patches move SPL_OS_BOOT and SYS_OS_BASE
> to Kconfig. Checked with tbot testcase:
> https://github.com/hsdenx/tbot/blob/master/src/tc/uboot/tc_uboot_check_kconfig.py
>
> result:
>
> Boards : 1213
> compile err : 13
> not checked : 1
> U-Boot good : 1185 bad 14
> SPL good : 1199 bad 0
>
> Boards not checked, as they had compile errors:
> ['adp-ag101p', 'bf533-stamp', 'cm-bf527', 'colibri_pxa270', 'omap4_sdp4430', 'openrisc-generic', 'qemu-x86_efi_payload64', 'sandbox', 'sandbox_noblk', 'sandbox_spl', 'smdk5250', 'snow', 'spring']
>
> Boards not checked, as no toolchain:
> ['xtfpga']
>
> Boards which have differences in the resulting U-Boot bin:
> ['am335x_baltos', 'am335x_evm_spiboot', 'am335x_igep0033', 'cm_t335', 'cm_t43', 'cm_t54', 'duovero', 'k2e_evm', 'k2g_evm', 'k2hk_evm', 'k2l_evm', 'omap3_pandora', 'omap3_zoom1', 'pepper']
>
> I looked into the Boards with differences in the resulting U-Boot bin,
> but could not find the reason, why they are different :-(
>
> for example am335x_baltos:
>
> $ make am335x_baltos_defconfig
> $ cp .config config_org
> $ make mrproper
> - applied the 2 patches
> $ make am335x_baltos_defconfig
> $ diff -pruN config_org .config > gnlmpf
> $ cat gnlmpf
>
> --- config_org 2016-10-06 06:58:01.636514195 +0200
> +++ .config 2016-10-06 06:58:36.459726538 +0200
> @@ -270,6 +270,7 @@ CONFIG_SPL_MTD_SUPPORT=y
> # CONFIG_SPL_NO_CPU_SUPPORT is not set
> # CONFIG_SPL_NOR_SUPPORT is not set
> # CONFIG_SPL_ONENAND_SUPPORT is not set
> +# CONFIG_SPL_OS_BOOT is not set
> # CONFIG_SPL_POST_MEM_SUPPORT is not set
> # CONFIG_SPL_SATA_SUPPORT is not set
> # CONFIG_SPL_USBETH_SUPPORT is not set
>
> change in this patchserie for this board:
> diff --git a/include/configs/baltos.h b/include/configs/baltos.h
> index 58df571..e69c1b6 100644
> --- a/include/configs/baltos.h
> +++ b/include/configs/baltos.h
> @@ -54,7 +54,6 @@
> #undef CONFIG_SYS_OMAP24_I2C_SPEED
> #define CONFIG_SYS_OMAP24_I2C_SPEED 1000
>
> -#undef CONFIG_SPL_OS_BOOT
> #ifdef CONFIG_NAND
> #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000
> #ifdef CONFIG_SPL_OS_BOOT
>
> Seems Ok to me, but I get a different md5sum for the U-Boot bin ...
>
> Or for example the omap3_pandora board:
> $ make omap3_pandora_defconfig
> $ cp .config config_org
> $ make mrproper
> - applied the 2 patches
> $ make omap3_pandora_defconfig
> $ diff -pruN config_org .config > gnlmpf
> $ cat gnlmpf
> $
>
> No difference in the .config before and after this patch,
> but a difference in the resulting binary ... ?
>
> Seems to me SPL_OS_BOOT, which is a SPL config option
> has somewhere an influence to the U-Boot binary ...
>
> Any ideas whats going on here?
>
No idea, all I know is that some config headers with long histories are
full of hacky ifdef tricks and bugs. IMHO the best thing we can do is to
quickly move everything to Kconfig and sort it out then, instead of
battling the config logic in the header files with every change as we go.
I will try to help test these changes with the boards I have, but I
haven't been able to get any of my omap3 boards to boot correctly in a
while :(. I'll see if anyone else here has one working they can test this.
Thanks,
Andrew
> Hmm... looking into ".config" after an "make omap3_pandora_defconfig"
> There are a lot of CONFIG_SPL symbols defined, but:
> #
> # SPL / TPL
> #
> CONFIG_SUPPORT_SPL=y
> # CONFIG_SPL is not set
>
> This seems bogus to me! SPL support is deactivated, but
> a lot of CONFIG_SPL_* symbols are activated! For example
> I find in .config:
> CONFIG_SPL_GPIO_SUPPORT=y
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> CONFIG_SPL_LIBGENERIC_SUPPORT=y
>
> Does currently the omap3_pandora board boot with
> "Prepare v2016.11-rc1" ?
>
>
>
> Heiko Schocher (2):
> spl: move SPL_OS_BOOT to Kconfig
> spl: move SYS_OS_BASE to Kconfig
>
> common/spl/Kconfig | 18 ++++++++++++++++++
> configs/a3m071_defconfig | 2 ++
> configs/a4m2k_defconfig | 1 +
> configs/am335x_boneblack_defconfig | 3 ++-
> configs/am335x_boneblack_vboot_defconfig | 3 ++-
> configs/am335x_evm_defconfig | 1 +
> configs/am335x_evm_nor_defconfig | 1 +
> configs/am335x_evm_usbspl_defconfig | 1 +
> configs/am335x_shc_defconfig | 3 ++-
> configs/am335x_shc_ict_defconfig | 3 ++-
> configs/am335x_shc_netboot_defconfig | 3 ++-
> configs/am335x_shc_prompt_defconfig | 3 ++-
> configs/am335x_shc_sdboot_defconfig | 3 ++-
> configs/am335x_shc_sdboot_prompt_defconfig | 3 ++-
> configs/am335x_sl50_defconfig | 3 ++-
> configs/am43xx_evm_defconfig | 1 +
> configs/am43xx_evm_ethboot_defconfig | 1 +
> configs/am43xx_evm_usbhost_boot_defconfig | 1 +
> configs/am57xx_evm_defconfig | 1 +
> configs/am57xx_evm_nodt_defconfig | 1 +
> configs/birdland_bav335a_defconfig | 3 ++-
> configs/birdland_bav335b_defconfig | 3 ++-
> configs/cairo_defconfig | 1 +
> configs/devkit8000_defconfig | 1 +
> configs/dra7xx_evm_defconfig | 1 +
> configs/gwventana_defconfig | 1 +
> configs/igep0020_defconfig | 1 +
> configs/igep0030_defconfig | 1 +
> configs/igep0030_nand_defconfig | 1 +
> configs/igep0032_defconfig | 1 +
> configs/ipam390_defconfig | 1 +
> configs/microblaze-generic_defconfig | 2 ++
> configs/omap3_beagle_defconfig | 1 +
> configs/omap3_logic_defconfig | 1 +
> configs/omap3_overo_defconfig | 1 +
> configs/omap4_panda_defconfig | 1 +
> configs/omap4_sdp4430_defconfig | 1 +
> configs/omap5_uevm_defconfig | 1 +
> configs/pcm051_rev1_defconfig | 3 ++-
> configs/pcm051_rev3_defconfig | 3 ++-
> configs/pengwyn_defconfig | 3 ++-
> configs/twister_defconfig | 1 +
> configs/xilinx_zynqmp_ep_defconfig | 1 +
> configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
> configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
> configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
> configs/xilinx_zynqmp_zcu102_defconfig | 1 +
> configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
> configs/zynq_microzed_defconfig | 1 +
> configs/zynq_picozed_defconfig | 1 +
> configs/zynq_zc702_defconfig | 1 +
> configs/zynq_zc706_defconfig | 1 +
> configs/zynq_zc770_xm010_defconfig | 1 +
> configs/zynq_zc770_xm011_defconfig | 1 +
> configs/zynq_zc770_xm012_defconfig | 1 +
> configs/zynq_zc770_xm013_defconfig | 1 +
> configs/zynq_zed_defconfig | 1 +
> configs/zynq_zybo_defconfig | 1 +
> include/configs/a3m071.h | 2 --
> include/configs/am335x_evm.h | 1 -
> include/configs/am335x_igep0033.h | 1 -
> include/configs/baltos.h | 1 -
> include/configs/bav335x.h | 1 -
> include/configs/brppt1.h | 1 -
> include/configs/cm_t335.h | 1 -
> include/configs/cm_t43.h | 1 -
> include/configs/cm_t54.h | 2 --
> include/configs/duovero.h | 1 -
> include/configs/gw_ventana.h | 1 -
> include/configs/ipam390.h | 1 -
> include/configs/microblaze-generic.h | 3 ---
> include/configs/omap3_zoom1.h | 1 -
> include/configs/pepper.h | 1 -
> include/configs/smartweb.h | 1 -
> include/configs/taurus.h | 1 -
> include/configs/ti_armv7_common.h | 3 ---
> include/configs/ti_armv7_keystone2.h | 1 -
> include/configs/twister.h | 1 -
> include/configs/xilinx_zynqmp.h | 1 -
> include/configs/zynq-common.h | 1 -
> 81 files changed, 92 insertions(+), 42 deletions(-)
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig
2016-10-06 16:29 ` [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and " Andrew F. Davis
@ 2016-10-06 19:12 ` Tom Rini
2016-10-07 5:26 ` Heiko Schocher
1 sibling, 0 replies; 8+ messages in thread
From: Tom Rini @ 2016-10-06 19:12 UTC (permalink / raw)
To: u-boot
On Thu, Oct 06, 2016 at 11:29:27AM -0500, Andrew F. Davis wrote:
> On 10/06/2016 12:55 AM, Heiko Schocher wrote:
> > This 2 patches move SPL_OS_BOOT and SYS_OS_BASE
> > to Kconfig. Checked with tbot testcase:
> > https://github.com/hsdenx/tbot/blob/master/src/tc/uboot/tc_uboot_check_kconfig.py
> >
> > result:
> >
> > Boards : 1213
> > compile err : 13
> > not checked : 1
> > U-Boot good : 1185 bad 14
> > SPL good : 1199 bad 0
> >
> > Boards not checked, as they had compile errors:
> > ['adp-ag101p', 'bf533-stamp', 'cm-bf527', 'colibri_pxa270', 'omap4_sdp4430', 'openrisc-generic', 'qemu-x86_efi_payload64', 'sandbox', 'sandbox_noblk', 'sandbox_spl', 'smdk5250', 'snow', 'spring']
> >
> > Boards not checked, as no toolchain:
> > ['xtfpga']
> >
> > Boards which have differences in the resulting U-Boot bin:
> > ['am335x_baltos', 'am335x_evm_spiboot', 'am335x_igep0033', 'cm_t335', 'cm_t43', 'cm_t54', 'duovero', 'k2e_evm', 'k2g_evm', 'k2hk_evm', 'k2l_evm', 'omap3_pandora', 'omap3_zoom1', 'pepper']
> >
> > I looked into the Boards with differences in the resulting U-Boot bin,
> > but could not find the reason, why they are different :-(
> >
> > for example am335x_baltos:
> >
> > $ make am335x_baltos_defconfig
> > $ cp .config config_org
> > $ make mrproper
> > - applied the 2 patches
> > $ make am335x_baltos_defconfig
> > $ diff -pruN config_org .config > gnlmpf
> > $ cat gnlmpf
> >
> > --- config_org 2016-10-06 06:58:01.636514195 +0200
> > +++ .config 2016-10-06 06:58:36.459726538 +0200
> > @@ -270,6 +270,7 @@ CONFIG_SPL_MTD_SUPPORT=y
> > # CONFIG_SPL_NO_CPU_SUPPORT is not set
> > # CONFIG_SPL_NOR_SUPPORT is not set
> > # CONFIG_SPL_ONENAND_SUPPORT is not set
> > +# CONFIG_SPL_OS_BOOT is not set
> > # CONFIG_SPL_POST_MEM_SUPPORT is not set
> > # CONFIG_SPL_SATA_SUPPORT is not set
> > # CONFIG_SPL_USBETH_SUPPORT is not set
> >
> > change in this patchserie for this board:
> > diff --git a/include/configs/baltos.h b/include/configs/baltos.h
> > index 58df571..e69c1b6 100644
> > --- a/include/configs/baltos.h
> > +++ b/include/configs/baltos.h
> > @@ -54,7 +54,6 @@
> > #undef CONFIG_SYS_OMAP24_I2C_SPEED
> > #define CONFIG_SYS_OMAP24_I2C_SPEED 1000
> >
> > -#undef CONFIG_SPL_OS_BOOT
> > #ifdef CONFIG_NAND
> > #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000
> > #ifdef CONFIG_SPL_OS_BOOT
> >
> > Seems Ok to me, but I get a different md5sum for the U-Boot bin ...
> >
> > Or for example the omap3_pandora board:
> > $ make omap3_pandora_defconfig
> > $ cp .config config_org
> > $ make mrproper
> > - applied the 2 patches
> > $ make omap3_pandora_defconfig
> > $ diff -pruN config_org .config > gnlmpf
> > $ cat gnlmpf
> > $
> >
> > No difference in the .config before and after this patch,
> > but a difference in the resulting binary ... ?
> >
> > Seems to me SPL_OS_BOOT, which is a SPL config option
> > has somewhere an influence to the U-Boot binary ...
> >
> > Any ideas whats going on here?
> >
>
> No idea, all I know is that some config headers with long histories are
> full of hacky ifdef tricks and bugs. IMHO the best thing we can do is to
> quickly move everything to Kconfig and sort it out then, instead of
> battling the config logic in the header files with every change as we go.
>
> I will try to help test these changes with the boards I have, but I
> haven't been able to get any of my omap3 boards to boot correctly in a
> while :(. I'll see if anyone else here has one working they can test this.
FWIW, omap3_beagle (and it's an xM) is part of my current lab and tested
every time. I'm FAT booting mine not raw mode.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161006/07202e40/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig
2016-10-06 16:29 ` [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and " Andrew F. Davis
2016-10-06 19:12 ` Tom Rini
@ 2016-10-07 5:26 ` Heiko Schocher
1 sibling, 0 replies; 8+ messages in thread
From: Heiko Schocher @ 2016-10-07 5:26 UTC (permalink / raw)
To: u-boot
Hello Andrew,
Am 06.10.2016 um 18:29 schrieb Andrew F. Davis:
> On 10/06/2016 12:55 AM, Heiko Schocher wrote:
>> This 2 patches move SPL_OS_BOOT and SYS_OS_BASE
>> to Kconfig. Checked with tbot testcase:
>> https://github.com/hsdenx/tbot/blob/master/src/tc/uboot/tc_uboot_check_kconfig.py
>>
>> result:
>>
>> Boards : 1213
>> compile err : 13
>> not checked : 1
>> U-Boot good : 1185 bad 14
>> SPL good : 1199 bad 0
>>
>> Boards not checked, as they had compile errors:
>> ['adp-ag101p', 'bf533-stamp', 'cm-bf527', 'colibri_pxa270', 'omap4_sdp4430', 'openrisc-generic', 'qemu-x86_efi_payload64', 'sandbox', 'sandbox_noblk', 'sandbox_spl', 'smdk5250', 'snow', 'spring']
>>
>> Boards not checked, as no toolchain:
>> ['xtfpga']
>>
>> Boards which have differences in the resulting U-Boot bin:
>> ['am335x_baltos', 'am335x_evm_spiboot', 'am335x_igep0033', 'cm_t335', 'cm_t43', 'cm_t54', 'duovero', 'k2e_evm', 'k2g_evm', 'k2hk_evm', 'k2l_evm', 'omap3_pandora', 'omap3_zoom1', 'pepper']
>>
>> I looked into the Boards with differences in the resulting U-Boot bin,
>> but could not find the reason, why they are different :-(
>>
>> for example am335x_baltos:
>>
>> $ make am335x_baltos_defconfig
>> $ cp .config config_org
>> $ make mrproper
>> - applied the 2 patches
>> $ make am335x_baltos_defconfig
>> $ diff -pruN config_org .config > gnlmpf
>> $ cat gnlmpf
>>
>> --- config_org 2016-10-06 06:58:01.636514195 +0200
>> +++ .config 2016-10-06 06:58:36.459726538 +0200
>> @@ -270,6 +270,7 @@ CONFIG_SPL_MTD_SUPPORT=y
>> # CONFIG_SPL_NO_CPU_SUPPORT is not set
>> # CONFIG_SPL_NOR_SUPPORT is not set
>> # CONFIG_SPL_ONENAND_SUPPORT is not set
>> +# CONFIG_SPL_OS_BOOT is not set
>> # CONFIG_SPL_POST_MEM_SUPPORT is not set
>> # CONFIG_SPL_SATA_SUPPORT is not set
>> # CONFIG_SPL_USBETH_SUPPORT is not set
>>
>> change in this patchserie for this board:
>> diff --git a/include/configs/baltos.h b/include/configs/baltos.h
>> index 58df571..e69c1b6 100644
>> --- a/include/configs/baltos.h
>> +++ b/include/configs/baltos.h
>> @@ -54,7 +54,6 @@
>> #undef CONFIG_SYS_OMAP24_I2C_SPEED
>> #define CONFIG_SYS_OMAP24_I2C_SPEED 1000
>>
>> -#undef CONFIG_SPL_OS_BOOT
>> #ifdef CONFIG_NAND
>> #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000
>> #ifdef CONFIG_SPL_OS_BOOT
>>
>> Seems Ok to me, but I get a different md5sum for the U-Boot bin ...
>>
>> Or for example the omap3_pandora board:
>> $ make omap3_pandora_defconfig
>> $ cp .config config_org
>> $ make mrproper
>> - applied the 2 patches
>> $ make omap3_pandora_defconfig
>> $ diff -pruN config_org .config > gnlmpf
>> $ cat gnlmpf
>> $
>>
>> No difference in the .config before and after this patch,
>> but a difference in the resulting binary ... ?
>>
>> Seems to me SPL_OS_BOOT, which is a SPL config option
>> has somewhere an influence to the U-Boot binary ...
>>
>> Any ideas whats going on here?
>>
>
> No idea, all I know is that some config headers with long histories are
> full of hacky ifdef tricks and bugs. IMHO the best thing we can do is to
> quickly move everything to Kconfig and sort it out then, instead of
> battling the config logic in the header files with every change as we go.
Yes, full ack. I do not understand how a SPL config symbol can change the
U-Boot binary! ... all SPL bins have no problem with this move, so I
tend to say, the patch is Ok ...
> I will try to help test these changes with the boards I have, but I
> haven't been able to get any of my omap3 boards to boot correctly in a
> while :(. I'll see if anyone else here has one working they can test this.
Thanks!
<promotion on>
I vote for setting up more "virtual labs" with boards in it, which
we can use for automated testing with tbot [1] and present the results
on a webpage [2] ;-)
<promotion off>
bye,
Heiko
[1] https://github.com/hsdenx/tbot
[2] http://xeidos.ddns.net/tests/test_db_auslesen.php
>
> Thanks,
> Andrew
>
>> Hmm... looking into ".config" after an "make omap3_pandora_defconfig"
>> There are a lot of CONFIG_SPL symbols defined, but:
>> #
>> # SPL / TPL
>> #
>> CONFIG_SUPPORT_SPL=y
>> # CONFIG_SPL is not set
>>
>> This seems bogus to me! SPL support is deactivated, but
>> a lot of CONFIG_SPL_* symbols are activated! For example
>> I find in .config:
>> CONFIG_SPL_GPIO_SUPPORT=y
>> CONFIG_SPL_LIBCOMMON_SUPPORT=y
>> CONFIG_SPL_LIBGENERIC_SUPPORT=y
>>
>> Does currently the omap3_pandora board boot with
>> "Prepare v2016.11-rc1" ?
>>
>>
>>
>> Heiko Schocher (2):
>> spl: move SPL_OS_BOOT to Kconfig
>> spl: move SYS_OS_BASE to Kconfig
>>
>> common/spl/Kconfig | 18 ++++++++++++++++++
>> configs/a3m071_defconfig | 2 ++
>> configs/a4m2k_defconfig | 1 +
>> configs/am335x_boneblack_defconfig | 3 ++-
>> configs/am335x_boneblack_vboot_defconfig | 3 ++-
>> configs/am335x_evm_defconfig | 1 +
>> configs/am335x_evm_nor_defconfig | 1 +
>> configs/am335x_evm_usbspl_defconfig | 1 +
>> configs/am335x_shc_defconfig | 3 ++-
>> configs/am335x_shc_ict_defconfig | 3 ++-
>> configs/am335x_shc_netboot_defconfig | 3 ++-
>> configs/am335x_shc_prompt_defconfig | 3 ++-
>> configs/am335x_shc_sdboot_defconfig | 3 ++-
>> configs/am335x_shc_sdboot_prompt_defconfig | 3 ++-
>> configs/am335x_sl50_defconfig | 3 ++-
>> configs/am43xx_evm_defconfig | 1 +
>> configs/am43xx_evm_ethboot_defconfig | 1 +
>> configs/am43xx_evm_usbhost_boot_defconfig | 1 +
>> configs/am57xx_evm_defconfig | 1 +
>> configs/am57xx_evm_nodt_defconfig | 1 +
>> configs/birdland_bav335a_defconfig | 3 ++-
>> configs/birdland_bav335b_defconfig | 3 ++-
>> configs/cairo_defconfig | 1 +
>> configs/devkit8000_defconfig | 1 +
>> configs/dra7xx_evm_defconfig | 1 +
>> configs/gwventana_defconfig | 1 +
>> configs/igep0020_defconfig | 1 +
>> configs/igep0030_defconfig | 1 +
>> configs/igep0030_nand_defconfig | 1 +
>> configs/igep0032_defconfig | 1 +
>> configs/ipam390_defconfig | 1 +
>> configs/microblaze-generic_defconfig | 2 ++
>> configs/omap3_beagle_defconfig | 1 +
>> configs/omap3_logic_defconfig | 1 +
>> configs/omap3_overo_defconfig | 1 +
>> configs/omap4_panda_defconfig | 1 +
>> configs/omap4_sdp4430_defconfig | 1 +
>> configs/omap5_uevm_defconfig | 1 +
>> configs/pcm051_rev1_defconfig | 3 ++-
>> configs/pcm051_rev3_defconfig | 3 ++-
>> configs/pengwyn_defconfig | 3 ++-
>> configs/twister_defconfig | 1 +
>> configs/xilinx_zynqmp_ep_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
>> configs/xilinx_zynqmp_zcu102_defconfig | 1 +
>> configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
>> configs/zynq_microzed_defconfig | 1 +
>> configs/zynq_picozed_defconfig | 1 +
>> configs/zynq_zc702_defconfig | 1 +
>> configs/zynq_zc706_defconfig | 1 +
>> configs/zynq_zc770_xm010_defconfig | 1 +
>> configs/zynq_zc770_xm011_defconfig | 1 +
>> configs/zynq_zc770_xm012_defconfig | 1 +
>> configs/zynq_zc770_xm013_defconfig | 1 +
>> configs/zynq_zed_defconfig | 1 +
>> configs/zynq_zybo_defconfig | 1 +
>> include/configs/a3m071.h | 2 --
>> include/configs/am335x_evm.h | 1 -
>> include/configs/am335x_igep0033.h | 1 -
>> include/configs/baltos.h | 1 -
>> include/configs/bav335x.h | 1 -
>> include/configs/brppt1.h | 1 -
>> include/configs/cm_t335.h | 1 -
>> include/configs/cm_t43.h | 1 -
>> include/configs/cm_t54.h | 2 --
>> include/configs/duovero.h | 1 -
>> include/configs/gw_ventana.h | 1 -
>> include/configs/ipam390.h | 1 -
>> include/configs/microblaze-generic.h | 3 ---
>> include/configs/omap3_zoom1.h | 1 -
>> include/configs/pepper.h | 1 -
>> include/configs/smartweb.h | 1 -
>> include/configs/taurus.h | 1 -
>> include/configs/ti_armv7_common.h | 3 ---
>> include/configs/ti_armv7_keystone2.h | 1 -
>> include/configs/twister.h | 1 -
>> include/configs/xilinx_zynqmp.h | 1 -
>> include/configs/zynq-common.h | 1 -
>> 81 files changed, 92 insertions(+), 42 deletions(-)
>>
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [U-Boot,v1,1/2] spl: move SPL_OS_BOOT to Kconfig
2016-10-06 5:55 ` [U-Boot] [PATCH v1 1/2] spl: move SPL_OS_BOOT " Heiko Schocher
@ 2016-10-15 12:22 ` Tom Rini
0 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2016-10-15 12:22 UTC (permalink / raw)
To: u-boot
On Thu, Oct 06, 2016 at 07:55:15AM +0200, Heiko Schocher wrote:
> Move SPL_OS_BOOT to Kconfig and cleanup existing
> uses.
>
> Signed-off-by: Heiko Schocher <hs@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161015/5eaa9f21/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [U-Boot,v1,2/2] spl: move SYS_OS_BASE to Kconfig
2016-10-06 5:55 ` [U-Boot] [PATCH v1 2/2] spl: move SYS_OS_BASE " Heiko Schocher
@ 2016-10-15 12:22 ` Tom Rini
0 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2016-10-15 12:22 UTC (permalink / raw)
To: u-boot
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!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161015/263d5bad/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-10-15 12:22 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-06 5:55 [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig Heiko Schocher
2016-10-06 5:55 ` [U-Boot] [PATCH v1 1/2] spl: move SPL_OS_BOOT " Heiko Schocher
2016-10-15 12:22 ` [U-Boot] [U-Boot,v1,1/2] " Tom Rini
2016-10-06 5:55 ` [U-Boot] [PATCH v1 2/2] spl: move SYS_OS_BASE " Heiko Schocher
2016-10-15 12:22 ` [U-Boot] [U-Boot,v1,2/2] " Tom Rini
2016-10-06 16:29 ` [U-Boot] [PATCH v1 0/2] spl: move SPL_OS_BOOT and " Andrew F. Davis
2016-10-06 19:12 ` Tom Rini
2016-10-07 5:26 ` Heiko Schocher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.