alarm/uboot-pandaboard to 2014.10-1

alarm/uboot-pandaboard/0001-arch-linux-arm-modifications.patch

@@ -0,0 +1,104 @@
+From cbc2e3d0a3cfb4982061a1b2a02483b3c189ffb2 Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sat, 22 Nov 2014 22:55:40 -0700
+Subject: [PATCH] arch linux arm modifications
+
+Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
+---
+ include/configs/ti_omap4_common.h | 36 +++++++++++++++++++++++++-----------
+ 1 file changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
+index b0f199e..21343a8 100644
+--- a/include/configs/ti_omap4_common.h
++++ b/include/configs/ti_omap4_common.h
+@@ -46,7 +46,6 @@
+  * the timings to use or use pre-determined timings (based on using the
+  * dynamic method.  Default to the static timing infomation.
+  */
+-#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+ #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+ #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
+ #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
+@@ -82,6 +81,10 @@
+ #undef CONFIG_CMD_NET
+ #undef CONFIG_CMD_NFS
+ 
++/* Arch Linux ARM extras */
++#define CONFIG_IDENT_STRING " Arch Linux ARM"
++#define CONFIG_SUPPORT_RAW_INITRD
++
+ /*
+  * Environment setup
+  */
+@@ -89,29 +92,35 @@
+ 	DEFAULT_LINUX_BOOT_ENV \
+ 	"console=ttyO2,115200n8\0" \
+ 	"fdtfile=undefined\0" \
+-	"bootpart=0:2\0" \
++	"bootpart=0:1\0" \
+ 	"bootdir=/boot\0" \
++	"fdtdir=/boot/dtbs\0" \
+ 	"bootfile=zImage\0" \
++	"rdfile=initramfs-linux.img\0" \
+ 	"usbtty=cdc_acm\0" \
+ 	"vram=16M\0" \
+ 	"mmcdev=0\0" \
+-	"mmcroot=/dev/mmcblk0p2 rw\0" \
+-	"mmcrootfstype=ext3 rootwait\0" \
++	"optargs=\0" \
++	"mmcroot=/dev/mmcblk0p1 rw rootwait\0" \
+ 	"mmcargs=setenv bootargs console=${console} " \
+ 		"vram=${vram} " \
+ 		"root=${mmcroot} " \
+-		"rootfstype=${mmcrootfstype}\0" \
+-	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
++		"${optargs}\0" \
++	"loadbootscript=load mmc ${bootpart} ${loadaddr} ${bootdir}/boot.scr\0" \
+ 	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ 		"source ${loadaddr}\0" \
+-	"loadbootenv=load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
++	"loadbootenv=load mmc ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt\0" \
+ 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
+ 		"env import -t ${loadaddr} ${filesize}\0" \
+ 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+-	"loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \
++	"loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/uImage\0" \
++	"loadrd=load mmc ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \
+ 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
+ 		"run mmcargs; " \
+ 		"bootz ${loadaddr} - ${fdtaddr}\0" \
++	"rdboot=echo Booting from mmc${mmcdev} ...; " \
++		"run mmcargs; " \
++		"bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
+ 	"uimageboot=echo Booting from mmc${mmcdev} ...; " \
+ 		"run mmcargs; " \
+ 		"bootm ${loadaddr}\0" \
+@@ -128,7 +137,7 @@
+ 			"setenv fdtfile omap4-duovero-parlor.dtb; fi;" \
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine device tree to use; fi; \0" \
+-	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
++	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
+ 
+ #define CONFIG_BOOTCOMMAND \
+ 	"run findfdt; " \
+@@ -146,8 +155,13 @@
+ 			"fi;" \
+ 		"fi;" \
+ 		"if run loadimage; then " \
+-			"run loadfdt;" \
+-			"run mmcboot; " \
++			"if run loadfdt; then " \
++				"if run loadrd; then " \
++					"run rdboot; "\
++				"else " \
++					"run mmcboot; " \
++				"fi;" \
++			"fi;" \
+ 		"fi; " \
+ 		"if run loaduimage; then " \
+ 			"run uimageboot;" \
+-- 
+2.1.3
+

alarm/uboot-pandaboard/PKGBUILD

@@ -4,26 +4,25 @@
 buildarch=4
 
 pkgname=uboot-pandaboard
-pkgver=2014.04
+pkgver=2014.10
 pkgrel=1
 pkgdesc="U-Boot for Pandaboard and Pandaboard ES"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
+makedepends=('git' 'bc')
 license=('GPL')
+install=${pkgname}.install
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        'http://raw.github.com/eewiki/u-boot-patches/master/v${pkgver}/0001-omap4_common-uEnv.txt-bootz-n-fixes.patch'
+        '0001-arch-linux-arm-modifications.patch'
-        'alarm.patch'
         'uEnv.txt')
-md5sums=('6d2116d1385a66e9a59742caa9d62a54'
+md5sums=('3ddcaee2f05b7c464778112ec83664b5'
-         'd796b672643d92f6b43b4ba74e8a244f'
+         '4ea27f04967623eda45cc468c20db74b'
-         '119804f59c0b392c70bcdc67dc220ae0'
+         '86004660f2912861a040e335c9c0e85b')
-         '76589e692f164699f5d8c7202af1f4fc')
 
 prepare() {
   cd u-boot-${pkgver}
 
-  patch -Np1 -i "${srcdir}"/0001-omap4_common-uEnv.txt-bootz-n-fixes.patch
+  git apply ../0001-arch-linux-arm-modifications.patch
-  patch -Np1 -i "${srcdir}"/alarm.patch
 }
 
 build() {

alarm/uboot-pandaboard/alarm.patch

@@ -1,82 +0,0 @@
-diff -urN a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
---- a/include/configs/ti_omap4_common.h	2014-05-17 13:32:47.384861195 -0600
-+++ b/include/configs/ti_omap4_common.h	2014-05-17 13:48:19.361560495 -0600
-@@ -85,6 +85,8 @@
- #undef CONFIG_CMD_NET
- #undef CONFIG_CMD_NFS
- 
-+#define CONFIG_IDENT_STRING " Arch Linux ARM"
-+
- /*
-  * Environment setup
-  */
-@@ -95,9 +97,9 @@
- 	"fdtaddr=0x815f0000\0" \
- 	"fdtfile=undefined\0" \
- 	"bootpart=0:1\0" \
--	"bootdir=\0" \
--	"fdtdir=/dtbs\0" \
--	"bootfile=zImage\0" \
-+	"rootpart=0:2\0" \
-+	"bootdir=/boot\0" \
-+	"fdtdir=/boot/dtbs\0" \
- 	"usbtty=cdc_acm\0" \
- 	"vram=16M\0" \
- 	"defaultdisplay=dvi\0" \
-@@ -105,24 +107,26 @@
- 	"buddy=none\0" \
- 	"mmcdev=0\0" \
- 	"mmcpart=1\0" \
--	"mmcroot=/dev/mmcblk0p2 ro\0" \
--	"mmcrootfstype=ext4 rootwait fixrtc\0" \
-+	"mmcroot=/dev/mmcblk0p2 rw rootwait fixrtc\0" \
- 	"mmcargs=setenv bootargs console=${console} " \
- 		"buddy=${buddy} "\
- 		"vram=${vram} " \
- 		"omapfb.mode=${defaultdisplay}:${dvimode} " \
--		"root=${mmcroot} " \
--		"rootfstype=${mmcrootfstype}\0" \
-+		"root=${mmcroot}\0" \
- 	"loadbootscript=load mmc ${bootpart} ${loadaddr} boot.scr\0" \
- 	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
- 		"source ${loadaddr}\0" \
- 	"loadbootenv=load mmc ${bootpart} ${loadaddr} uEnv.txt\0" \
- 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
- 		"env import -t ${loadaddr} ${filesize}\0" \
--	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
--	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
-+	"loadzimage=load mmc ${rootpart} ${loadaddr} ${bootdir}/zImage\0" \
-+	"loaduimage=load mmc ${rootpart} ${loadaddr} ${bootdir}/uImage\0" \
-+	"mmcbootz=echo Booting from mmc${mmcdev} ...; " \
- 		"run mmcargs; " \
- 		"bootz ${loadaddr} - ${fdtaddr}\0" \
-+	"mmcbootm=echo Booting from mmc${mmcdev} ...; " \
-+		"run mmcargs; " \
-+		"bootm ${loadaddr}\0" \
- 	"mmc_classic_boot=echo Booting from mmc${mmcdev} ...; " \
- 		"run mmcargs; " \
- 		"bootz ${loadaddr}\0" \
-@@ -137,7 +141,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 ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
-+	"loadfdt=load mmc ${rootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
- 
- #define CONFIG_BOOTCOMMAND \
- 	"run findfdt; " \
-@@ -155,9 +159,12 @@
- 				"run uenvcmd;" \
- 			"fi;" \
- 		"fi;" \
--		"if run loadimage; then " \
-+		"if run loadzimage; then " \
- 			"run loadfdt;" \
--			"run mmcboot; " \
-+			"run mmcbootz; " \
-+		"fi; " \
-+		"if run loaduimage; then " \
-+			"run mmcbootm; " \
- 		"fi; " \
- 	"fi"
- 

alarm/uboot-pandaboard/uEnv.txt

@@ -1,15 +1,2 @@
-# SPI: enable for userspace spi access on expansion header
+# Uncomment and add any additional kernel parameters to optargs
-#buddy=spidev
+#optargs=
- 
-# These are set by default: uncomment/change if you need something else
-#defaultdisplay=dvi
-#dvimode=1280x720MR-16@60
-#mmcroot=/dev/mmcblk0p2 rw rootwait fixrtc
- 
-# Uncomment the following lines to boot from the first partition of a USB drive
-#uenvcmd=usb start
-#mmcroot=/dev/sda1 rw rootwait fixrtc
-#loadfdt=load usb 0:1 ${fdtaddr} ${fdtdir}/${fdtfile}
-#loadimage=load usb 0:1 ${loadaddr} ${bootdir}/${bootfile}
-#loaduimage=load usb 0:1 ${loadaddr} ${bootdir}/uImage
-

alarm/uboot-pandaboard/uboot-pandaboard.install

@@ -0,0 +1,21 @@
+flash_uboot() {
+  echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
+  echo "Do this now? [y|N]"
+  read -r shouldwe
+  if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
+    dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k
+    dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k
+  else
+    echo "You can do this later by running:"
+    echo "# dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k"
+    echo "# dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k"
+  fi
+}
+
+post_install() {
+  flash_uboot
+}
+
+post_upgrade() {
+  flash_uboot
+}