| Message ID | 1480428897-18846-1-git-send-email-trini@konsulko.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Nov 29, 2016 at 09:14:56AM -0500, Tom Rini wrote: > Also convert MENU while we're in here. > > Signed-off-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/cmd/Kconfig b/cmd/Kconfig index b16c6032aa2d..3e69f9cd5a11 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -203,6 +203,12 @@ config CMD_BOOTEFI_HELLO for testing that EFI is working at a basic level, and for bringing up EFI support on a new architecture. +config CMD_BOOTMENU + bool "bootmenu" + select MENU + help + Add an ANSI terminal boot menu command. + config CMD_ELF bool "bootelf, bootvx" default y diff --git a/common/Kconfig b/common/Kconfig index 913d21a9ec58..a04ee1084fed 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -172,6 +172,12 @@ config BOOTDELAY menu "Console" +config MENU + bool + help + This is the library functionality to provide a text-based menu of + choices for the user to make choices with. + config CONSOLE_RECORD bool "Console recording" help diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index ef60fab6e794..210a9b18f475 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Nokia RX-51 # " CONFIG_AUTOBOOT_KEYED=y +CONFIG_CMD_BOOTMENU=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SAVEENV is not set diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index b5efab5c3f9c..2e24b17b84f2 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -25,7 +25,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP -#define CONFIG_MENU #define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION #define CONFIG_ISO_PARTITION diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index 2ad54b7bf661..380093218b09 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -96,7 +96,6 @@ #ifndef CONFIG_CMDLINE #undef CONFIG_CMDLINE_EDITING #undef CONFIG_SYS_LONGHELP -#undef CONFIG_MENU #endif #endif /* __CONFIG_FALLBACKS_H */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 39faf805806e..7a03d0f30a32 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -80,7 +80,6 @@ #define CONFIG_FS_EXT4 /* Command line configuration */ -#define CONFIG_MENU #define CONFIG_CMD_UNZIP #define CONFIG_CMD_ENV diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 7a407aa70a24..9b20c56d7b37 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -145,7 +145,6 @@ /* Command line configuration */ #define CONFIG_CMD_ENV -#define CONFIG_MENU #define CONFIG_CMD_PXE /* MMC */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 4d5265f5409a..5187d9367f86 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -364,7 +364,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo" -#define CONFIG_MENU #define CONFIG_MENU_SHOW /* diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 4387082b263e..a546db2eb486 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -49,9 +49,6 @@ #define CONFIG_BAUDRATE 115200 -/* Command line configuration */ -#define CONFIG_MENU - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTPATH diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 48834c2faeb2..733f01170e72 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -125,8 +125,6 @@ #define CONFIG_PL011_CLOCK 24000000 #endif -/* Command line configuration */ -#define CONFIG_MENU /*#define CONFIG_MENU_SHOW*/ #define CONFIG_CMD_UNZIP #define CONFIG_CMD_PXE diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index cbdef6eafd0c..80ab4e3cc1f6 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -82,7 +82,6 @@ /* PXE */ #define CONFIG_CMD_PXE -#define CONFIG_MENU #if defined(CONFIG_ZYNQ_SDHCI) # define CONFIG_MMC diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d0b5e7f3e4ae..2691bd6f7314 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3052,7 +3052,6 @@ CONFIG_MEM_HOLE_16M CONFIG_MEM_INIT_VALUE CONFIG_MEM_REMAP CONFIG_MEM_SIZE -CONFIG_MENU CONFIG_MENUKEY CONFIG_MENUPROMPT CONFIG_MENU_SHOW
Also convert MENU while we're in here. Signed-off-by: Tom Rini <trini@konsulko.com> --- cmd/Kconfig | 6 ++++++ common/Kconfig | 6 ++++++ configs/nokia_rx51_defconfig | 1 + include/config_distro_defaults.h | 1 - include/config_fallbacks.h | 1 - include/configs/hikey.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/thunderx_88xx.h | 3 --- include/configs/vexpress_aemv8a.h | 2 -- include/configs/xilinx_zynqmp.h | 1 - scripts/config_whitelist.txt | 1 - 12 files changed, 13 insertions(+), 12 deletions(-)