Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 07:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Kconfig: Migrate CONFIG_BOOTM_* options

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

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2019-09-20 17:36:50 -04:00
parent 400b9554cc
commit 4b0bcfa7c4
30 changed files with 74 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
cmd/Kconfig
View file

@ -268,6 +268,54 @@ config CMD_BOOTEFI
help help
Boot an EFI image from memory. 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 config CMD_BOOTEFI_HELLO_COMPILE
bool "Compile a standard EFI hello world binary for testing" bool "Compile a standard EFI hello world binary for testing"
depends on CMD_BOOTEFI && !CPU_V7M && !SANDBOX depends on CMD_BOOTEFI && !CPU_V7M && !SANDBOX

1
configs/apalis-imx8qm_defconfig
View file

@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_CMD_CPU=y CONFIG_CMD_CPU=y
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_ASKENV=y CONFIG_CMD_ASKENV=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_CLK=y CONFIG_CMD_CLK=y

3
configs/brsmarc1_defconfig
View file

@ -41,6 +41,9 @@ CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTD is not set
CONFIG_CMD_BOOTZ=y 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_IMI is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EDITENV is not set # CONFIG_CMD_EDITENV is not set

3
configs/brxre1_defconfig
View file

@ -36,6 +36,9 @@ CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTD is not set
CONFIG_CMD_BOOTZ=y 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_IMI is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EDITENV is not set # CONFIG_CMD_EDITENV is not set

3
configs/cl-som-imx7_defconfig
View file

@ -26,6 +26,9 @@ CONFIG_SPL_SPI_LOAD=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="CL-SOM-iMX7 # " CONFIG_SYS_PROMPT="CL-SOM-iMX7 # "
CONFIG_CMD_BOOTZ=y 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_IMI is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_EXPORTENV is not set

2
configs/colibri-imx6ull_defconfig
View file

@ -16,6 +16,8 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOUNCE_BUFFER=y CONFIG_BOUNCE_BUFFER=y
CONFIG_SYS_PROMPT="Colibri iMX6ULL # " 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_ELF is not set
# CONFIG_CMD_IMI is not set # CONFIG_CMD_IMI is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set

1
configs/colibri-imx8qxp_defconfig
View file

@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_CMD_CPU=y CONFIG_CMD_CPU=y
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_ASKENV=y CONFIG_CMD_ASKENV=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_CLK=y CONFIG_CMD_CLK=y

2
configs/colibri_imx7_defconfig
View file

@ -19,6 +19,8 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOUNCE_BUFFER=y CONFIG_BOUNCE_BUFFER=y
CONFIG_SYS_PROMPT="Colibri iMX7 # " CONFIG_SYS_PROMPT="Colibri iMX7 # "
# CONFIG_CMD_BOOTD is not set # 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_IMI is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set
CONFIG_CMD_ASKENV=y CONFIG_CMD_ASKENV=y

2
configs/colibri_imx7_emmc_defconfig
View file

@ -20,6 +20,8 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SYS_PROMPT="Colibri iMX7 # " CONFIG_SYS_PROMPT="Colibri iMX7 # "
# CONFIG_CMD_BOOTD is not set # 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_IMI is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set
CONFIG_CMD_ASKENV=y CONFIG_CMD_ASKENV=y

1
configs/imx8mq_evk_defconfig
View 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_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOARD_INIT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y

1
configs/imx8qm_mek_defconfig
View file

@ -24,6 +24,7 @@ CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_POWER_DOMAIN=y
CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_CMD_CPU=y CONFIG_CMD_CPU=y
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_CMD_IMPORTENV is not set # CONFIG_CMD_IMPORTENV is not set
CONFIG_CMD_CLK=y CONFIG_CMD_CLK=y
CONFIG_CMD_DM=y CONFIG_CMD_DM=y

1
configs/imx8qxp_mek_defconfig
View file

@ -27,6 +27,7 @@ CONFIG_SPL_POWER_DOMAIN=y
CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y CONFIG_CMD_CPU=y
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_CMD_IMPORTENV is not set # CONFIG_CMD_IMPORTENV is not set
CONFIG_CMD_CLK=y CONFIG_CMD_CLK=y
CONFIG_CMD_DM=y CONFIG_CMD_DM=y

3
configs/mx7dsabresd_defconfig
View file

@ -14,6 +14,9 @@ CONFIG_BOUNCE_BUFFER=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTD is not set
CONFIG_CMD_BOOTZ=y 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_IMI is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_EXPORTENV is not set

3
configs/mx7dsabresd_qspi_defconfig
View file

@ -13,6 +13,9 @@ CONFIG_BOUNCE_BUFFER=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTD is not set
CONFIG_CMD_BOOTZ=y 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_IMI is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_EXPORTENV is not set

7
include/config_defaults.h
View file

@ -9,11 +9,4 @@
#ifndef _CONFIG_DEFAULTS_H_ #ifndef _CONFIG_DEFAULTS_H_
#define _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 #endif

2
include/configs/apalis-imx8.h
View file

@ -13,8 +13,6 @@
#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_DISPLAY_BOARDINFO_LATE
#undef CONFIG_BOOTM_NETBSD
#define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define USDHC1_BASE_ADDR 0x5b010000 #define USDHC1_BASE_ADDR 0x5b010000
#define USDHC2_BASE_ADDR 0x5b020000 #define USDHC2_BASE_ADDR 0x5b020000

5
include/configs/brsmarc1.h
View file

@ -61,11 +61,6 @@ BUR_COMMON_ENV \
" bootm ${loadaddr} - ${dtbaddr}\0" " bootm ${loadaddr} - ${dtbaddr}\0"
#endif /* !CONFIG_SPL_BUILD*/ #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. */ /* Support both device trees and ATAGs. */
#define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS

5
include/configs/brxre1.h
View file

@ -58,11 +58,6 @@ BUR_COMMON_ENV \
#define CONFIG_BOOTCOMMAND "mmc dev 1; run b_default" #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. */ /* Support both device trees and ATAGs. */
#define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS

4
include/configs/cl-som-imx7.h
View file

@ -38,10 +38,6 @@
#define CONFIG_POWER_PFUZE3000 #define CONFIG_POWER_PFUZE3000
#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08
#undef CONFIG_BOOTM_NETBSD
#undef CONFIG_BOOTM_PLAN9
#undef CONFIG_BOOTM_RTEMS
/* I2C configs */ /* I2C configs */
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_MXC

3
include/configs/colibri-imx6ull.h
View file

@ -28,9 +28,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_USDHC_NUM 1 #define CONFIG_SYS_FSL_USDHC_NUM 1
#undef CONFIG_BOOTM_PLAN9
#undef CONFIG_BOOTM_RTEMS
/* I2C configs */ /* I2C configs */
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000

2
include/configs/colibri-imx8x.h
View file

@ -13,8 +13,6 @@
#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_DISPLAY_BOARDINFO_LATE
#undef CONFIG_BOOTM_NETBSD
#define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define USDHC1_BASE_ADDR 0x5b010000 #define USDHC1_BASE_ADDR 0x5b010000
#define USDHC2_BASE_ADDR 0x5b020000 #define USDHC2_BASE_ADDR 0x5b020000

3
include/configs/colibri_imx7.h
View file

@ -35,9 +35,6 @@
#define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_USDHC_NUM 2
#endif #endif
#undef CONFIG_BOOTM_PLAN9
#undef CONFIG_BOOTM_RTEMS
/* I2C configs */ /* I2C configs */
#define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_MXC
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000

1
include/configs/imx8mq_evk.h
View file

@ -69,7 +69,6 @@
#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_IMLS
#undef CONFIG_CMD_CRC32 #undef CONFIG_CMD_CRC32
#undef CONFIG_BOOTM_NETBSD
/* ENET Config */ /* ENET Config */
/* ENET1 */ /* ENET1 */

1
include/configs/imx8qm_mek.h
View file

@ -45,7 +45,6 @@
#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_IMLS
#undef CONFIG_CMD_CRC32 #undef CONFIG_CMD_CRC32
#undef CONFIG_BOOTM_NETBSD
#define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define USDHC1_BASE_ADDR 0x5B010000 #define USDHC1_BASE_ADDR 0x5B010000

1
include/configs/imx8qxp_mek.h
View file

@ -44,7 +44,6 @@
#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_IMLS
#undef CONFIG_CMD_CRC32 #undef CONFIG_CMD_CRC32
#undef CONFIG_BOOTM_NETBSD
#define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define USDHC1_BASE_ADDR 0x5B010000 #define USDHC1_BASE_ADDR 0x5B010000

4
include/configs/mx7dsabresd.h
View file

@ -30,10 +30,6 @@
/* MMC Config*/ /* MMC Config*/
#define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
#undef CONFIG_BOOTM_NETBSD
#undef CONFIG_BOOTM_PLAN9
#undef CONFIG_BOOTM_RTEMS
/* I2C configs */ /* I2C configs */
#define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_MXC
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000

3
include/configs/xilinx_versal_mini.h
View file

@ -21,9 +21,6 @@
#undef CONFIG_ZLIB #undef CONFIG_ZLIB
#undef CONFIG_GZIP #undef CONFIG_GZIP
#undef CONFIG_CMD_ENV #undef CONFIG_CMD_ENV
#undef CONFIG_BOOTM_NETBSD
#undef CONFIG_BOOTM_VXWORKS
#undef CONFIG_BOOTM_LINUX
/* BOOTP options */ /* BOOTP options */
#undef CONFIG_BOOTP_BOOTFILESIZE #undef CONFIG_BOOTP_BOOTFILESIZE

3
include/configs/xilinx_zynqmp_mini.h
View file

@ -24,9 +24,6 @@
#undef CONFIG_GZIP #undef CONFIG_GZIP
#undef CONFIG_CMD_ENV #undef CONFIG_CMD_ENV
#undef CONFIG_SYS_INIT_SP_ADDR #undef CONFIG_SYS_INIT_SP_ADDR
#undef CONFIG_BOOTM_NETBSD
#undef CONFIG_BOOTM_VXWORKS
#undef CONFIG_BOOTM_LINUX
/* BOOTP options */ /* BOOTP options */
#undef CONFIG_BOOTP_BOOTFILESIZE #undef CONFIG_BOOTP_BOOTFILESIZE

2
include/configs/zynq_cse.h
View file

@ -19,8 +19,6 @@
#undef CONFIG_GZIP #undef CONFIG_GZIP
#undef CONFIG_SYS_CBSIZE #undef CONFIG_SYS_CBSIZE
#undef CONFIG_BOOTM_VXWORKS
#undef CONFIG_BOOTM_LINUX
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024

7
scripts/config_whitelist.txt
View file

@ -128,13 +128,6 @@ CONFIG_BOOGER
CONFIG_BOOTBLOCK CONFIG_BOOTBLOCK
CONFIG_BOOTFILE CONFIG_BOOTFILE
CONFIG_BOOTMODE 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_
CONFIG_BOOTP_BOOTFILE CONFIG_BOOTP_BOOTFILE
CONFIG_BOOTP_BOOTFILESIZE CONFIG_BOOTP_BOOTFILESIZE