alarm/uboot-pandaboard to 2013.10-1

alarm/uboot-pandaboard/PKGBUILD

@@ -4,7 +4,7 @@
 buildarch=4
 
 pkgname=uboot-pandaboard
-pkgver=2013.04
+pkgver=2013.10
 pkgrel=1
 pkgdesc="U-Boot for Pandaboard and Pandaboard ES"
 arch=('armv7h')
@@ -16,18 +16,23 @@ source=("uboot::git://git.denx.de/u-boot.git#tag=v${pkgver}"
         'alarm.patch'
         'uEnv.txt')
 md5sums=('SKIP'
-         '7472e6e0c10c59ca53442bb85a33278e'
-         '2a411ced08f8c536b76b47df64a36d17'
-         '9d4d647761d7e5dac7b6368970c74eb5')
+         '683bf12be7b0be3de60cf2f33e85a011'
+         '148982b955b96dfd16284181523df1a1'
+         '76589e692f164699f5d8c7202af1f4fc')
 
 prepare() {
   cd uboot
+
+  rm -rf .git
   patch -p1 -i "${srcdir}"/0001-omap4_common-uEnv.txt-bootz-n-fixes.patch
   patch -p1 -i "${srcdir}"/alarm.patch
 }
 
 build() {
   cd uboot
+
+  unset LDFLAGS
+
   make distclean 
   make omap4_panda_config
   make

alarm/uboot-pandaboard/alarm.patch

@@ -1,29 +1,74 @@
 diff -urN a/include/configs/omap4_common.h b/include/configs/omap4_common.h
---- a/include/configs/omap4_common.h	2013-05-29 14:33:35.068105081 -0600
-+++ b/include/configs/omap4_common.h	2013-05-29 14:41:54.424745536 -0600
-@@ -158,6 +158,7 @@
- 	"fdtaddr=0x80f80000\0" \
+--- a/include/configs/omap4_common.h	2014-01-07 18:45:04.689541145 -0700
++++ b/include/configs/omap4_common.h	2014-01-07 18:58:41.060695680 -0700
+@@ -136,6 +136,8 @@
+ 
+ #define CONFIG_ENV_OVERWRITE
+ 
++#define CONFIG_IDENT_STRING " Arch Linux ARM"
++
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"loadaddr=0x82000000\0" \
+ 	"console=ttyO2,115200n8\0" \
+@@ -144,7 +146,7 @@
+ 	"fdtfile=undefined\0" \
  	"bootpart=0:2\0" \
  	"bootdir=/boot\0" \
+-	"fdtdir=/dtbs\0" \
 +	"fdtdir=/boot/dtbs\0" \
  	"bootfile=zImage\0" \
  	"usbtty=cdc_acm\0" \
  	"vram=16M\0" \
-@@ -166,7 +167,7 @@
+@@ -153,14 +155,12 @@
  	"buddy=none\0" \
  	"mmcdev=0\0" \
  	"mmcpart=1\0" \
 -	"mmcroot=/dev/mmcblk0p2 ro\0" \
-+	"mmcroot=/dev/mmcblk0p2 rw\0" \
- 	"mmcrootfstype=ext4 rootwait fixrtc\0" \
+-	"mmcrootfstype=ext4 rootwait fixrtc\0" \
++	"mmcroot=/dev/mmcblk0p2 rw rootwait fixrtc\0" \
  	"mmcargs=setenv bootargs console=${console} " \
  		"buddy=${buddy} "\
-@@ -193,7 +194,7 @@
+ 		"vram=${vram} " \
+ 		"omapfb.mode=${defaultdisplay}:${dvimode} " \
+-		"root=${mmcroot} " \
+-		"rootfstype=${mmcrootfstype}\0" \
++		"root=${mmcroot}\0" \
+ 	"loadbootscript=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot.scr\0" \
+ 	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ 		"source ${loadaddr}\0" \
+@@ -168,13 +168,13 @@
+ 	"importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
+ 		"env import -t ${loadaddr} ${filesize}\0" \
+ 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+-	"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
++	"loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/uImage\0" \
+ 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
+ 		"run mmcargs; " \
+ 		"bootz ${loadaddr} - ${fdtaddr}\0" \
+ 	"mmc_classic_boot=echo Booting from mmc${mmcdev} ...; " \
+ 		"run mmcargs; " \
+-		"bootz ${loadaddr}\0" \
++		"bootm ${loadaddr}\0" \
+ 	"findfdt="\
+ 		"if test $board_name = sdp4430; then " \
  			"setenv fdtfile omap4-sdp.dtb; fi; " \
- 		"if test $board_name = panda; then " \
- 			"setenv fdtfile omap4-panda-es.dtb; fi\0" \
--	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+@@ -186,7 +186,7 @@
+ 			"setenv fdtfile omap4-panda-es.dtb; fi;" \
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine device tree to use; fi; \0" \
+-	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
 +	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
  
  #define CONFIG_BOOTCOMMAND \
  	"run findfdt; " \
+@@ -203,8 +203,8 @@
+ 				"echo Running uenvcmd ...;" \
+ 				"run uenvcmd;" \
+ 			"fi;" \
+-			"echo Running default loadzimage ...;" \
+-			"if run loadzimage; then " \
++			"echo Running default loaduimage ...;" \
++			"if run loaduimage; then " \
+ 				"run mmc_classic_boot; " \
+ 			"fi; " \
+ 		"fi;" \

alarm/uboot-pandaboard/uEnv.txt

@@ -1,9 +1,8 @@
 #SPI: enable for userspace spi access on expansion header
 #buddy=spidev
  
-#Video Resolution:
+#These are now set by default: uncomment/change if you need something else
+#defaultdisplay=dvi
 #dvimode=1280x720MR-16@60
  
-#Partitions: default settings:
-#mmcroot=/dev/mmcblk0p2 rw
-#mmcrootfstype=ext4 rootwait fixrtc
+#mmcroot=/dev/mmcblk0p2 rw rootwait fixrtc