diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/nokia_rx51.h | 2 | ||||
| -rw-r--r-- | include/configs/vexpress_aemv8a.h | 2 | ||||
| -rw-r--r-- | include/menu.h | 2 |
3 files changed, 3 insertions, 3 deletions
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__ */ |