Migrate all of the existing OS support options that are under
CONFIG_BOOTM_* to Kconfig.
Signed-off-by: Tom Rini
---
cmd/Kconfig | 48
configs/apalis-imx8qm_defconfig | 1 +
configs/brsmarc1_defconfig | 3 +++
configs/brxre1_defconfig | 3 +++
configs/cl-som-imx7_defconfig| 3 +++
configs/colibri-imx6ull_defconfig| 2 ++
configs/colibri-imx8qxp_defconfig| 1 +
configs/colibri_imx7_defconfig | 2 ++
configs/colibri_imx7_emmc_defconfig | 2 ++
configs/imx8mq_evk_defconfig | 1 +
configs/imx8qm_mek_defconfig | 1 +
configs/imx8qxp_mek_defconfig| 1 +
configs/mx7dsabresd_defconfig| 3 +++
configs/mx7dsabresd_qspi_defconfig | 3 +++
include/config_defaults.h| 7 --
include/configs/apalis-imx8.h| 2 --
include/configs/brsmarc1.h | 5
include/configs/brxre1.h | 5
include/configs/cl-som-imx7.h| 4 ---
include/configs/colibri-imx6ull.h| 3 ---
include/configs/colibri-imx8x.h | 2 --
include/configs/colibri_imx7.h | 3 ---
include/configs/imx8mq_evk.h | 1 -
include/configs/imx8qm_mek.h | 1 -
include/configs/imx8qxp_mek.h| 1 -
include/configs/mx7dsabresd.h| 4 ---
include/configs/xilinx_versal_mini.h | 3 ---
include/configs/xilinx_zynqmp_mini.h | 3 ---
include/configs/zynq_cse.h | 2 --
scripts/config_whitelist.txt | 7 --
30 files changed, 74 insertions(+), 53 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 98647f58b7ac..e27636254ba3 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -267,6 +267,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 6a259381c241..071e47062015 100644
--- 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 8863a2d5ccd5..d0faa4058cde 100644
--- 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 d4169c03275d..d9b0e320f58e 100644
--- 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 04d104206076..015a59a6a1b1 100644
--- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig
@@ -26,6 +26,9 @@ CONFIG_SPL_SPI_LOAD=y
CONF
