Kconfig: Migrate CONFIG_BOOTM_* options
authorTom Rini <trini@konsulko.com>
Fri, 20 Sep 2019 21:36:50 +0000 (17:36 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 4 Oct 2019 16:21:23 +0000 (12:21 -0400)
Migrate all of the existing OS support options that are under
CONFIG_BOOTM_* to Kconfig.

Signed-off-by: Tom Rini <trini@konsulko.com>
30 files changed:
cmd/Kconfig
configs/apalis-imx8qm_defconfig
configs/brsmarc1_defconfig
configs/brxre1_defconfig
configs/cl-som-imx7_defconfig
configs/colibri-imx6ull_defconfig
configs/colibri-imx8qxp_defconfig
configs/colibri_imx7_defconfig
configs/colibri_imx7_emmc_defconfig
configs/imx8mq_evk_defconfig
configs/imx8qm_mek_defconfig
configs/imx8qxp_mek_defconfig
configs/mx7dsabresd_defconfig
configs/mx7dsabresd_qspi_defconfig
include/config_defaults.h
include/configs/apalis-imx8.h
include/configs/brsmarc1.h
include/configs/brxre1.h
include/configs/cl-som-imx7.h
include/configs/colibri-imx6ull.h
include/configs/colibri-imx8x.h
include/configs/colibri_imx7.h
include/configs/imx8mq_evk.h
include/configs/imx8qm_mek.h
include/configs/imx8qxp_mek.h
include/configs/mx7dsabresd.h
include/configs/xilinx_versal_mini.h
include/configs/xilinx_zynqmp_mini.h
include/configs/zynq_cse.h
scripts/config_whitelist.txt

index c61c85162293f3244bc54873cdea7561ad0af369..8fcb1b8474140638b576b5da93cc8ccef4ee1b19 100644 (file)
@@ -268,6 +268,54 @@ config CMD_BOOTEFI
        help
          Boot an EFI image from memory.
 
+config BOOTM_LINUX
+       bool "Support booting Linux OS images"
+       depends on CMD_BOOTM || CMD_BOOTZ || CMD_BOOTI
+       default y
+       help
+         Support booting the Linux kernel directly via a command such as bootm
+         or booti or bootz.
+
+config BOOTM_NETBSD
+       bool "Support booting NetBSD (non-EFI) loader images"
+       depends on CMD_BOOTM
+       default y
+       help
+         Support booting NetBSD via the bootm command.
+
+config BOOTM_OPENRTOS
+       bool "Support booting OPENRTOS / FreeRTOS images"
+       depends on CMD_BOOTM
+       help
+         Support booting OPENRTOS / FreeRTOS via the bootm command.
+
+config BOOTM_OSE
+       bool "Support booting Enea OSE images"
+       depends on CMD_BOOTM
+       help
+         Support booting Enea OSE images via the bootm command.
+
+config BOOTM_PLAN9
+       bool "Support booting Plan9 OS images"
+       depends on CMD_BOOTM
+       default y
+       help
+         Support booting Plan9 images via the bootm command.
+
+config BOOTM_RTEMS
+       bool "Support booting RTEMS OS images"
+       depends on CMD_BOOTM
+       default y
+       help
+         Support booting RTEMS images via the bootm command.
+
+config BOOTM_VXWORKS
+       bool "Support booting VxWorks OS images"
+       depends on CMD_BOOTM
+       default y
+       help
+         Support booting VxWorks images via the bootm command.
+
 config CMD_BOOTEFI_HELLO_COMPILE
        bool "Compile a standard EFI hello world binary for testing"
        depends on CMD_BOOTEFI && !CPU_V7M && !SANDBOX
index 6a259381c2416cec683ccef656220ad0ed5260e5..071e47062015a95e052c5f2a9461c71b6f649b45 100644 (file)
@@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CMD_CPU=y
+# CONFIG_BOOTM_NETBSD is not set
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_CLK=y
index 8863a2d5ccd5f57607b01b05c2654d9a44f11617..d0faa4058cdea67c9d810a118558e6ba72c083be 100644 (file)
@@ -41,6 +41,9 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EDITENV is not set
index d4169c03275db27d80530de7b8d872ea68fd682f..d9b0e320f58e2cdf63de10888276f5fd3d440eea 100644 (file)
@@ -36,6 +36,9 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EDITENV is not set
index 20d23a0ae31be8ae25e696e0b522a8b29a88339a..5914bbd6c22b22c6c5959fe27b3515727cba9e91 100644 (file)
@@ -26,6 +26,9 @@ CONFIG_SPL_SPI_LOAD=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="CL-SOM-iMX7 # "
 CONFIG_CMD_BOOTZ=y
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EXPORTENV is not set
index 8c21ff4d6ef12a8b047006226c955f300abf76c6..99b3deb8a147069822333216769cd86d510a75da 100644 (file)
@@ -16,6 +16,8 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_SYS_PROMPT="Colibri iMX6ULL # "
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
index a223a16ddd85cf8a7d6adeaf9e5d2d466302b9a2..b809905ce5da0e55651f341d496fc28135404971 100644 (file)
@@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CMD_CPU=y
+# CONFIG_BOOTM_NETBSD is not set
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_CLK=y
index c1bee450f6ec2d6eeddd2321a29eda9199c4ef53..a9149dd15c76cfe21aa925c3b4e8c4d562c443b6 100644 (file)
@@ -19,6 +19,8 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_SYS_PROMPT="Colibri iMX7 # "
 # CONFIG_CMD_BOOTD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_ASKENV=y
index 1a012d851e40b74576575a7344a19d9e03ec8958..c5de2e7b1cc1252d24cb3a54e05920758719893c 100644 (file)
@@ -20,6 +20,8 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_SYS_PROMPT="Colibri iMX7 # "
 # CONFIG_CMD_BOOTD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_ASKENV=y
index e45731edda71a18272b999ac2b5fe917b8218277..59ba4bcb520b980df467a22c3231feb6cf67292c 100644 (file)
@@ -14,6 +14,7 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_HUSH_PARSER=y
+# CONFIG_BOOTM_NETBSD is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_CACHE=y
index 3294931ef8f1a0d16da9e22b11ddc789f2c7722a..42591c77812ca300b46613ba0256e1c6b3a8fd38 100644 (file)
@@ -24,6 +24,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_POWER_DOMAIN=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_CMD_CPU=y
+# CONFIG_BOOTM_NETBSD is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DM=y
index d7974e8fad448b1ce1bb8823065912743ee5c1ae..f4cc86ec1d0e0f1ec41ca3480da837059f1a4f44 100644 (file)
@@ -27,6 +27,7 @@ CONFIG_SPL_POWER_DOMAIN=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
+# CONFIG_BOOTM_NETBSD is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DM=y
index 1107507b51f468998af42275e55667f47b3e68bd..b41235899570456b2126b418370b260a93688ee2 100644 (file)
@@ -14,6 +14,9 @@ CONFIG_BOUNCE_BUFFER=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EXPORTENV is not set
index b8ced1994a051aa420e130516e536d3177a8e84a..7223290e59ca7eabd6d632deed2b292db4504e3d 100644 (file)
@@ -13,6 +13,9 @@ CONFIG_BOUNCE_BUFFER=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EXPORTENV is not set
index 4ed09683b650a08468600dfc3dae3659dd22e100..d211a41ef29043b8dba4f59212dd06c0ae18366a 100644 (file)
@@ -9,11 +9,4 @@
 #ifndef _CONFIG_DEFAULTS_H_
 #define _CONFIG_DEFAULTS_H_
 
-/* Support bootm-ing different OSes */
-#define CONFIG_BOOTM_LINUX 1
-#define CONFIG_BOOTM_NETBSD 1
-#define CONFIG_BOOTM_PLAN9 1
-#define CONFIG_BOOTM_RTEMS 1
-#define CONFIG_BOOTM_VXWORKS 1
-
 #endif
index 6eb8395162b423fe098c3800a8cb824617048c60..3a8d2d40d7765af7ee348996ed2fb3e49b1c41ef 100644 (file)
@@ -13,8 +13,6 @@
 
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
-#undef CONFIG_BOOTM_NETBSD
-
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define USDHC1_BASE_ADDR               0x5b010000
 #define USDHC2_BASE_ADDR               0x5b020000
index c3eb5baacc474ddab5b05ae40bdb39b313f6b9b0..19e796edb12d786b7b808b2a3bcee8bbb58fe052 100644 (file)
@@ -61,11 +61,6 @@ BUR_COMMON_ENV \
 " bootm ${loadaddr} - ${dtbaddr}\0"
 #endif /* !CONFIG_SPL_BUILD*/
 
-/* undefine command which we not need here */
-#undef CONFIG_BOOTM_NETBSD
-#undef CONFIG_BOOTM_PLAN9
-#undef CONFIG_BOOTM_RTEMS
-
 /* Support both device trees and ATAGs. */
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
index 7309e7d4831d2401467b73d60fe781733a7b4764..c6e308b04d059616337482716ab2c5e6da7a36f9 100644 (file)
@@ -58,11 +58,6 @@ BUR_COMMON_ENV \
 
 #define CONFIG_BOOTCOMMAND             "mmc dev 1; run b_default"
 
-/* undefine command which we not need here */
-#undef CONFIG_BOOTM_NETBSD
-#undef CONFIG_BOOTM_PLAN9
-#undef CONFIG_BOOTM_RTEMS
-
 /* Support both device trees and ATAGs. */
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
index 7f3fdea039fb79b5f572ca7b3170e69f961dbdca..67c52d76e72d2dc3d7feca5433f5d463b1e39aae 100644 (file)
 #define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR        0x08
 
-#undef CONFIG_BOOTM_NETBSD
-#undef CONFIG_BOOTM_PLAN9
-#undef CONFIG_BOOTM_RTEMS
-
 /* I2C configs */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
index 736717486bffb85d83fe7503df066940184653c1..0a4f30fbaf4d0cc1eb1765d35b154a98ecdde448 100644 (file)
@@ -28,9 +28,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       1
 
-#undef CONFIG_BOOTM_PLAN9
-#undef CONFIG_BOOTM_RTEMS
-
 /* I2C configs */
 #define CONFIG_SYS_I2C_SPEED           100000
 
index 6f3c34d1ad98ef2531be92b4922d76756e1764ee..69a876fee352c3e13c6ca1b1895dec0dc4910dfe 100644 (file)
@@ -13,8 +13,6 @@
 
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
-#undef CONFIG_BOOTM_NETBSD
-
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define USDHC1_BASE_ADDR               0x5b010000
 #define USDHC2_BASE_ADDR               0x5b020000
index 49cdd610387eba9d68a2d465636475633f0f94f8..4677e09b47558c249e6afeb449051683600aec58 100644 (file)
@@ -35,9 +35,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #endif
 
-#undef CONFIG_BOOTM_PLAN9
-#undef CONFIG_BOOTM_RTEMS
-
 /* I2C configs */
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED           100000
index c2113439c30236225ad28743fa0467f93cf537a8..1ceec5ab5abb9eb84b4da7e989c973d525b41a07 100644 (file)
@@ -69,7 +69,6 @@
 #undef CONFIG_CMD_IMLS
 
 #undef CONFIG_CMD_CRC32
-#undef CONFIG_BOOTM_NETBSD
 
 /* ENET Config */
 /* ENET1 */
index 5a9fd57060bbfaf02dd25c63a76984ebd806537b..7a790ef15815f5957caf6280e56ab3986248f9bb 100644 (file)
@@ -45,7 +45,6 @@
 #undef CONFIG_CMD_IMLS
 
 #undef CONFIG_CMD_CRC32
-#undef CONFIG_BOOTM_NETBSD
 
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 #define USDHC1_BASE_ADDR                0x5B010000
index 02c4e9f8f67d2fe59acbe8d4eda65a1bf6a05e84..c357c7bbe6a60e5443031304b984fe7b329a9f16 100644 (file)
@@ -44,7 +44,6 @@
 #undef CONFIG_CMD_IMLS
 
 #undef CONFIG_CMD_CRC32
-#undef CONFIG_BOOTM_NETBSD
 
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 #define USDHC1_BASE_ADDR                0x5B010000
index 77856a8f3a47991c2f0f18cfb57fa402e09b0a35..e1f92da48ca6b340a18208274de7a98555fb6e75 100644 (file)
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
-#undef CONFIG_BOOTM_NETBSD
-#undef CONFIG_BOOTM_PLAN9
-#undef CONFIG_BOOTM_RTEMS
-
 /* I2C configs */
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED           100000
index 4b3691b407336420785c62a816e5c9cb42ed5736..d30a697a57ea2bec20798541f31f0ec5a97f954c 100644 (file)
@@ -21,9 +21,6 @@
 #undef CONFIG_ZLIB
 #undef CONFIG_GZIP
 #undef CONFIG_CMD_ENV
-#undef CONFIG_BOOTM_NETBSD
-#undef CONFIG_BOOTM_VXWORKS
-#undef CONFIG_BOOTM_LINUX
 
 /* BOOTP options */
 #undef CONFIG_BOOTP_BOOTFILESIZE
index 7138851daefadef7d222f1030d2ac192e8f68fa1..a6922896e0e12cb85d17e1ebdf5e9ed06c359411 100644 (file)
@@ -24,9 +24,6 @@
 #undef CONFIG_GZIP
 #undef CONFIG_CMD_ENV
 #undef CONFIG_SYS_INIT_SP_ADDR
-#undef CONFIG_BOOTM_NETBSD
-#undef CONFIG_BOOTM_VXWORKS
-#undef CONFIG_BOOTM_LINUX
 
 /* BOOTP options */
 #undef CONFIG_BOOTP_BOOTFILESIZE
index daf7d75d3008b652d6466388a822bfda73f40a73..917f35b24c5f2d5339497a03518b9ee5433b1570 100644 (file)
@@ -19,8 +19,6 @@
 #undef CONFIG_GZIP
 
 #undef CONFIG_SYS_CBSIZE
-#undef CONFIG_BOOTM_VXWORKS
-#undef CONFIG_BOOTM_LINUX
 
 #define CONFIG_SYS_CBSIZE      1024
 
index b06a77ebd66cc63afb2c1229657d657e503f0243..5a007d37091cc38c698f20a1f5d3ddd6e610215d 100644 (file)
@@ -128,13 +128,6 @@ CONFIG_BOOGER
 CONFIG_BOOTBLOCK
 CONFIG_BOOTFILE
 CONFIG_BOOTMODE
-CONFIG_BOOTM_LINUX
-CONFIG_BOOTM_NETBSD
-CONFIG_BOOTM_OPENRTOS
-CONFIG_BOOTM_OSE
-CONFIG_BOOTM_PLAN9
-CONFIG_BOOTM_RTEMS
-CONFIG_BOOTM_VXWORKS
 CONFIG_BOOTP_
 CONFIG_BOOTP_BOOTFILE
 CONFIG_BOOTP_BOOTFILESIZE