diff options
| author | Jason Hobbs <jason.hobbs@calxeda.com> | 2011-06-29 11:25:15 -0500 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-06-30 12:23:34 +0100 |
| commit | 424c72e3ac86d7af1ce31d27c7bb195eea14ed79 (patch) | |
| tree | 6d447c8305bf63e69daa0130e5b77b106e01d38e /include | |
| parent | d1bb2ca5567c4831e57e0f9964a5f3630d2310e6 (diff) | |
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 1e21b7a3d..394a005b0 100644 --- a/include/common.h +++ b/include/common.h @@ -233,6 +233,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 d47e1a029..cf14a9cca 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); |