summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJason Hobbs <jason.hobbs@calxeda.com>2011-08-23 11:06:50 +0000
committerWolfgang Denk <wd@denx.de>2011-10-17 22:25:33 +0200
commitb41bc5a82d8a67d347f2fc12cf2106b8a37e4336 (patch)
tree9c506e87295da352ee2e7d55f236c911ff42829d /include
parentb69bf52dfe34b9d7b2a20845c8a7e7e5978c2d2f (diff)
downloadu-boot-imx-b41bc5a82d8a67d347f2fc12cf2106b8a37e4336.zip
u-boot-imx-b41bc5a82d8a67d347f2fc12cf2106b8a37e4336.tar.gz
u-boot-imx-b41bc5a82d8a67d347f2fc12cf2106b8a37e4336.tar.bz2
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.h3
-rw-r--r--include/menu.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h
index a55600b..f9fea08 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 d47e1a0..cf14a9c 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);