From 7fe308da25b0ab58ab885c4ec5123eb940048053 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 17 May 2014 20:18:18 +0000
Subject: [PATCH] alarm/uboot-beagleboard to 2014.04-1

---
 alarm/uboot-beagleboard/PKGBUILD    |  8 ++++----
 alarm/uboot-beagleboard/alarm.patch | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/alarm/uboot-beagleboard/PKGBUILD b/alarm/uboot-beagleboard/PKGBUILD
index 549708915..488d489ca 100644
--- a/alarm/uboot-beagleboard/PKGBUILD
+++ b/alarm/uboot-beagleboard/PKGBUILD
@@ -4,7 +4,7 @@
 buildarch=4
 
 pkgname=uboot-beagleboard
-pkgver=2014.01
+pkgver=2014.04
 pkgrel=1
 pkgdesc="U-Boot for BeagleBoard and BeagleBoard-xM"
 arch=('armv7h')
@@ -15,9 +15,9 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         "https://raw.github.com/eewiki/u-boot-patches/master/v${pkgver}/0001-omap3_beagle-uEnv.txt-bootz-n-fixes.patch"
         'alarm.patch'
         'uEnv.txt')
-md5sums=('e531307578f6d32a7ccb1d04f1e08cbc'
-         '6d6a394e07527d30330092ea3aa35cc9'
-         '8c8e5ce2a03e99ed561185e9a6cffad8'
+md5sums=('6d2116d1385a66e9a59742caa9d62a54'
+         '242047dc2fdd99593833e9ff23081432'
+         '50df3ef011901e8051b42fd3528b0d86'
          '3704f05f308e3bb73a5b67a033b2ce5c')
 
 prepare() {
diff --git a/alarm/uboot-beagleboard/alarm.patch b/alarm/uboot-beagleboard/alarm.patch
index bc7b73f08..275ed5816 100644
--- a/alarm/uboot-beagleboard/alarm.patch
+++ b/alarm/uboot-beagleboard/alarm.patch
@@ -1,7 +1,7 @@
 diff -urN a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
---- a/include/configs/omap3_beagle.h	2014-02-02 13:27:32.899074278 -0700
-+++ b/include/configs/omap3_beagle.h	2014-02-02 13:27:06.719177569 -0700
-@@ -193,6 +193,8 @@
+--- a/include/configs/omap3_beagle.h	2014-05-17 14:05:55.202683461 -0600
++++ b/include/configs/omap3_beagle.h	2014-05-17 14:06:11.697622480 -0600
+@@ -192,6 +192,8 @@
  /* Environment information */
  #define CONFIG_BOOTDELAY		1
  
@@ -10,7 +10,7 @@ diff -urN a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
  #define CONFIG_EXTRA_ENV_SETTINGS \
  	"loadaddr=0x80300000\0" \
  	"rdaddr=0x81000000\0" \
-@@ -201,9 +203,9 @@
+@@ -200,9 +202,9 @@
  	"usbtty=cdc_acm\0" \
  	"bootfile=zImage\0" \
  	"ramdisk=ramdisk.gz\0" \
@@ -23,7 +23,7 @@ diff -urN a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
  	"console=ttyO2,115200n8\0" \
  	"mpurate=auto\0" \
  	"buddy=none\0" \
-@@ -214,8 +216,7 @@
+@@ -213,8 +215,7 @@
  	"dvimode=640x480MR-16@60\0" \
  	"defaultdisplay=dvi\0" \
  	"mmcdev=0\0" \
@@ -33,7 +33,7 @@ diff -urN a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
  	"nandroot=ubi0:rootfs ubi.mtd=4\0" \
  	"nandrootfstype=ubifs\0" \
  	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \
-@@ -229,7 +230,6 @@
+@@ -228,7 +229,6 @@
  		"omapfb.mode=dvi:${dvimode} " \
  		"omapdss.def_disp=${defaultdisplay} " \
  		"root=${mmcroot} " \
@@ -41,7 +41,7 @@ diff -urN a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
  		"${musb}\0" \
  	"nandargs=setenv bootargs console=${console} " \
  		"${optargs} " \
-@@ -258,7 +258,7 @@
+@@ -257,7 +257,7 @@
  		"if test $beaglerev = xMAB; then " \
  			"fdt addr ${fdtaddr}; fdt resize; fdt set /hsusb2_power_reg enable-active-high; fi; \0" \
  	"bootenv=uEnv.txt\0" \