Rename this option to CONFIG_AUTOBOOT_MENU_SHOW this it relates to the autoboot functionality.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v2: None
cmd/bootmenu.c | 2 +- common/autoboot.c | 2 +- doc/README.bootmenu | 2 +- doc/README.menu | 2 +- include/configs/nokia_rx51.h | 2 +- include/configs/vexpress_aemv8a.h | 2 +- include/menu.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index 7f88c1ed63..0ae9d5a681 100644 --- a/cmd/bootmenu.c +++ b/cmd/bootmenu.c @@ -472,7 +472,7 @@ void menu_display_statusline(struct menu *m) puts(ANSI_CLEAR_LINE); }
-#ifdef CONFIG_MENU_SHOW +#ifdef CONFIG_AUTOBOOT_MENU_SHOW int menu_show(int bootdelay) { bootmenu_show(bootdelay); diff --git a/common/autoboot.c b/common/autoboot.c index 9752470873..a38527ff96 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -324,7 +324,7 @@ const char *bootdelay_process(void)
debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
-#if defined(CONFIG_MENU_SHOW) +#if defined(CONFIG_AUTOBOOT_MENU_SHOW) bootdelay = menu_show(bootdelay); #endif bootretry_init_cmd_timeout(); diff --git a/doc/README.bootmenu b/doc/README.bootmenu index 34ff8d5ecc..ca5099089e 100644 --- a/doc/README.bootmenu +++ b/doc/README.bootmenu @@ -91,7 +91,7 @@ To run the bootmenu at startup add these additional definitions:
#define CONFIG_AUTOBOOT_KEYED #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, make sure to additionally define CONFIG_CFB_CONSOLE_ANSI in the diff --git a/doc/README.menu b/doc/README.menu index 450c6a83a7..0f3d741605 100644 --- a/doc/README.menu +++ b/doc/README.menu @@ -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.
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 bootdelay.
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index f47d088303..b251061e30 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -270,7 +270,7 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo"
-#define CONFIG_MENU_SHOW +#define CONFIG_AUTOBOOT_MENU_SHOW
/* * Miscellaneous configurable options diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 2354f4e958..2b1269de83 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -110,7 +110,7 @@ #define CONFIG_PL011_CLOCK 24000000 #endif
-/*#define CONFIG_MENU_SHOW*/ +/*#define CONFIG_AUTOBOOT_MENU_SHOW*/
/* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/menu.h b/include/menu.h index fbff429c89..8fd7b0a1f0 100644 --- a/include/menu.h +++ b/include/menu.h @@ -19,7 +19,7 @@ int menu_destroy(struct menu *m); void menu_display_statusline(struct menu *m); 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); #endif #endif /* __MENU_H__ */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8773169c8b..780520d584 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -96,6 +96,7 @@ CONFIG_ATMEL_LEGACY CONFIG_ATMEL_MCI_8BIT CONFIG_ATMEL_SPI0 CONFIG_AT_TRANS +CONFIG_AUTOBOOT_MENU_SHOW CONFIG_AUTO_ZRELADDR CONFIG_BACKSIDE_L2_CACHE CONFIG_BAT_PAIR @@ -1141,7 +1142,6 @@ CONFIG_MEMSIZE_MASK CONFIG_MEM_HOLE_16M CONFIG_MEM_INIT_VALUE CONFIG_MEM_REMAP -CONFIG_MENU_SHOW CONFIG_MFG_ENV_SETTINGS CONFIG_MIIM_ADDRESS CONFIG_MII_DEFAULT_TSEC