Patchwork [U-Boot,v2,4/4] RX-51: Add support for bootmenu

login
register
mail settings
Submitter Pali Rohár
Date Nov. 1, 2012, 11:39 a.m.
Message ID <1351769953-13560-5-git-send-email-pali.rohar@gmail.com>
Download mbox | patch
Permalink /patch/196172/
State Superseded
Delegated to: Anatolij Gustschin
Headers show

Comments

Pali Rohár - Nov. 1, 2012, 11:39 a.m.
* default bootmenu entries:
   attached kernel, internal eMMC memory, external SD card, u-boot boot order

 * in CONFIG_PREBOOT try load bootmenu.scr from first FAT partition of internal
   eMMC memory (also known as MyDocs) which (should) overwrite default bootmenu
   entries

 * when keyboard slide is closed boot first menu entry

 * when keyborad slide is open in show bootmenu

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Tom Rini <trini@ti.com>
---
This patch was in Nokia RX-51 patch series.

Changes since RX-51 patch:
  - Rebased on last Nokia RX-51 patch v5

Changes since original version:
  - Fixed name of env variables

 include/configs/nokia_rx51.h |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

Patch

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 8506604..cd31d21 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -148,6 +148,7 @@ 
 #define CONFIG_CMDLINE_EDITING		/* add command line history */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 
+#define CONFIG_CMD_BOOTMENU		/* ANSI terminal Boot Menu */
 #define CONFIG_CMD_CLEAR		/* ANSI terminal clear screen command */
 
 #ifdef ONENAND_SUPPORT
@@ -287,8 +288,6 @@  int rx51_kp_getc(void);
 #endif
 
 /* Environment information */
-#define CONFIG_BOOTDELAY		3
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"mtdparts=" MTDPARTS_DEFAULT "\0" \
 	"usbtty=cdc_acm\0" \
@@ -360,10 +359,25 @@  int rx51_kp_getc(void);
 		"fi\0" \
 	"emmcboot=setenv mmcnum 1; run trymmcboot\0" \
 	"sdboot=setenv mmcnum 0; run trymmcboot\0" \
+	"menucmd=bootmenu\0" \
+	"bootmenu_0=Attached kernel=run attachboot\0" \
+	"bootmenu_1=Internal eMMC=run emmcboot\0" \
+	"bootmenu_2=External SD card=run sdboot\0" \
+	"bootmenu_3=U-Boot boot order=boot\0" \
+	"bootmenu_delay=30\0" \
 	""
 
 #define CONFIG_PREBOOT \
-	"if run slide; then true; else run attachboot; fi;" \
+	"setenv mmcnum 1; setenv mmcpart 1; setenv mmctype fat;" \
+	"setenv mmcscriptfile bootmenu.scr;" \
+	"run trymmcscriptboot;" \
+	"if run slide; then true; else " \
+		"setenv bootmenu_delay 0;" \
+		"setenv bootdelay 0;" \
+	"fi"
+
+#define CONFIG_POSTBOOTMENU \
+	"echo;" \
 	"echo Extra commands:;" \
 	"echo run sercon - Use serial port for control.;" \
 	"echo run usbcon - Use usbtty for control.;" \
@@ -379,6 +393,11 @@  int rx51_kp_getc(void);
 	"run attachboot;" \
 	"echo"
 
+#define CONFIG_BOOTDELAY 30
+#define CONFIG_AUTOBOOT_KEYED
+#define CONFIG_MENU
+#define CONFIG_MENU_SHOW
+
 /*
  * Miscellaneous configurable options
  */