Skip to contentSkip to conversation

spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig

PATCH New Heiko Schocher 3 participants 8 messages Oct 6, 2016 – Oct 15, 2016 Arm/Zynq architecture

lore
Share & tools
lore

Heiko Schocher

author
#0 lore raw

cover spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig

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 2016-10-06 06:58:36.459726538 +0200 renamed from config_org 2016-10-06 06:58:01.636514195 +0200 +1 -0
@@ -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:

include/configs/baltos.h +0 -1
index 58df571..e69c1b6 100644
@@ -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(-)
Signature · 1 line
2.5.5
author
#1 lore raw

PATCH 1/2 spl: move SPL_OS_BOOT to Kconfig

Move SPL_OS_BOOT to Kconfig and cleanup existing
uses.

Signed-off-by Heiko Schocher <[email protected]>

---

 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(-)
common/spl/Kconfig +8 -0
index 2a8ddbc..5e2890e 100644
@@ -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
configs/a3m071_defconfig +1 -0
index 9e573a7..5356489 100644
@@ -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
configs/a4m2k_defconfig +1 -0
index aa09bf5..c54689d 100644
@@ -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
configs/am335x_boneblack_defconfig +2 -1
index 1049a6d..12b3855 100644
@@ -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"
configs/am335x_boneblack_vboot_defconfig +2 -1
index e0110d1..10f386d 100644
@@ -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"
configs/am335x_evm_defconfig +1 -0
index a2cfef3..b5118a4 100644
@@ -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
configs/am335x_evm_nor_defconfig +1 -0
index 1f12fac..1046463 100644
@@ -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
configs/am335x_evm_usbspl_defconfig +1 -0
index 1c3e04d..b5d4424 100644
@@ -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
configs/am335x_shc_defconfig +2 -1
index 5eabd99..cbafdb1 100644
@@ -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
configs/am335x_shc_ict_defconfig +2 -1
index 93bbf31..2033766 100644
@@ -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"
configs/am335x_shc_netboot_defconfig +2 -1
index 6e8a9bf..c6a6a1d 100644
@@ -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"
configs/am335x_shc_prompt_defconfig +2 -1
index 1ce8700..374e5a6 100644
@@ -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"
configs/am335x_shc_sdboot_defconfig +2 -1
index ee8ed06..356046e 100644
@@ -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"
configs/am335x_shc_sdboot_prompt_defconfig +2 -1
index ee8ed06..356046e 100644
@@ -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"
configs/am335x_sl50_defconfig +2 -1
index 9dba3f0..89c45da 100644
@@ -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
configs/am43xx_evm_defconfig +1 -0
index 64e48e9..570bc87 100644
@@ -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
configs/am43xx_evm_ethboot_defconfig +1 -0
index 4ed2ac3..99d0990 100644
@@ -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
configs/am43xx_evm_usbhost_boot_defconfig +1 -0
index 14d874f..b24964e 100644
@@ -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
configs/am57xx_evm_defconfig +1 -0
index 27ea472..8df800c 100644
@@ -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
configs/am57xx_evm_nodt_defconfig +1 -0
index 608cc10..9588a55 100644
@@ -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
configs/birdland_bav335a_defconfig +2 -1
index d87c342..5a773ca 100644
@@ -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
configs/birdland_bav335b_defconfig +2 -1
index f4bc687..f2d9439 100644
@@ -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
configs/cairo_defconfig +1 -0
index e6c0b80..ba13212 100644
@@ -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
configs/devkit8000_defconfig +1 -0
index e836e5e..39a35e9 100644
@@ -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
configs/dra7xx_evm_defconfig +1 -0
index c74dc18..4996076 100644
@@ -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
configs/gwventana_defconfig +1 -0
index 0f726ae..53a38f0 100644
@@ -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
configs/igep0020_defconfig +1 -0
index 0ec4ebc..8c1174e 100644
@@ -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
configs/igep0030_defconfig +1 -0
index bc0ec6a..4bc0def 100644
@@ -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
configs/igep0030_nand_defconfig +1 -0
index 0750881..e053e4d 100644
@@ -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
configs/igep0032_defconfig +1 -0
index 280afbd..b2c5c71 100644
@@ -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
configs/ipam390_defconfig +1 -0
index d0fdcac..08c8312 100644
@@ -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
configs/microblaze-generic_defconfig +1 -0
index cf6c4b1..bc97f60 100644
@@ -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
configs/omap3_beagle_defconfig +1 -0
index ece9638..a76a5a3 100644
@@ -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
configs/omap3_logic_defconfig +1 -0
index 26146d2..30f06bd 100644
@@ -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
configs/omap3_overo_defconfig +1 -0
index a416072..5a7c656 100644
@@ -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
configs/omap4_panda_defconfig +1 -0
index e496afe..fc6dda0 100644
@@ -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
configs/omap4_sdp4430_defconfig +1 -0
index ea62104..64c291b 100644
@@ -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
configs/omap5_uevm_defconfig +1 -0
index 63ff1bc..50dda81 100644
@@ -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
configs/pcm051_rev1_defconfig +2 -1
index dfe9da3..1c11fde 100644
@@ -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
configs/pcm051_rev3_defconfig +2 -1
index 61102e0..b14754f 100644
@@ -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
configs/pengwyn_defconfig +2 -1
index feec566..5aa9f4b 100644
@@ -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
configs/twister_defconfig +1 -0
index f419140..c92bfc8 100644
@@ -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
configs/xilinx_zynqmp_ep_defconfig +1 -0
index 3be5c1b..0cf432d 100644
@@ -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
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0
index 44eaf20..3e4b841 100644
@@ -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
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +1 -0
index 6fcbaa1..f8f5dbd 100644
@@ -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
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +1 -0
index c717f04..102bdd9 100644
@@ -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
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +1 -0
index 1a27bd0..2ac00dd 100644
@@ -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
configs/xilinx_zynqmp_zcu102_defconfig +1 -0
index 3f4b5f9..29e8fa0 100644
@@ -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
configs/xilinx_zynqmp_zcu102_revB_defconfig +1 -0
index 2d5fa50..d3ad80e 100644
@@ -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
configs/zynq_microzed_defconfig +1 -0
index ad0da0b..672b9f4 100644
@@ -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
configs/zynq_picozed_defconfig +1 -0
index 3142b58..72e8d0d 100644
@@ -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
configs/zynq_zc702_defconfig +1 -0
index c4f065f..40b6513 100644
@@ -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
configs/zynq_zc706_defconfig +1 -0
index e1db0a7..54efa11 100644
@@ -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
configs/zynq_zc770_xm010_defconfig +1 -0
index a1a2fe4..e574460 100644
@@ -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
configs/zynq_zc770_xm011_defconfig +1 -0
index b841fdc..e780be4 100644
@@ -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
configs/zynq_zc770_xm012_defconfig +1 -0
index 3436c9d..84348cd 100644
@@ -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
configs/zynq_zc770_xm013_defconfig +1 -0
index 7a43e68f..e85fa91 100644
@@ -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
configs/zynq_zed_defconfig +1 -0
index c930b53..91999e4 100644
@@ -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
configs/zynq_zybo_defconfig +1 -0
index f2c0f72..54f47e0 100644
@@ -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
include/configs/a3m071.h +0 -1
index cc211c5..8514b0e 100644
@@ -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
include/configs/am335x_evm.h +0 -1
index 272c71b..6688fd6 100644
@@ -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
include/configs/am335x_igep0033.h +0 -1
index 18db58a..32aa392 100644
@@ -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
include/configs/baltos.h +0 -1
index 58df571..e69c1b6 100644
@@ -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
include/configs/bav335x.h +0 -1
index f1ae1a6..ac47dec 100644
@@ -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
include/configs/brppt1.h +0 -1
index e01d535..ccc5bb4 100644
@@ -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
include/configs/cm_t335.h +0 -1
index 6dbc9e9..7eed776 100644
@@ -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
include/configs/cm_t43.h +0 -1
index 92ff251..3a605f7 100644
@@ -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
include/configs/cm_t54.h +0 -2
index ddb1e97..a3b1e5f 100644
@@ -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
include/configs/duovero.h +0 -1
index 868158b..b5bd3ba 100644
@@ -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
include/configs/gw_ventana.h +0 -1
index f01a74a..41aa0f3 100644
@@ -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)
include/configs/ipam390.h +0 -1
index 5f07629..381fe04 100644
@@ -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
include/configs/microblaze-generic.h +0 -1
index a07bcc6..32b0c62 100644
@@ -292,7 +292,6 @@
 #endif
 
 /* for booting directly linux */
-#define CONFIG_SPL_OS_BOOT
 
 #define CONFIG_SYS_OS_BASE		(CONFIG_SYS_FLASH_BASE + \
 					 0x60000)
include/configs/omap3_zoom1.h +0 -1
index 6397051..d605a07 100644
@@ -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
include/configs/pepper.h +0 -1
index 1bc8c4b..4231e28 100644
@@ -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 */
include/configs/smartweb.h +0 -1
index fd557a9..41de667 100644
@@ -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 */
include/configs/taurus.h +0 -1
index 1be4341..1fa9eb3 100644
@@ -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
include/configs/ti_armv7_common.h +0 -3
index f5602b8..f31d5d3 100644
@@ -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
include/configs/ti_armv7_keystone2.h +0 -1
index c42dedb..79b22cd 100644
@@ -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
include/configs/twister.h +0 -1
index 66f4680..fd117b8 100644
@@ -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
include/configs/xilinx_zynqmp.h +0 -1
index adc42cf..cbdef6e 100644
@@ -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
include/configs/zynq-common.h +0 -1
index f1c9bed..ef446db 100644
@@ -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
Signature · 1 line
2.5.5
#2 lore raw

PATCH 1/2 spl: move SPL_OS_BOOT to Kconfig

Quoted 4 lines · Heiko Schocher

Move SPL_OS_BOOT to Kconfig and cleanup existing
uses.

Signed-off-by Heiko Schocher <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
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>
author
#3 lore raw

PATCH 2/2 spl: move SYS_OS_BASE to Kconfig

In reply to Heiko Schocher

Move SYS_OS_BASE to Kconfig and cleanup existing
uses.

Signed-off-by Heiko Schocher <[email protected]>

---

 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(-)
common/spl/Kconfig +10 -0
index 5e2890e..36544cc 100644
@@ -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
configs/a3m071_defconfig +1 -0
index 5356489..ae696b5 100644
@@ -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
configs/microblaze-generic_defconfig +1 -0
index bc97f60..3dbf48a 100644
@@ -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
include/configs/a3m071.h +0 -1
index 8514b0e..c437c4a 100644
@@ -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)
include/configs/microblaze-generic.h +0 -2
index 32b0c62..2a7006f 100644
@@ -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)
Signature · 1 line
2.5.5
#4 lore raw

PATCH 2/2 spl: move SYS_OS_BASE to Kconfig

Quoted 4 lines · Heiko Schocher

Move SYS_OS_BASE to Kconfig and cleanup existing
uses.

Signed-off-by Heiko Schocher <[email protected]>

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!

Signature · 8 lines
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>
#5 lore raw

cover spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig

In reply to Heiko Schocher
Quoted 71 lines · Heiko Schocher

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 2016-10-06 06:58:36.459726538 +0200 renamed from config_org 2016-10-06 06:58:01.636514195 +0200 +1 -0
@@ -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:

include/configs/baltos.h +0 -1
index 58df571..e69c1b6 100644
@@ -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
$
Quoted 8 lines

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

Quoted 107 lines

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(-)
#6 lore raw

cover spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig

Quoted 86 lines · Andrew F. Davis
Quoted 71 lines · Heiko Schocher

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 2016-10-06 06:58:36.459726538 +0200 renamed from config_org 2016-10-06 06:58:01.636514195 +0200 +1 -0
@@ -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:

include/configs/baltos.h +0 -1
index 58df571..e69c1b6 100644
@@ -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
$
Quoted 8 lines

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.

Quoted 3 lines

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.

Signature · 8 lines
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>
author
#7 lore raw

cover spl: move SPL_OS_BOOT and SYS_OS_BASE to Kconfig

In reply to Andrew F. Davis

Hello Andrew,

Am 06.10.2016 um 18:29 schrieb Andrew F. Davis:

Quoted 78 lines · Heiko Schocher
Quoted 77 lines

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 2016-10-06 06:58:36.459726538 +0200 renamed from config_org 2016-10-06 06:58:01.636514195 +0200 +1 -0
@@ -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:

include/configs/baltos.h +0 -1
index 58df571..e69c1b6 100644
@@ -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 ...

Quoted 7 lines
Quoted 2 lines

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 ...

Quoted 3 lines

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

Quoted 112 lines

Thanks,
Andrew

Quoted 107 lines

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(-)
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany