diff options
| author | Jason Hobbs <jason.hobbs@calxeda.com> | 2011-08-23 11:06:50 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-17 22:25:33 +0200 |
| commit | b41bc5a82d8a67d347f2fc12cf2106b8a37e4336 (patch) | |
| tree | 9c506e87295da352ee2e7d55f236c911ff42829d /include | |
| parent | b69bf52dfe34b9d7b2a20845c8a7e7e5978c2d2f (diff) | |
| download | talos-obmc-uboot-b41bc5a82d8a67d347f2fc12cf2106b8a37e4336.tar.gz talos-obmc-uboot-b41bc5a82d8a67d347f2fc12cf2106b8a37e4336.zip | |
common, menu: use abortboot for menu timeout
Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 3 | ||||
| -rw-r--r-- | include/menu.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index a55600b182..f9fea08115 100644 --- a/include/common.h +++ b/include/common.h @@ -260,6 +260,9 @@ int readline_into_buffer (const char *const prompt, char * buffer); int parse_line (char *, char *[]); void init_cmd_timeout(void); void reset_cmd_timeout(void); +#ifdef CONFIG_MENU +int abortboot(int bootdelay); +#endif /* arch/$(ARCH)/lib/board.c */ void board_init_f (ulong) __attribute__ ((noreturn)); diff --git a/include/menu.h b/include/menu.h index d47e1a029c..cf14a9cca3 100644 --- a/include/menu.h +++ b/include/menu.h @@ -20,7 +20,7 @@ struct menu; -struct menu *menu_create(char *title, int prompt, +struct menu *menu_create(char *title, int timeout, int prompt, void (*item_data_print)(void *)); int menu_default_set(struct menu *m, char *item_key); int menu_get_choice(struct menu *m, void **choice); |
