V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

cmd: Convert CMD_BOOTMENU 

Also convert MENU while we're in here.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2016-11-29 09:14:56 -05:00
parent 1b597ada36
commit 4880b026ec
12 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/Kconfig
View File

@ -203,6 +203,12 @@ config CMD_BOOTEFI_HELLO
for testing that EFI is working at a basic level, and for bringing for testing that EFI is working at a basic level, and for bringing
up EFI support on a new architecture. 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 config CMD_ELF
bool "bootelf, bootvx" bool "bootelf, bootvx"
default y default y

6
common/Kconfig
View File

@ -172,6 +172,12 @@ config BOOTDELAY
menu "Console" 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 config CONSOLE_RECORD
bool "Console recording" bool "Console recording"
help help

1
configs/nokia_rx51_defconfig
View File

@ -8,6 +8,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Nokia RX-51 # " CONFIG_SYS_PROMPT="Nokia RX-51 # "
CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED=y
CONFIG_CMD_BOOTMENU=y
# CONFIG_CMD_IMI is not set # CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_SAVEENV is not set # CONFIG_CMD_SAVEENV is not set

1
include/config_distro_defaults.h
View File

@ -25,7 +25,6 @@
#define CONFIG_CMDLINE_EDITING #define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE #define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_LONGHELP
#define CONFIG_MENU
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
#define CONFIG_EFI_PARTITION #define CONFIG_EFI_PARTITION
#define CONFIG_ISO_PARTITION #define CONFIG_ISO_PARTITION

1
include/config_fallbacks.h
View File

@ -96,7 +96,6 @@
#ifndef CONFIG_CMDLINE #ifndef CONFIG_CMDLINE
#undef CONFIG_CMDLINE_EDITING #undef CONFIG_CMDLINE_EDITING
#undef CONFIG_SYS_LONGHELP #undef CONFIG_SYS_LONGHELP
#undef CONFIG_MENU
#endif #endif
#endif /* __CONFIG_FALLBACKS_H */ #endif /* __CONFIG_FALLBACKS_H */

1
include/configs/hikey.h
View File

@ -80,7 +80,6 @@
#define CONFIG_FS_EXT4 #define CONFIG_FS_EXT4
/* Command line configuration */ /* Command line configuration */
#define CONFIG_MENU
#define CONFIG_CMD_UNZIP #define CONFIG_CMD_UNZIP
#define CONFIG_CMD_ENV #define CONFIG_CMD_ENV

1
include/configs/ls1043a_common.h
View File

@ -145,7 +145,6 @@
/* Command line configuration */ /* Command line configuration */
#define CONFIG_CMD_ENV #define CONFIG_CMD_ENV
#define CONFIG_MENU
#define CONFIG_CMD_PXE #define CONFIG_CMD_PXE
/* MMC */ /* MMC */

2
include/configs/nokia_rx51.h
View File

@ -118,7 +118,6 @@
#define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_CMDLINE_EDITING /* add command line history */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_CMD_BOOTMENU /* ANSI terminal Boot Menu */
#define CONFIG_CMD_CLEAR /* ANSI terminal clear screen command */ #define CONFIG_CMD_CLEAR /* ANSI terminal clear screen command */
#ifdef ONENAND_SUPPORT #ifdef ONENAND_SUPPORT
@ -364,7 +363,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
"run attachboot;" \ "run attachboot;" \
"echo" "echo"
#define CONFIG_MENU
#define CONFIG_MENU_SHOW #define CONFIG_MENU_SHOW
/* /*

3
include/configs/thunderx_88xx.h
View File

@ -49,9 +49,6 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
/* Command line configuration */
#define CONFIG_MENU
/* BOOTP options */ /* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTPATH

2
include/configs/vexpress_aemv8a.h
View File

@ -125,8 +125,6 @@
#define CONFIG_PL011_CLOCK 24000000 #define CONFIG_PL011_CLOCK 24000000
#endif #endif
/* Command line configuration */
#define CONFIG_MENU
/*#define CONFIG_MENU_SHOW*/ /*#define CONFIG_MENU_SHOW*/
#define CONFIG_CMD_UNZIP #define CONFIG_CMD_UNZIP
#define CONFIG_CMD_PXE #define CONFIG_CMD_PXE

1
include/configs/xilinx_zynqmp.h
View File

@ -82,7 +82,6 @@
/* PXE */ /* PXE */
#define CONFIG_CMD_PXE #define CONFIG_CMD_PXE
#define CONFIG_MENU
#if defined(CONFIG_ZYNQ_SDHCI) #if defined(CONFIG_ZYNQ_SDHCI)
# define CONFIG_MMC # define CONFIG_MMC

2
scripts/config_whitelist.txt
View File

@ -534,7 +534,6 @@ CONFIG_CMD_BLOB
CONFIG_CMD_BMODE CONFIG_CMD_BMODE
CONFIG_CMD_BMP CONFIG_CMD_BMP
CONFIG_CMD_BOOTLDR CONFIG_CMD_BOOTLDR
CONFIG_CMD_BOOTMENU
CONFIG_CMD_BSP CONFIG_CMD_BSP
CONFIG_CMD_CBFS CONFIG_CMD_CBFS
CONFIG_CMD_CHIP_CONFIG CONFIG_CMD_CHIP_CONFIG
@ -3045,7 +3044,6 @@ CONFIG_MEM_HOLE_16M
CONFIG_MEM_INIT_VALUE CONFIG_MEM_INIT_VALUE
CONFIG_MEM_REMAP CONFIG_MEM_REMAP
CONFIG_MEM_SIZE CONFIG_MEM_SIZE
CONFIG_MENU
CONFIG_MENUKEY CONFIG_MENUKEY
CONFIG_MENUPROMPT CONFIG_MENUPROMPT
CONFIG_MENU_SHOW CONFIG_MENU_SHOW