merged current version of git://git.denx.de/u-boot

[karo-tx-uboot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 248744ba74d3449518e8ecf2a4197a00a8a56f51..91e888fd3ce0a3ef54c1996d153538e76e78707c 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -41,6 +41,7 @@
 
 #include <post.h>
 #include <linux/ctype.h>
+#include <menu.h>
 
 #if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING)
 DECLARE_GLOBAL_DATA_PTR;
@@ -372,6 +373,9 @@ void main_loop (void)
 
        debug ("### main_loop entered: bootdelay=%d\n\n", bootdelay);
 
+#if defined(CONFIG_MENU_SHOW)
+       bootdelay = menu_show(bootdelay);
+#endif
 # ifdef CONFIG_BOOT_RETRY_TIME
        init_cmd_timeout ();
 # endif        /* CONFIG_BOOT_RETRY_TIME */