dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 00:32:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT

Browse Source 
Rename this option to CONFIG_AUTOBOOT_MENU_SHOW this it relates to the
autoboot functionality.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2019-07-20 20:51:24 -06:00
committed by Tom Rini
parent d915ad277a
commit e231306e48
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/bootmenu.c
View File

@@ -472,7 +472,7 @@ void menu_display_statusline(struct menu *m)
puts(ANSI_CLEAR_LINE); puts(ANSI_CLEAR_LINE);
} }
#ifdef CONFIG_MENU_SHOW #ifdef CONFIG_AUTOBOOT_MENU_SHOW
int menu_show(int bootdelay) int menu_show(int bootdelay)
{ {
bootmenu_show(bootdelay); bootmenu_show(bootdelay);

2
common/autoboot.c
View File

@@ -324,7 +324,7 @@ const char *bootdelay_process(void)
debug("### main_loop entered: bootdelay=%d\n\n", bootdelay); debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
#if defined(CONFIG_MENU_SHOW) #if defined(CONFIG_AUTOBOOT_MENU_SHOW)
bootdelay = menu_show(bootdelay); bootdelay = menu_show(bootdelay);
#endif #endif
bootretry_init_cmd_timeout(); bootretry_init_cmd_timeout();

2
doc/README.bootmenu
View File

@@ -91,7 +91,7 @@ To run the bootmenu at startup add these additional definitions:
#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_KEYED
#define CONFIG_BOOTDELAY 30 #define CONFIG_BOOTDELAY 30
#define CONFIG_MENU_SHOW #define CONFIG_AUTOBOOT_MENU_SHOW
When you intend to use the bootmenu on color frame buffer console, When you intend to use the bootmenu on color frame buffer console,
make sure to additionally define CONFIG_CFB_CONSOLE_ANSI in the make sure to additionally define CONFIG_CFB_CONSOLE_ANSI in the

2
doc/README.menu
View File

@@ -14,7 +14,7 @@ Menus are composed of items. Each item has a key used to identify it in
the menu, and an opaque pointer to data controlled by the consumer. the menu, and an opaque pointer to data controlled by the consumer.
If you want to show a menu, instead starting the shell, define If you want to show a menu, instead starting the shell, define
CONFIG_MENU_SHOW. You have to code the int menu_show(int bootdelay) CONFIG_AUTOBOOT_MENU_SHOW. You have to code the int menu_show(int bootdelay)
function, which handle your menu. This function returns the remaining function, which handle your menu. This function returns the remaining
bootdelay. bootdelay.

2
include/configs/nokia_rx51.h
View File

@@ -270,7 +270,7 @@ int rx51_kp_getc(struct stdio_dev *sdev);
"run attachboot;" \ "run attachboot;" \
"echo" "echo"
#define CONFIG_MENU_SHOW #define CONFIG_AUTOBOOT_MENU_SHOW
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options

2
include/configs/vexpress_aemv8a.h
View File

@@ -110,7 +110,7 @@
#define CONFIG_PL011_CLOCK 24000000 #define CONFIG_PL011_CLOCK 24000000
#endif #endif
/*#define CONFIG_MENU_SHOW*/ /*#define CONFIG_AUTOBOOT_MENU_SHOW*/
/* BOOTP options */ /* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTFILESIZE

2
include/menu.h
View File

@@ -19,7 +19,7 @@ int menu_destroy(struct menu *m);
void menu_display_statusline(struct menu *m); void menu_display_statusline(struct menu *m);
int menu_default_choice(struct menu *m, void **choice); int menu_default_choice(struct menu *m, void **choice);
#if defined(CONFIG_MENU_SHOW) #if defined(CONFIG_AUTOBOOT_MENU_SHOW)
int menu_show(int bootdelay); int menu_show(int bootdelay);
#endif #endif
#endif /* __MENU_H__ */ #endif /* __MENU_H__ */

2
scripts/config_whitelist.txt
View File

@@ -96,6 +96,7 @@ CONFIG_ATMEL_LEGACY
CONFIG_ATMEL_MCI_8BIT CONFIG_ATMEL_MCI_8BIT
CONFIG_ATMEL_SPI0 CONFIG_ATMEL_SPI0
CONFIG_AT_TRANS CONFIG_AT_TRANS
CONFIG_AUTOBOOT_MENU_SHOW
CONFIG_AUTO_ZRELADDR CONFIG_AUTO_ZRELADDR
CONFIG_BACKSIDE_L2_CACHE CONFIG_BACKSIDE_L2_CACHE
CONFIG_BAT_PAIR CONFIG_BAT_PAIR
@@ -1140,7 +1141,6 @@ CONFIG_MEMSIZE_MASK
CONFIG_MEM_HOLE_16M CONFIG_MEM_HOLE_16M
CONFIG_MEM_INIT_VALUE CONFIG_MEM_INIT_VALUE
CONFIG_MEM_REMAP CONFIG_MEM_REMAP
CONFIG_MENU_SHOW
CONFIG_MFG_ENV_SETTINGS CONFIG_MFG_ENV_SETTINGS
CONFIG_MIIM_ADDRESS CONFIG_MIIM_ADDRESS
CONFIG_MII_DEFAULT_TSEC CONFIG_MII_DEFAULT_TSEC