Skip to contentSkip to conversation

Kconfig: Migrate CONFIG_BOOTM_* options

PATCH New Tom Rini 1 participant 2 messages Sep 20, 2019 – Oct 6, 2019

Subsystems (2)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 Kconfig: Migrate CONFIG_BOOTM_* options

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

---
 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(-)
cmd/Kconfig +48 -0
index 98647f58b7ac..e27636254ba3 100644
@@ -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
configs/apalis-imx8qm_defconfig +1 -0
index 6a259381c241..071e47062015 100644
@@ -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
configs/brsmarc1_defconfig +3 -0
index 8863a2d5ccd5..d0faa4058cde 100644
@@ -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
configs/brxre1_defconfig +3 -0
index d4169c03275d..d9b0e320f58e 100644
@@ -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
configs/cl-som-imx7_defconfig +3 -0
index 04d104206076..015a59a6a1b1 100644
@@ -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
configs/colibri-imx6ull_defconfig +2 -0
index 25a8ba533fc3..e081e7d9c542 100644
@@ -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
configs/colibri-imx8qxp_defconfig +1 -0
index a223a16ddd85..b809905ce5da 100644
@@ -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
configs/colibri_imx7_defconfig +2 -0
index c1bee450f6ec..a9149dd15c76 100644
@@ -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
configs/colibri_imx7_emmc_defconfig +2 -0
index 1a012d851e40..c5de2e7b1cc1 100644
@@ -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
configs/imx8mq_evk_defconfig +1 -0
index 48b16a4e24bf..7c87014e965a 100644
@@ -14,6 +14,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
 CONFIG_SPL_TEXT_BASE=0x7E1000
 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
configs/imx8qm_mek_defconfig +1 -0
index 3294931ef8f1..42591c77812c 100644
@@ -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
configs/imx8qxp_mek_defconfig +1 -0
index d7974e8fad44..f4cc86ec1d0e 100644
@@ -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
configs/mx7dsabresd_defconfig +3 -0
index 1107507b51f4..b41235899570 100644
@@ -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
configs/mx7dsabresd_qspi_defconfig +3 -0
index b8ced1994a05..7223290e59ca 100644
@@ -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
include/config_defaults.h +0 -7
index 4ed09683b650..d211a41ef290 100644
@@ -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
include/configs/apalis-imx8.h +0 -2
index 6eb8395162b4..3a8d2d40d776 100644
@@ -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
include/configs/brsmarc1.h +0 -5
index c3eb5baacc47..19e796edb12d 100644
@@ -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
include/configs/brxre1.h +0 -5
index 7309e7d4831d..c6e308b04d05 100644
@@ -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
include/configs/cl-som-imx7.h +0 -4
index 7f3fdea039fb..67c52d76e72d 100644
@@ -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
include/configs/colibri-imx6ull.h +0 -3
index 736717486bff..0a4f30fbaf4d 100644
@@ -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
 
include/configs/colibri-imx8x.h +0 -2
index 6f3c34d1ad98..69a876fee352 100644
@@ -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
include/configs/colibri_imx7.h +0 -3
index 49cdd610387e..4677e09b4755 100644
@@ -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
include/configs/imx8mq_evk.h +0 -1
index c2113439c302..1ceec5ab5abb 100644
@@ -69,7 +69,6 @@
 #undef CONFIG_CMD_IMLS
 
 #undef CONFIG_CMD_CRC32
-#undef CONFIG_BOOTM_NETBSD
 
 /* ENET Config */
 /* ENET1 */
include/configs/imx8qm_mek.h +0 -1
index 5a9fd57060bb..7a790ef15815 100644
@@ -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
include/configs/imx8qxp_mek.h +0 -1
index 02c4e9f8f67d..c357c7bbe6a6 100644
@@ -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
include/configs/mx7dsabresd.h +0 -4
index 77856a8f3a47..e1f92da48ca6 100644
@@ -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
include/configs/xilinx_versal_mini.h +0 -3
index 4b3691b40733..d30a697a57ea 100644
@@ -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
include/configs/xilinx_zynqmp_mini.h +0 -3
index 7138851daefa..a6922896e0e1 100644
@@ -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
include/configs/zynq_cse.h +0 -2
index daf7d75d3008..917f35b24c5f 100644
@@ -19,8 +19,6 @@
 #undef CONFIG_GZIP
 
 #undef CONFIG_SYS_CBSIZE
-#undef CONFIG_BOOTM_VXWORKS
-#undef CONFIG_BOOTM_LINUX
 
 #define CONFIG_SYS_CBSIZE	1024
 
scripts/config_whitelist.txt +0 -7
index b18eab1707ac..51cd0e541008 100644
@@ -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
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/1 Kconfig: Migrate CONFIG_BOOTM_* options

Quoted 4 lines · Tom Rini

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

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: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191005/fc35a42b/attachment.sig>