mx23_olinuxino: improve default settings

Signed-off-by: Robert Nelson <[email protected]>

v2013.04-rc2/0001-mx23_olinuxino-uEnv.txt-bootz-n-fixes.patch

@@ -17,15 +17,32 @@ Defaults:
 
 fatload -> load
 bootm -> bootz
-loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}
+
+#define CONFIG_BOOTCOMMAND \
+	"mmc dev ${mmcdev};" \
+	"if mmc rescan; then " \
+		"echo SD/MMC found on device ${mmcdev};" \
+		"if run loadbootenv; then " \
+			"echo Loaded environment from uEnv.txt;" \
+			"run importbootenv;" \
+		"fi;" \
+		"if test -n $uenvcmd; then " \
+			"echo Running uenvcmd ...;" \
+			"run uenvcmd;" \
+		"fi;" \
+		"if run loadzimage; then " \
+			"run loadfdt;" \
+			"run mmcboot;" \
+		"fi;" \
+	"fi;"
 
 Signed-off-by: Robert Nelson <[email protected]>
 ---
- include/configs/mx23_olinuxino.h |   44 ++++++++++++++++++--------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
+ include/configs/mx23_olinuxino.h |   69 +++++++++++++++++++++-----------------
+ 1 file changed, 38 insertions(+), 31 deletions(-)
 
 diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
-index 03893d7..0079daf 100644
+index 03893d7..208fdf1 100644
 --- a/include/configs/mx23_olinuxino.h
 +++ b/include/configs/mx23_olinuxino.h
 @@ -64,6 +64,15 @@
@@ -44,20 +61,45 @@ index 03893d7..0079daf 100644
  /*
   * Memory configurations
   */
-@@ -207,26 +216,16 @@
+@@ -164,7 +173,7 @@
+  */
+ #define	CONFIG_CMDLINE_TAG
+ #define	CONFIG_SETUP_MEMORY_TAGS
+-#define	CONFIG_BOOTDELAY	3
++#define	CONFIG_BOOTDELAY	1
+ #define	CONFIG_BOOTFILE		"uImage"
+ #define	CONFIG_LOADADDR		0x42000000
+ #define	CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
+@@ -197,36 +206,28 @@
+ 	"script=boot.scr\0"	\
+ 	"uimage=uImage\0" \
+ 	"console=ttyAMA0\0" \
+-	"fdt_file=imx23-olinuxino.dtb\0" \
++	"fdt_file=/boot/dtbs/imx23-olinuxino.dtb\0" \
+ 	"fdt_addr=0x41000000\0" \
+ 	"boot_fdt=try\0" \
+ 	"ip_dyn=yes\0" \
+ 	"mmcdev=0\0" \
+ 	"mmcpart=2\0" \
+-	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
++	"mmcroot=/dev/mmcblk0p2 ro rootwait\0" \
++	"mmcrootfstype=ext4 rootwait fixrtc\0" \
  	"mmcargs=setenv bootargs console=${console},${baudrate} " \
- 		"root=${mmcroot}\0" \
- 	"loadbootscript="  \
+-		"root=${mmcroot}\0" \
+-	"loadbootscript="  \
 -		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++		"root=${mmcroot} " \
++		"rootfstype=${mmcrootfstype}\0" \
++	"loadbootenv="  \
 +		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/uEnv.txt ;\0" \
 +	"importbootenv=echo Importing environment from mmc ...; " \
 +		"env import -t ${loadaddr} ${filesize}\0" \
  	"bootscript=echo Running bootscript from mmc ...; "	\
  		"source\0" \
 -	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
 -	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-+	"loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/zImage\0" \
-+	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /boot/dtbs/${fdt_file}\0" \
++	"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/zImage\0" \
++	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
  	"mmcboot=echo Booting from mmc ...; " \
  		"run mmcargs; " \
 -		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
@@ -77,23 +119,35 @@ index 03893d7..0079daf 100644
  	"netargs=setenv bootargs console=${console_mainline},${baudrate} " \
  		"root=/dev/nfs " \
  		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-@@ -256,13 +255,12 @@
+@@ -254,15 +255,21 @@
+ 		"fi;\0"
+
  #define CONFIG_BOOTCOMMAND \
- 	"mmc dev ${mmcdev}; if mmc rescan; then " \
- 		"if run loadbootscript; then " \
+-	"mmc dev ${mmcdev}; if mmc rescan; then " \
+-		"if run loadbootscript; then " \
 -			"run bootscript; " \
 -		"else " \
 -			"if run loaduimage; then " \
 -				"run mmcboot; " \
 -			"else run netboot; " \
 -			"fi; " \
-+			"echo Loaded environment from uEnv.txt; " \
-+			"run importbootenv; " \
-+		"fi; " \
-+		"if run loaduimage; then " \
-+			"run loadfdt; run mmcboot; " \
- 		"fi; " \
+-		"fi; " \
 -	"else run netboot; fi"
++	"mmc dev ${mmcdev};" \
++	"if mmc rescan; then " \
++		"echo SD/MMC found on device ${mmcdev};" \
++		"if run loadbootenv; then " \
++			"echo Loaded environment from uEnv.txt;" \
++			"run importbootenv;" \
++		"fi;" \
++		"if test -n $uenvcmd; then " \
++			"echo Running uenvcmd ...;" \
++			"run uenvcmd;" \
++		"fi;" \
++		"if run loadzimage; then " \
++			"run loadfdt;" \
++			"run mmcboot;" \
++		"fi;" \
 +	"fi;"
 
  #endif /* __MX23_OLINUXINO_CONFIG_H__ */