Patchwork [U-Boot,15/16] New command bootmenu: ANSI terminal Boot Menu support

login
register
mail settings
Submitter Pali Rohár
Date Dec. 17, 2011, 5:03 p.m.
Message ID <1324141398-14859-15-git-send-email-pali.rohar@gmail.com>
Download mbox | patch
Permalink /patch/132016/
State Changes Requested
Headers show

Comments

Pali Rohár - Dec. 17, 2011, 5:03 p.m.
* Configuration is done via env variables bootmenu_delay and bootmenu_<num>:

    bootmenu_delay=<delay>
    bootmenu_<num>="<title>=<commands>" (title and commands are separated by first char '=')

    <delay> is delay in seconds of autobooting first entry
    <num> is boot menu entry, starting from zero
    <title> is text shown in boot screen
    <commands> are commands which will be executed when menu entry will be selected

 * First argument of bootmenu command override bootmenu_delay env
 * If env bootmenu_delay or bootmenu argument is not specified, 10 seconds for delay will be used
 * If delay is 0, no entry will be show on screen, screen will not be cleared and first entry will be called
 * If delay is less then 0, no autoboot delay will be used
 * Boot Menu will stop finding next menu entry if last was not defined
 * Boot Menu always add menu entry "U-Boot console" at end of all entries

 * Example using:

    setenv bootmenu_0 Boot first kernel=bootm 0x82000000  # Set first menu entry
    setenv bootmenu_1 Boot second kernel=bootm 0x83000000 # Set second menu entry
    setenv bootmenu_2 Reset board=reset                   # Set third menu entry
    setenv bootmenu_3 U-Boot boot order=boot              # Set four menu entry (default u-boot boot script)
    setenv bootmenu_4                                     # Empty string is end of all bootmenu entries
    bootmenu 20                                           # Run bootmenu with autoboot delay 20s

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
 common/Makefile          |    1 +
 common/cmd_bootmenu.c    |  355 ++++++++++++++++++++++++++++++++++++++++++++++
 include/config_cmd_all.h |    1 +
 3 files changed, 357 insertions(+), 0 deletions(-)
 create mode 100644 common/cmd_bootmenu.c
Mike Frysinger - Dec. 18, 2011, 7:07 p.m.
this needs checkpatch for sure

seems like this doesn't use the existing common/menu.c code ... shouldn't it ?
-mike
Pali Rohár - Dec. 18, 2011, 7:12 p.m.
On Sunday 18 December 2011 14:07:37 Mike Frysinger wrote:
> this needs checkpatch for sure
> 
> seems like this doesn't use the existing common/menu.c code ... shouldn't it
> ? -mike

No my ANSI terminal bootmenu does not use common/menu.c (4 months ago, there 
was no menu.c file)
Mike Frysinger - Dec. 18, 2011, 8:07 p.m.
On Sunday 18 December 2011 14:12:38 Pali Rohár wrote:
> On Sunday 18 December 2011 14:07:37 Mike Frysinger wrote:
> > this needs checkpatch for sure
> > 
> > seems like this doesn't use the existing common/menu.c code ... shouldn't
> > it ?
> 
> No my ANSI terminal bootmenu does not use common/menu.c (4 months ago,
> there was no menu.c file)

so you'll be updating the patchseries to utilize common code that now exists ?
-mike
Pali Rohár - Dec. 18, 2011, 8:16 p.m.
On Sunday 18 December 2011 15:07:25 Mike Frysinger wrote:
> On Sunday 18 December 2011 14:12:38 Pali Rohár wrote:
> > On Sunday 18 December 2011 14:07:37 Mike Frysinger wrote:
> > > this needs checkpatch for sure
> > > 
> > > seems like this doesn't use the existing common/menu.c code ...
> > > shouldn't it ?
> > 
> > No my ANSI terminal bootmenu does not use common/menu.c (4 months ago,
> > there was no menu.c file)
> 
> so you'll be updating the patchseries to utilize common code that now exists
> ? -mike

What is implemented in that file common/menu.c? It here any info/doc?
Mike Frysinger - Jan. 6, 2012, 6:59 a.m.
On Sunday 18 December 2011 15:16:21 Pali Rohár wrote:
> On Sunday 18 December 2011 15:07:25 Mike Frysinger wrote:
> > On Sunday 18 December 2011 14:12:38 Pali Rohár wrote:
> > > On Sunday 18 December 2011 14:07:37 Mike Frysinger wrote:
> > > > this needs checkpatch for sure
> > > > 
> > > > seems like this doesn't use the existing common/menu.c code ...
> > > > shouldn't it ?
> > > 
> > > No my ANSI terminal bootmenu does not use common/menu.c (4 months ago,
> > > there was no menu.c file)
> > 
> > so you'll be updating the patchseries to utilize common code that now
> > exists ?
> 
> What is implemented in that file common/menu.c? It here any info/doc?

doc/README.menu

if there are features you have/want that this code base doesn't support, the 
answer would be to enhance/extend rather than drop in an entirely new/parallel 
codebase.  i know this is more work for you, but long term, the latter would 
be much more work for everyone.
-mike

Patch

diff --git a/common/Makefile b/common/Makefile
index 0552f19..4e08431 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -67,6 +67,7 @@  COBJS-$(CONFIG_CMD_SOURCE) += cmd_source.o
 COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o
 COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o cmd_bedbug.o
 COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o
+COBJS-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o
 COBJS-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o
 COBJS-$(CONFIG_CMD_CACHE) += cmd_cache.o
 COBJS-$(CONFIG_CMD_CLR) += cmd_clr.o
diff --git a/common/cmd_bootmenu.c b/common/cmd_bootmenu.c
new file mode 100644
index 0000000..28f5da7
--- /dev/null
+++ b/common/cmd_bootmenu.c
@@ -0,0 +1,355 @@ 
+/*
+ * (C) Copyright 2011 Pali Rohár <pali.rohar@gmail.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <command.h>
+#include <watchdog.h>
+#include <linux/string.h>
+
+#ifdef CONFIG_SYS_HUSH_PARSER
+#include <hush.h>
+#endif
+
+static char * get_option(int n) {
+
+	char name[] = "bootmenu_\0\0";
+
+	if ( n < 0 || n > 99 )
+		return NULL;
+
+	sprintf(name+9, "%d", n);
+
+	return getenv(name);
+
+}
+
+static char * get_end_of_title(char * str) {
+
+	if ( ! str )
+		return NULL;
+
+	return strchr(str, '=');
+
+}
+
+static int print_title(char * begin, char * end) {
+
+	if ( ! begin || ! end || end < begin )
+		return 1;
+
+	while ( begin != end )
+		putc(*(begin++));
+
+	return 0;
+
+}
+
+static int print_entry(int n, int reverse) {
+
+	char * str = get_option(n);
+	char * end = get_end_of_title(str);
+
+	if ( ! end )
+		return 1;
+
+	printf(ANSI_CURSOR_POSITION, n+4, 1);
+
+	if ( reverse )
+		printf(ANSI_COLOR_REVERSE);
+
+	printf("     ");
+	print_title(str, end);
+	printf(ANSI_CLEAR_LINE_TO_END);
+
+	if ( reverse )
+		printf(ANSI_COLOR_RESET);
+
+	return 0;
+
+}
+
+static int print_menu(int active) {
+
+	int n = 0;
+
+	printf(ANSI_CURSOR_POSITION, 1, 1);
+	printf(ANSI_CLEAR_LINE);
+	printf(ANSI_CURSOR_POSITION, 2, 1);
+	printf("  *** U-Boot BOOT MENU ***");
+	printf(ANSI_CLEAR_LINE_TO_END);
+	printf(ANSI_CURSOR_POSITION, 3, 1);
+	printf(ANSI_CLEAR_LINE);
+
+	while ( 1 ) {
+
+		int ret = print_entry(n, n == active ? 1 : 0);
+
+		if ( ret == 1 )
+			break;
+
+		++n;
+
+	}
+
+	printf(ANSI_CURSOR_POSITION, n+4, 1);
+
+	if ( n == active )
+		printf(ANSI_COLOR_REVERSE);
+
+	printf("     U-Boot console");
+	printf(ANSI_CLEAR_LINE_TO_END);
+
+	if ( n == active )
+		printf(ANSI_COLOR_RESET);
+
+	printf(ANSI_CURSOR_POSITION, n+5, 1);
+	printf(ANSI_CLEAR_LINE);
+	printf(ANSI_CURSOR_POSITION, n+6, 1);
+	printf("  Press UP/DOWN to move, ENTER to select");
+	printf(ANSI_CLEAR_LINE_TO_END);
+	printf(ANSI_CURSOR_POSITION, n+7, 1);
+	printf(ANSI_CLEAR_LINE);
+
+	return n;
+
+}
+
+int do_bootmenu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
+
+	int active = 0;
+	int abort = 0;
+	int key = 0; /* 0 - NONE, 1 - UP, 2 - DOWN, 3 - SELECT */
+	int esc = 0;
+	int count = 0;
+	int delay = 10;
+	int instant = 0;
+	char * delay_str = NULL;
+
+	if ( argc >= 2 )
+		delay_str = argv[1];
+
+	if ( ! delay_str )
+		delay_str = getenv("bootmenu_delay");
+
+	if ( delay_str )
+		delay = (int)simple_strtol(delay_str, NULL, 10);
+
+	if ( delay == 0 ) {
+
+		/* prevent setting U-Boot console as first menu entry */
+		if ( get_end_of_title(get_option(0)) )
+			count = 1;
+
+		instant = 1;
+
+	}
+
+	if ( delay < 0 )
+		abort = 1;
+
+	if ( ! instant ) {
+
+		printf(ANSI_CLEAR_CONSOLE);
+		printf(ANSI_CURSOR_POSITION, 1, 1);
+
+	}
+
+	while ( 1 ) {
+
+		if ( abort || delay > 0 )
+			count = print_menu(active);
+
+		if ( ! abort ) {
+
+			if ( delay > 0 )
+				printf("  Hit any key to stop autoboot: %2d ", delay);
+
+			while ( delay > 0 ) {
+
+				int i;
+
+				for ( i = 0; i < 100; ++i ) {
+
+					if ( tstc() ) {
+
+						abort = 1;
+						key = getc();
+
+						if ( key == '\e' ) {
+							esc = 1;
+							key = 0;
+						} else if ( key == '\r' )
+							key = 3;
+						else
+							key = 0;
+
+						break;
+
+					}
+
+					WATCHDOG_RESET();
+					udelay(10000);
+
+				}
+
+				if ( abort )
+					break;
+
+				--delay;
+				printf("\b\b\b%2d ", delay);
+
+			}
+
+			if ( delay <= 0 )
+				key = 3;
+
+		} else {
+
+			while ( ! tstc() ) {
+
+				WATCHDOG_RESET();
+				udelay(10000);
+
+			}
+
+			key = getc();
+
+			if ( esc == 0 ) {
+
+				if ( key == '\e' ) {
+					esc = 1;
+					key = 0;
+				}
+
+			} else if ( esc == 1 ) {
+
+				if ( key == '[' ) {
+					esc = 2;
+					key = 0;
+				} else
+					esc = 0;
+
+			} else if ( esc == 2 || esc == 3 ) {
+
+				if ( esc == 2 && key == '1' ) {
+					esc = 3;
+					key = 0;
+				} else
+					esc = 0;
+
+				if ( key == 'A' )
+					key = 1;
+				else if ( key == 'B' )
+					key = 2;
+				else
+					key = 0;
+
+			}
+
+			if ( key == '\r' )
+				key = 3;
+
+		}
+
+		if ( key == 1 ) {
+
+			if ( active > 0 )
+				--active;
+
+		} else if ( key == 2 ) {
+
+			if ( active < count )
+				++active;
+
+		} else if ( key == 3 ) {
+
+			char * str;
+			char * end;
+
+			putc('\n');
+
+			if ( ! instant ) {
+
+				printf(ANSI_CLEAR_CONSOLE);
+				printf(ANSI_CURSOR_POSITION, 1, 1);
+
+			}
+
+			WATCHDOG_RESET();
+
+			/* last entry is always U-Boot console */
+			if ( active == count ) {
+
+				printf("Starting U-Boot console\n\n");
+				return 0;
+
+			}
+
+			str = get_option(active);
+			end = get_end_of_title(str);
+
+			if ( ! end ) {
+
+				printf("Invalid Boot Menu entry %d\nStarting U-Boot console\n\n", active);
+				return 0;
+
+			}
+
+			if ( ! end[1] ) {
+
+				printf("Invalid Boot Menu entry %d: ", active);
+				print_title(str, end);
+				printf("\nStarting U-Boot console\n\n");
+				return 0;
+
+			}
+
+			printf("Booting Boot Menu entry %d: ", active);
+			print_title(str, end);
+			printf(" ...\n\n");
+
+# ifndef CONFIG_SYS_HUSH_PARSER
+			run_command(end+1, 0);
+# else
+			parse_string_outer(end+1, FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP);
+# endif
+
+			printf("\nFailed booting Boot Menu entry %d: ", active);
+			print_title(str, end);
+			printf("\nStarting U-Boot console\n\n");
+			return 0;
+
+		}
+
+	}
+
+	/* never happends */
+	return 1;
+
+}
+
+U_BOOT_CMD(
+	bootmenu, 2, 1, do_bootmenu,
+	"ANSI terminal bootmenu",
+	"[delay]\n"
+	"    - show ANSI terminal bootmenu with autoboot delay (default 10s)"
+);
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index f3c49ed..6482ba8 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -20,6 +20,7 @@ 
 #define CONFIG_CMD_BEDBUG	/* Include BedBug Debugger	*/
 #define CONFIG_CMD_BMP		/* BMP support			*/
 #define CONFIG_CMD_BOOTD	/* bootd			*/
+#define CONFIG_CMD_BOOTMENU	/* ANSI terminal Boot Menu	*/
 #define CONFIG_CMD_BSP		/* Board Specific functions	*/
 #define CONFIG_CMD_CACHE	/* icache, dcache		*/
 #define CONFIG_CMD_CDP		/* Cisco Discovery Protocol	*/