commit b41bc5a82d8a67d347f2fc12cf2106b8a37e4336
author Jason Hobbs <jason.hobbs@calxeda.com> Tue Aug 23 11:06:50 2011 +0000
committer Wolfgang Denk <wd@denx.de> Mon Oct 17 22:25:33 2011 +0200
tree 9c506e87295da352ee2e7d55f236c911ff42829d
parent b69bf52dfe34b9d7b2a20845c8a7e7e5978c2d2f

common, menu: use abortboot for menu timeout

Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>

common/main.c

diff --git a/common/main.c b/common/main.c
index 3324d9d..b97d89e 100644
--- a/common/main.c
+++ b/common/main.c
@@ -88,7 +88,10 @@
  */
 #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 int menukey = 0;
 #endif
 
-static inline int abortboot(int bootdelay)
+#ifndef CONFIG_MENU
+static inline
+#endif
+int abortboot(int bootdelay)
 {
 	int abort = 0;