Kconfig: Migrate CONFIG_BOOTM_* options

Migrate all of the existing OS support options that are under
CONFIG_BOOTM_* to Kconfig.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index c61c851..8fcb1b8 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -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

diff --git a/configs/apalis-imx8qm_defconfig b/configs/apalis-imx8qm_defconfig
index 6a25938..071e470 100644 (file)
--- a/configs/apalis-imx8qm_defconfig
+++ b/configs/apalis-imx8qm_defconfig
@@ -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

diff --git a/configs/brsmarc1_defconfig b/configs/brsmarc1_defconfig
index 8863a2d..d0faa40 100644 (file)
--- a/configs/brsmarc1_defconfig
+++ b/configs/brsmarc1_defconfig
@@ -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

diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index d4169c0..d9b0e32 100644 (file)
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -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

diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig
index 20d23a0..5914bbd 100644 (file)
--- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig
@@ -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

diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index 8c21ff4..99b3deb 100644 (file)
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -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

diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig
index a223a16..b809905 100644 (file)
--- a/configs/colibri-imx8qxp_defconfig
+++ b/configs/colibri-imx8qxp_defconfig
@@ -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

diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index c1bee45..a9149dd 100644 (file)
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -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

diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index 1a012d8..c5de2e7 100644 (file)
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -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

diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig
index e45731e..59ba4bc 100644 (file)
--- a/configs/imx8mq_evk_defconfig
+++ b/configs/imx8mq_evk_defconfig
@@ -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

diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig
index 3294931..42591c7 100644 (file)
--- a/configs/imx8qm_mek_defconfig
+++ b/configs/imx8qm_mek_defconfig
@@ -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

diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig
index d7974e8..f4cc86e 100644 (file)
--- a/configs/imx8qxp_mek_defconfig
+++ b/configs/imx8qxp_mek_defconfig
@@ -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

diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index 1107507..b412358 100644 (file)
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -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

diff --git a/configs/mx7dsabresd_qspi_defconfig b/configs/mx7dsabresd_qspi_defconfig
index b8ced19..7223290 100644 (file)
--- a/configs/mx7dsabresd_qspi_defconfig
+++ b/configs/mx7dsabresd_qspi_defconfig
@@ -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

diff --git a/include/config_defaults.h b/include/config_defaults.h
index 4ed0968..d211a41 100644 (file)
--- a/include/config_defaults.h
+++ b/include/config_defaults.h
@@ -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

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 6eb8395..3a8d2d4 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -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

diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h
index c3eb5ba..19e796e 100644 (file)
--- a/include/configs/brsmarc1.h
+++ b/include/configs/brsmarc1.h
@@ -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

diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index 7309e7d..c6e308b 100644 (file)
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -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

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 7f3fdea..67c52d7 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -38,10 +38,6 @@
 #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

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 7367174..0a4f30f 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -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
 

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 6f3c34d..69a876f 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -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

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 49cdd61..4677e09 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -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

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index c211343..1ceec5a 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -69,7 +69,6 @@
 #undef CONFIG_CMD_IMLS
 
 #undef CONFIG_CMD_CRC32
-#undef CONFIG_BOOTM_NETBSD
 
 /* ENET Config */
 /* ENET1 */

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 5a9fd57..7a790ef 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -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

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 02c4e9f..c357c7b 100644 (file)
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -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

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 77856a8..e1f92da 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -30,10 +30,6 @@
 /* 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

diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h
index 4b3691b..d30a697 100644 (file)
--- a/include/configs/xilinx_versal_mini.h
+++ b/include/configs/xilinx_versal_mini.h
@@ -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

diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index 7138851..a692289 100644 (file)
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -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

diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h
index daf7d75..917f35b 100644 (file)
--- a/include/configs/zynq_cse.h
+++ b/include/configs/zynq_cse.h
@@ -19,8 +19,6 @@
 #undef CONFIG_GZIP
 
 #undef CONFIG_SYS_CBSIZE
-#undef CONFIG_BOOTM_VXWORKS
-#undef CONFIG_BOOTM_LINUX
 
 #define CONFIG_SYS_CBSIZE      1024
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b06a77e..5a007d3 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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