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 /common/main.c | |
| parent | d1bb2ca5567c4831e57e0f9964a5f3630d2310e6 (diff) | |
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 01931a1bf..1a371b139 100644 --- a/common/main.c +++ b/common/main.c @@ -87,7 +87,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); @@ -201,7 +204,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; |