3 files changed, 37 insertions, 2 deletions

diff --git a/recipes-bsp/u-boot/u-boot-am3517_2011.09.bb b/recipes-bsp/u-boot/u-boot-am3517_2011.09.bb
index 6321406d..06b8cf1a 100644
--- a/recipes-bsp/u-boot/u-boot-am3517_2011.09.bb
+++ b/recipes-bsp/u-boot/u-boot-am3517_2011.09.bb
@@ -6,9 +6,11 @@ COMPATIBLE_MACHINE = "omap3"
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r0+gitr${SRCPV}"
+PR = "r1+gitr${SRCPV}"
 
-SRC_URI = "git://arago-project.org/git/projects/u-boot-am33x.git;protocol=git;branch=${BRANCH}"
+SRC_URI = "git://arago-project.org/git/projects/u-boot-am33x.git;protocol=git;branch=${BRANCH} \
+           file://0001-armv7-Unaligned-access-fix.patch \
+"
 
 BRANCH = "AM335XPSP_04.06.00.08"
 
diff --git a/recipes-bsp/u-boot/u-boot-am37x_2012.04.01.bb b/recipes-bsp/u-boot/u-boot-am37x_2012.04.01.bb
index c25cf1e4..1cd96b6a 100644
--- a/recipes-bsp/u-boot/u-boot-am37x_2012.04.01.bb
+++ b/recipes-bsp/u-boot/u-boot-am37x_2012.04.01.bb
@@ -6,6 +6,8 @@ COMPATIBLE_MACHINE = "am37x-evm|beagleboard"
 
 BRANCH ?= "master"
 
+PR = "r1+gitr${SRCPV}"
+
 # v2012.04.01
 SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d"
 
@@ -33,6 +35,7 @@ SRC_URI += "file://0001-omap3_beagle-add-usbethaddr-setting-to-enable-networ.pat
             file://0002-omap3evm-Make-the-board-start-at-800MHz.patch \
             file://0003-beagleboard-Make-xM-rev-C-go-to-800MHz.patch \
             file://0001-ARM-omap3-Set-SPL-stack-size-to-8KB-image-to-54KB.patch \
+            file://0001-armv7-Unaligned-access-fix.patch \
             "
 
 SPL_BINARY = "MLO"
diff --git a/recipes-bsp/u-boot/u-boot/0001-armv7-Unaligned-access-fix.patch b/recipes-bsp/u-boot/u-boot/0001-armv7-Unaligned-access-fix.patch
new file mode 100644
index 00000000..35307ac0
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot/0001-armv7-Unaligned-access-fix.patch
@@ -0,0 +1,30 @@
+From 40f1e7db785f477a2aa145a3b47bd498c48ad52d Mon Sep 17 00:00:00 2001
+From: Steve Kipisz <s-kipisz2@ti.com>
+Date: Fri, 14 Jun 2013 05:16:52 -0500
+Subject: [PATCH] armv7:Unaligned access fix
+
+This fixes an unaligned access data abort introduced when using gcc 4.7
+or higher. The Linaro toolchain uses gcc 4.7.3. This is documented in u-boot
+doc/README.arm-unaligned-accesses.
+
+Signed-off-by: Steve Kipisz <s-kipisz2@ti.com>
+---
+ arch/arm/cpu/armv7/config.mk |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/cpu/armv7/config.mk b/arch/arm/cpu/armv7/config.mk
+index 9c3e2f3..9736da8 100644
+--- a/arch/arm/cpu/armv7/config.mk
++++ b/arch/arm/cpu/armv7/config.mk
+@@ -20,7 +20,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ # MA 02111-1307 USA
+ #
+-PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float
++PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float -mno-unaligned-access
+ 
+ # If armv7-a is not supported by GCC fall-back to armv5, which is
+ # supported by more tool-chains
+-- 
+1.7.9.5
+