spl: move SPL_OS_BOOT to Kconfig

Move SPL_OS_BOOT to Kconfig and cleanup existing
uses.

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 72aacab52cbe6a8dcf34552cb2491fb0d632c8a2..74f7abc06b3418333641931a76447affd4569709 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -381,6 +381,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 9e573a7b38c5e35826ddbfb3f5087e295a8e22d9..5356489099d6a0debbea033bdf34079190479a3d 100644 (file)
--- 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 aa09bf5e6475dbaa1eca7e72b877c2bd5f07c2ee..c54689d1ed8a3e302c848ec00d84bc1f1afaf751 100644 (file)
--- 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 1049a6de732e1efec2fbac7876e84aab8e2ecdab..12b38554243672983e39dc78689dd3d77c3413bf 100644 (file)
--- 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 c6ef65072a693e9dae34edaffa543d1ff257f6b3..60d28510cff11bcef56460d905c34e48f1b042cc 100644 (file)
--- 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 3136957aec04dec6a55f5c5bd65a3b43674340a3..00bf4a438a7b91881cf6506d9a0599b112b18d84 100644 (file)
--- 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 1f12facc398c318e55e3ca4d9a2423682530e55a..1046463cd6e6c98823ade1d249a943ead7f3bd6c 100644 (file)
--- 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 1c3e04d7331e95c1b01ef5f7287c1ab895c71f44..b5d442407242fedcc17574a98a8e9506b243e011 100644 (file)
--- 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 5eabd99e16d2b6939c343a421f6e74610283f649..cbafdb1a990c6e90721ffebd3943f0c11293489c 100644 (file)
--- 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 93bbf313ab053cd4587973eb4723f54f9f80f28f..203376625b5d1b71ed3ddcd2dab459df17a6da71 100644 (file)
--- 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 6e8a9bf29d8feb2d9cd2d49c64d3406f8fa81e28..c6a6a1d9a567f2462cb0ff4b5c4ed72c8f424c31 100644 (file)
--- 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 1ce8700d37b23e116a735051a5c3a9eda28b3cf7..374e5a648598e8676d8b305178720b81bfc5992b 100644 (file)
--- 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 ee8ed06b2068b6a23698670df684bd02745ddf4b..356046e79bab73bbb07fa936397c725f23c31a26 100644 (file)
--- 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 ee8ed06b2068b6a23698670df684bd02745ddf4b..356046e79bab73bbb07fa936397c725f23c31a26 100644 (file)
--- 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 9dba3f01f8bc7fc3737cf7f8215de49773cf1e20..89c45da345f21783e51e04d1c37be88eb001be06 100644 (file)
--- 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 304743d0e952e416a38ed942a47735fc6b5ec5a7..e63ee77cc735e154cf6c6f58992b55dc5c9bd1ee 100644 (file)
--- 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 4ed2ac39aca0d1c859a19c473b322a2385e60fdd..99d0990e5b20bc87cdad3c4e785e40d1b592bfe2 100644 (file)
--- 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 f3853717a37c6aa6bc208cdc92e07cb75f4719da..00874dd1524fbbc5d432a4c7a8194d97f9346062 100644 (file)
--- 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 af54ebefec07e4158405fb9c0ac2e075cfeb95df..5acd4e711c4c80b4cf94597ee7710f40f1dfb8bc 100644 (file)
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -14,6 +14,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 608cc10d3b469d64e9c36b247dc7ec3003ede816..9588a55f44830f9279eb59ad6872a30583dff5ef 100644 (file)
--- 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 d87c34297905a8f66201f40d0b511ce522ee92f8..5a773ca7779e69b56098cfe65c362e8fd64c46d6 100644 (file)
--- 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 f4bc68706bd50a0a60150ca4a8f54d74c686e25c..f2d943955312f71597b20cae660f191295150b81 100644 (file)
--- 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 e6c0b80144e50da75d1d559749fcf701843744f1..ba13212186ac9f6080d2726098749da007fbe4f1 100644 (file)
--- 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 e836e5e6a759ddbdd95d4660b8bc740925ece212..39a35e9649a750da2106a907a0aeec11e544ae39 100644 (file)
--- 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 c883380d4f7dd1c42113e638cd3a90e443fc99d9..e84a8a1274b200bd391552070350c21d433520d7 100644 (file)
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -14,6 +14,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_FASTBOOT=y
 CONFIG_USB_FUNCTION_FASTBOOT=y

diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index acf9b8494c275650c5d1c7559fbdda0326f0532a..ee823d26e1df3f36b1714c1f9a183c5e94a07c01 100644 (file)
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -20,6 +20,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 0ec4ebc04fe8fa48074dcd357ca9c841a8af8162..8c1174e3a071a7d253874bc487ca31b97587fa44 100644 (file)
--- 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 bc0ec6ab70f9c420fa4aec9ec3dc766857142c3d..4bc0def728339cefc67115c03d75b1e9cfc4a120 100644 (file)
--- 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 075088149b96f65412678d93db7dcb3c765812a2..e053e4d4593ba2e208cf1fbd33cbf1243351658b 100644 (file)
--- 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 280afbde1b4e944d2414289057fd729d9c4535b6..b2c5c71aa75b5ab3b0bfbc3cac0f9314006d996d 100644 (file)
--- 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 603b41bbc173ab4fd0dee1cae62ce852838093f2..f80b0598a0beab7925f255ed361451268b2ac4eb 100644 (file)
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -10,6 +10,7 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 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 cf6c4b1f849a5f599baf50576a5872d0f43c098a..bc97f60ade0aa29c3d60e3843f98342aa8c9317c 100644 (file)
--- 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 ece9638e49c89668dd8c27321b5797c70f25e1b1..a76a5a35a53eee854a5fa56475549dd7a8af8729 100644 (file)
--- 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 26146d211b100454ea1677bf2e60024bd270f10c..30f06bdf8ce5faec61530f6d4052e009713b4f71 100644 (file)
--- 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 a4160723116c0fe2645270b22d6200dab3436b92..5a7c6566e9f3ffed7bc123bfabbbe5bfc5b24430 100644 (file)
--- 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 e496afe9f879f8df9a4d090f29c28b94bfdd2563..fc6dda01608fdb9a562f214bb33df7c1dd8119e6 100644 (file)
--- 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 ea62104fc1f7800dc7c118fc04c8fd155d83365a..64c291b4a3bb46c5f08bd9d59448f8f7e45a3678 100644 (file)
--- 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 63ff1bcc8e0943813c047553024c3d02b2f0b450..50dda81483b84f7fb039b504f31cacd9745d6292 100644 (file)
--- 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 dfe9da3a4cc31e3efd642cb1ce81e92ad61385a7..1c11fde5b39b69d5a45e8136c1ace9c200ccf61d 100644 (file)
--- 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 61102e02df11f23a1dec1c75d75cfc43f3d087e1..b14754f3166ca77c7bcd88c8c2732e91454762bc 100644 (file)
--- 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 feec566c3ed2491f508064dff939c10fd1df4ae1..5aa9f4bd5dc0f0ef3c8f3358302979902537e6eb 100644 (file)
--- 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 f41914094833f3a140f18200cbcb53780d66c425..c92bfc892383437aa54ebbcc3fd29970aa9cddfe 100644 (file)
--- 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 af0dd1bd881404f1b21a4eb7e3887ca0ec8c725c..74739e5acf7c31a31d446eb9e7cea3faf777e596 100644 (file)
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 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 490c3b2e555320c64c3bb0cf38e7b840c2dea3c1..a2938a0a9ff5872e93ab79c477c9dbe9cb55bf16 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 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 30f408196c76bb19fe52a48220f6df945edcf945..6c9ee65ec982e1062227e15d9d8efddb97e4824d 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 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 ec55a6d81fe3a3d99524a8ed487e560e280ae0e0..2feee77118a4cbc03c537b1921264f4d4b4e420a 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
@@ -11,6 +11,7 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 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 f9754b608b0d7382318563e6af400edc9ac63d55..7df0c77d48e4b4798a9c90093c458df0defc4eaf 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 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 71345085c1994bc8e27b6c24328bc619cd129689..2dcc60eb497ddb652f41eaf4ec77ea2a81042be1 100644 (file)
--- a/configs/xilinx_zynqmp_zcu102_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_defconfig
@@ -14,6 +14,7 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 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 76655436cbeeade05396d8ceffd96e5e722bee90..494bdc6000d64aac8855da8af6f5483018bbf7d7 100644 (file)
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -14,6 +14,7 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 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 faaf48278f49f92e5305629dd882d646ee221650..16d26c0e10ba9dad418764abb410010a4267efb2 100644 (file)
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_NO_FLASH=y
 # CONFIG_DISPLAY_CPUINFO is not set
 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 ef379141c7a1c0c790fb0b2e788ad79975e70f12..3ba6b6686682294c91546d4e325af8aa3ec8a097 100644 (file)
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -4,6 +4,7 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
 CONFIG_SYS_NO_FLASH=y
 # CONFIG_DISPLAY_CPUINFO is not set
 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 acbc5a2f45e72407c801eeb5a951b3a689e062f1..117bfda68d7465cdd749c889ae64cf44fc04c1c4 100644 (file)
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -8,6 +8,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_NO_FLASH=y
 # CONFIG_DISPLAY_CPUINFO is not set
 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 64d95d96971f6ec704d5e410fbb557261cc1d278..ef73849ea1d2ae2f8478e06b295a8165e1310f4f 100644 (file)
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -8,6 +8,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_NO_FLASH=y
 # CONFIG_DISPLAY_CPUINFO is not set
 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 bec60cc6a3a6f4335f60e1eb0efe4d86de58a36f..1419efa2b8c7cd5d9acd482aed55b6f93eb0d0cd 100644 (file)
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 CONFIG_SYS_NO_FLASH=y
 # CONFIG_DISPLAY_CPUINFO is not set
 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 489becb6ca3cf83b81c0ba1b26aec380acf0cc1b..56c285115453a1b3cc668026dca9d74fcbe5fb33 100644 (file)
--- a/configs/zynq_zc770_xm011_defconfig
+++ b/configs/zynq_zc770_xm011_defconfig
@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011"
 CONFIG_SYS_NO_FLASH=y
 # CONFIG_DISPLAY_CPUINFO is not set
 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 55a7336127e64ee8b5737683086ba47b3acbbd4c..d3116e171a4667ea02cd59cea535bdf2f41d56af 100644 (file)
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 # CONFIG_DISPLAY_CPUINFO is not set
 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 265e6412dfcd3ddbfc2724a2716f627fea4d2204..add038ce7f71f788818fc5bca8f44302af256275 100644 (file)
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 CONFIG_SYS_NO_FLASH=y
 # CONFIG_DISPLAY_CPUINFO is not set
 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 93e9f17ef4aff9795c803418c4a0bec7c7581eb0..96f00e41380c6b7f0fd61f7232f90e8890675aeb 100644 (file)
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_NO_FLASH=y
 # CONFIG_DISPLAY_CPUINFO is not set
 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 8a81ef57a84a5a343f3321ce912029c8d9d47111..dfac76458fb789e70a598754c90a3b60c598b6e3 100644 (file)
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -8,6 +8,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_NO_FLASH=y
 # CONFIG_DISPLAY_CPUINFO is not set
 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 1919475d19830c4a4a155386824044bf6d210460..93be3d6edc8afae69892f09c8a9181a06b405d41 100644 (file)
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -401,7 +401,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) at this address */
 #define CONFIG_SYS_SPL_ARGS_ADDR       0x01800000
 

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index daa7dd8b9f23047f50d4ac42f806d983f694abe7..ec70b72970e39fffcda863e6d7e83e56e3540fb1 100644 (file)
--- 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 18db58ad8afc385e3e70032fdaaa5219916b1c1d..32aa392e8b4d10801ee9378c35c9666eec24c222 100644 (file)
--- 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 58df571323e98f440c837392501d1a7c8a7fbffe..e69c1b63c1442710cd990bfb2928c1bdc9ef15ce 100644 (file)
--- 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 f1ae1a6c19d198f9303faa4b0ab487763a3759b5..ac47decb6387814020b02b7c1d1d683d3f6b6b27 100644 (file)
--- 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 e01d53565cb382c6f82e3765c047966b3e0a3cfe..ccc5bb4b37b40628e8d6d368899358a305b29921 100644 (file)
--- 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 6dbc9e980c9b1e2152561f57581acddc33559ec8..7eed776f62faebf1b975f3698bfd4b0dfdc19c4c 100644 (file)
--- 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 92ff25131023fc5698dc4e0bb7af9ebe6d07d9d8..3a605f7504b89c3bd464b883a350c63b9284f277 100644 (file)
--- 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 ddb1e97b6c85f7207426b44cf8b1f06dc427db0a..a3b1e5fe8b83d5a14ea5eaec78b43a7322a8797d 100644 (file)
--- 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 868158b2e012f8c078070e1f99eeb607dff57171..b5bd3ba651fde4e242afaff64eba9dfc46ea535d 100644 (file)
--- 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 6caa3b101468afbf8f21c5d752677b739ac760e2..882d2138d21fd7c3f068ff841752d72b54a0241f 100644 (file)
--- 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 5f07629a597769ff7ec4c920d8653adc14424d7c..381fe04aeaff66aa4254d7fb94ff85db6b6f4c56 100644 (file)
--- 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 a07bcc632ca9bfd78f61680a0f517fe06ced8d84..32b0c62376f9945490235baa884b25bfccaaaf2f 100644 (file)
--- 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 4dcd5de2bc9d570fbe7583aa7f2c210c3e2c3cdd..0f28278fc2223a71cb36bb3d7e52f57b46d9a914 100644 (file)
--- 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 921d33124db066b2e05ccfd34191f7fcdf352aeb..e99188fc43e3f36130de1cfbeb8d7523bba17c50 100644 (file)
--- 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 0302740cea3f4abab1732f7a829fcbf224b631af..df5fe2163f05285ac41a0c3db2ec9d82045816e4 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -275,6 +275,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 3a762e363fd8de1b62040d519d8b6be56b90f5d3..ab457da2a0064a92bb4b23008b43863be2ec963f 100644 (file)
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -139,7 +139,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 f5602b8c3ee448de9723667f25689af4a6e3b61a..f31d5d368705814a82ce342096d32fa71f95f694 100644 (file)
--- 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 66d85be7223be65e56a79f47983a43d22cec31bb..7e365aa6c60aa9df20012cfe9b6175bb3909f1b5 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -301,7 +301,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 66f4680b7e129740c3946d1e147ac4d5ddeba3ad..fd117b8260c10cc967c809aeaded19e6090d0d88 100644 (file)
--- 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 adc42cff125bcb8a5f2dfee3cb13cb8b42b3b55a..cbdef6eafd0c6d993220f51bd21c67e0bbad5a88 100644 (file)
--- 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 0118fd246243addcef2d25fb8698f0f4c4b3fb6d..4f0253cd7d4c2576385f763c4ee4830241745568 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -330,7 +330,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