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 /common/main.c | |
| parent | b69bf52dfe34b9d7b2a20845c8a7e7e5978c2d2f (diff) | |
| download | blackbird-obmc-uboot-b41bc5a82d8a67d347f2fc12cf2106b8a37e4336.tar.gz blackbird-obmc-uboot-b41bc5a82d8a67d347f2fc12cf2106b8a37e4336.zip | |
common, menu: use abortboot for menu timeout
Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/common/main.c b/common/main.c index 3324d9d6e4..b97d89e589 100644 --- a/common/main.c +++ b/common/main.c @@ -88,7 +88,10 @@ extern void mdm_init(void); /* defined in board.c */ */ #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0) # if defined(CONFIG_AUTOBOOT_KEYED) -static inline int abortboot(int bootdelay) +#ifndef CONFIG_MENU +static inline +#endif +int abortboot(int bootdelay) { int abort = 0; uint64_t etime = endtick(bootdelay); @@ -202,7 +205,10 @@ static inline int abortboot(int bootdelay) static int menukey = 0; #endif -static inline int abortboot(int bootdelay) +#ifndef CONFIG_MENU +static inline +#endif +int abortboot(int bootdelay) { int abort = 0; |
