alarm/uboot-wandboard to 2013.07-2

alarm/uboot-wandboard/PKGBUILD

@@ -6,7 +6,7 @@ buildarch=4
 pkgbase=uboot-wandboard
 pkgname=('uboot-wandboard-solo' 'uboot-wandboard-dual' 'uboot-wandboard-quad')
 pkgver=2013.07
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
@@ -14,7 +14,7 @@ makedepends=('git')
 source=("uboot::git://git.denx.de/u-boot.git#tag=v${pkgver}"
         'alarm.patch')
 md5sums=('SKIP'
-         'a242f12cf03259bbea4193baea0f9d15')
+         '8a9f8214097fac0825911698b90986d3')
 
 prepare() {
   cd uboot

alarm/uboot-wandboard/alarm.patch

@@ -1,6 +1,6 @@
 diff -urN a/include/configs/wandboard.h b/include/configs/wandboard.h
 --- a/include/configs/wandboard.h	2013-07-25 18:18:02.185623052 -0600
-+++ b/include/configs/wandboard.h	2013-07-25 18:49:02.460474904 -0600
++++ b/include/configs/wandboard.h	2013-08-13 11:18:20.974683636 -0600
 @@ -51,7 +51,7 @@
  #define CONFIG_CMD_BMODE
  #define CONFIG_CMD_SETEXPR
@@ -19,7 +19,7 @@ diff -urN a/include/configs/wandboard.h b/include/configs/wandboard.h
  #define CONFIG_DOS_PARTITION
  
  /* Ethernet Configuration */
-@@ -102,16 +104,18 @@
+@@ -102,26 +104,32 @@
  #define CONFIG_IPUV3_CLK 260000000
  
  #if defined(CONFIG_MX6DL)
@@ -40,21 +40,38 @@ diff -urN a/include/configs/wandboard.h b/include/configs/wandboard.h
 -	"uimage=uImage\0" \
 +	"script=/boot/boot.scr\0" \
 +	"uimage=/boot/uImage\0" \
++	"zimage=/boot/zImage\0" \
  	"console=ttymxc0\0" \
  	"fdt_high=0xffffffff\0" \
  	"initrd_high=0xffffffff\0" \
-@@ -121,7 +125,7 @@
+ 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+ 	"fdt_addr=0x11000000\0" \
+-	"boot_fdt=try\0" \
++	"boot_fdt=no\0" \
  	"ip_dyn=yes\0" \
- 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+-	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
++	"optargs=\0" \
++	"video=\0" \
++	"mmcdev=0\0" \
  	"mmcpart=1\0" \
 -	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
-+	"mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
++	"mmcroot=/dev/mmcblk0p1 rw\0" \
++	"mmcrootfstype=ext4 rootwait\0" \
  	"update_sd_firmware_filename=u-boot.imx\0" \
  	"update_sd_firmware=" \
  		"if test ${ip_dyn} = yes; then " \
-@@ -139,11 +143,11 @@
+@@ -137,27 +145,34 @@
+ 			"fi; "	\
+ 		"fi\0" \
  	"mmcargs=setenv bootargs console=${console},${baudrate} " \
- 		"root=${mmcroot}\0" \
+-		"root=${mmcroot}\0" \
++		"${optargs} " \
++		"root=${mmcroot} " \
++		"rootfstype=${mmcrootfstype} " \
++		"video=${video}\0" \
++	"loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/uEnv.txt\0" \
++	"importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
++		"env import -t $loadaddr $filesize\0" \
  	"loadbootscript=" \
 -		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 +		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
@@ -63,11 +80,82 @@ diff -urN a/include/configs/wandboard.h b/include/configs/wandboard.h
 -	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
 -	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 +	"loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
++	"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${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 " \
-@@ -237,6 +241,7 @@
+ 			"if run loadfdt; then " \
+-				"bootm ${loadaddr} - ${fdt_addr}; " \
++				"bootz ${loadaddr} - ${fdt_addr}; " \
+ 			"else " \
+ 				"if test ${boot_fdt} = try; then " \
+-					"bootm; " \
++					"bootz ${loadaddr}; " \
+ 				"else " \
+ 					"echo WARN: Cannot load the DT; " \
+ 				"fi; " \
+ 			"fi; " \
+ 		"else " \
+-			"bootm; " \
++			"bootm ${loadaddr}; " \
+ 		"fi;\0" \
+ 	"netargs=setenv bootargs console=${console},${baudrate} " \
+ 		"root=/dev/nfs " \
+@@ -169,32 +184,38 @@
+ 		"else " \
+ 			"setenv get_cmd tftp; " \
+ 		"fi; " \
+-		"${get_cmd} ${uimage}; " \
++		"${get_cmd} zImage; " \
+ 		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+ 			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+-				"bootm ${loadaddr} - ${fdt_addr}; " \
++				"bootz ${loadaddr} - ${fdt_addr}; " \
+ 			"else " \
+ 				"if test ${boot_fdt} = try; then " \
+-					"bootm; " \
++					"bootz ${loadaddr}; " \
+ 				"else " \
+ 					"echo WARN: Cannot load the DT; " \
+ 				"fi; " \
+ 			"fi; " \
+ 		"else " \
+-			"bootm; " \
++			"bootz ${loadaddr}; " \
+ 		"fi;\0"
+ 
+ #define CONFIG_BOOTCOMMAND \
+-	   "mmc dev ${mmcdev}; if mmc rescan; then " \
+-		   "if run loadbootscript; then " \
+-			   "run bootscript; " \
+-		   "else " \
+-			   "if run loaduimage; then " \
+-				   "run mmcboot; " \
+-			   "else run netboot; " \
+-			   "fi; " \
+-		   "fi; " \
+-	   "else run netboot; fi"
++	"mmc dev ${mmcdev};" \
++	"if mmc rescan; then " \
++		"echo SD/MMC found on device ${mmcdev};" \
++		"if run loadbootenv; then " \
++			"run importbootenv;" \
++		"fi;" \
++		"echo Checking if uenvcmd is set ...;" \
++		"if test -n $uenvcmd; then " \
++			"echo Running uenvcmd ...;" \
++			"run uenvcmd;" \
++		"fi;" \
++		"echo Running default loaduimage ...;" \
++		"if run loaduimage; then " \
++			"run mmcboot;" \
++		"fi;" \
++	"fi;"
+ 
+ /* Miscellaneous configurable options */
+ #define CONFIG_SYS_LONGHELP
+@@ -237,6 +258,7 @@
  
  #define CONFIG_OF_LIBFDT
  #define CONFIG_CMD_BOOTZ