diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2011-07-05 20:34:34 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2011-07-05 20:34:34 -0400 |
| commit | 730230063c4194a1977589bba0beec6bfedb6514 (patch) | |
| tree | 382eabc106aef2a43699d67f25786757710acb0b | |
| parent | 8b565781f1e4043613ede1bcd3b7c4216d62a5d6 (diff) | |
| download | seabios-730230063c4194a1977589bba0beec6bfedb6514.tar.gz | |
Replace CONFIG_BOOTMENU_WAIT with dynamic "etc/boot-menu-wait" file.
| -rw-r--r-- | src/Kconfig | 6 | ||||
| -rw-r--r-- | src/boot.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/Kconfig b/src/Kconfig index 70e3509..0ffc49e 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -46,12 +46,6 @@ menu "General Features" default y help Support an interactive boot menu at end of post. - config BOOTMENU_WAIT - depends on BOOTMENU - int "Bootmenu delay" - default 2500 - help - Amount of time (in ms) to wait at menu before selecting normal boot. config BOOTSPLASH depends on BOOTMENU bool "Graphical boot splash screen" @@ -377,6 +377,8 @@ boot_add_cbfs(void *data, const char *desc, int prio) * Boot menu and BCV execution ****************************************************************/ +#define DEFAULT_BOOTMENU_WAIT 2500 + // Show IPL option menu. static void interactive_bootmenu(void) @@ -389,8 +391,9 @@ interactive_bootmenu(void) printf("Press F12 for boot menu.\n\n"); + u32 menutime = romfile_loadint("etc/boot-menu-wait", DEFAULT_BOOTMENU_WAIT); enable_bootsplash(); - int scan_code = get_keystroke(CONFIG_BOOTMENU_WAIT); + int scan_code = get_keystroke(menutime); disable_bootsplash(); if (scan_code != 0x86) /* not F12 */ |