summaryrefslogtreecommitdiffstats
path: root/common/main.c
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2012-01-16 21:13:35 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-02-12 10:11:24 +0100
commit317d6c57d5e9bc9d363df8e0e395058b5985882e (patch)
tree3d7f7c80c24dcd53c979a6fbf289ad56da0eed63 /common/main.c
parente0611dd97bb38ba341b3479974eb2a3271de380e (diff)
downloadu-boot-317d6c57d5e9bc9d363df8e0e395058b5985882e.tar.gz
u-boot-317d6c57d5e9bc9d363df8e0e395058b5985882e.tar.xz
u-boot-317d6c57d5e9bc9d363df8e0e395058b5985882e.zip
common, menu: show menu on startup if CONFIG_MENU_SHOW is defined
show a menu on startup instead running the shell. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Jason Hobbs <jason.hobbs@calxeda.com> Cc: Mike Frysinger <vapier@gentoo.org> Acked-by: Jason Hobbs <jason.hobbs@calxeda.com>
Diffstat (limited to 'common/main.c')
-rw-r--r--common/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/main.c b/common/main.c
index 248744ba74..91e888fd3c 100644
--- 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 */