[U-Boot] [PATCH 3/3 v3] common, menu: show menu on startup if CONFIG_MENU_SHOW is defined

[Heiko Schocher]

show a menu on startup instead running the shell.

Signed-off-by: Heiko Schocher <hs at denx.de>
Acked-by: Jason Hobbs <jason.hobbs at calxeda.com>
Cc: Mike Frysinger <vapier at gentoo.org>

---
- changes for v2:
  - add comments from Mike Frysinger <vapier at gentoo.org>
    - pass current bootdelay to menu_show
- changes for v3:
  - add Acked-by: Jason Hobbs <jason.hobbs at calxeda.com>
  - add comment from Jason Hobbs <jason.hobbs at calxeda.com>
    - spelling fixes in README
---
 common/main.c   |    4 ++++
 doc/README.menu |    5 +++++
 include/menu.h  |    3 +++
 3 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/common/main.c b/common/main.c
index 248744b..91e888f 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 */
diff --git a/doc/README.menu b/doc/README.menu
index 4ddf914..bc33012 100644
--- a/doc/README.menu
+++ b/doc/README.menu
@@ -25,6 +25,11 @@ the interfaces should be available.
 Menus are composed of items. Each item has a key used to identify it in
 the menu, and an opaque pointer to data controlled by the consumer.
 
+If you want to show a menu, instead of starting the shell, define
+CONFIG_MENU_SHOW. You have to code the int menu_show(int bootdelay)
+function, which handles your menu. This function returns the remaining
+bootdelay.
+
 Interfaces
 ----------
 #include "menu.h"
diff --git a/include/menu.h b/include/menu.h
index b806a02..7af5fdb 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -28,4 +28,7 @@ int menu_item_add(struct menu *m, char *item_key, void *item_data);
 int menu_destroy(struct menu *m);
 void menu_display_statusline(struct menu *m);
 
+#if defined(CONFIG_MENU_SHOW)
+int menu_show(int bootdelay);
+#endif
 #endif /* __MENU_H__ */
-- 
1.7.7.4