2 files changed, 51 insertions, 1 deletions

diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch
new file mode 100644
index 00000000..f73d3c4e
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch
@@ -0,0 +1,49 @@
+From bd152bec1086a35f426c53c9bb9f0c309e216037 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Wed, 2 Nov 2011 19:07:10 +0100
+Subject: [PATCH 5/5] am335x: Change mmc_load_uimage to load at a fixed address
+ The kernel normally expects to be run from 0x80008000 so if we
+ load from SD card at that-mkimage header we can save a copy of
+ the kernel.
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ include/configs/am335x_evm.h |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index 56e36da..8c0fae2 100755
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -74,8 +74,8 @@
+        "loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \
+        "importbootenv=echo Importing environment from mmc ...; " \
+                "env import -t $loadaddr $filesize\0" \
+-       "mmc_load_uimage_fat=fatload mmc ${mmc_dev} ${loadaddr} ${bootfile}\0" \
+-       "mmc_load_uimage=ext2load mmc 0:2 ${loadaddr} /boot/${bootfile}\0" \
++       "mmc_load_uimage_fat=fatload mmc ${mmc_dev} 0x80007fc0 ${bootfile}\0" \
++       "mmc_load_uimage=ext2load mmc 0:2 0x80007fc0 /boot/${bootfile}\0" \
+        "optargs=\0" \
+        "bootargs_defaults=setenv bootargs " \
+                "console=${console} " \
+@@ -103,7 +103,7 @@
+                "ip=dhcp\0" \
+        "mmc_boot=run mmc_args; " \
+                "run mmc_load_uimage; " \
+-               "bootm ${loadaddr}\0" \
++               "bootm\0" \
+        "nand_boot=echo Booting from nand ...; " \
+                "run nand_args; " \
+                "nand read.i ${loadaddr} ${nand_src_addr} ${nand_img_siz}; " \
+@@ -137,7 +137,7 @@
+                "fi;" \
+                "if run mmc_load_uimage; then " \
+                        "run mmc_args;" \
+-                       "bootm ${loadaddr};" \
++                       "bootm;" \
+                "fi;" \
+        "fi;" \
+        "run nand_boot;" \
+-- 
+1.7.2.5
+
diff --git a/recipes-bsp/u-boot/u-boot_2011.10rc.bb b/recipes-bsp/u-boot/u-boot_2011.10rc.bb
index e4552b86..eda4a628 100644
--- a/recipes-bsp/u-boot/u-boot_2011.10rc.bb
+++ b/recipes-bsp/u-boot/u-boot_2011.10rc.bb
@@ -4,7 +4,7 @@ require u-boot.inc
 COMPATIBLE_MACHINE = "(ti33x)"
 DEFAULT_PREFERENCE_ti33x = "99"
 PV = "2011.09+git"
-PR = "r16"
+PR = "r17"
 
 # SPL build
 UBOOT_BINARY = "u-boot.img"
@@ -16,6 +16,7 @@ SRC_URI = "git://arago-project.org/git/projects/u-boot-am33x.git;protocol=git;br
            file://2011.09git/0002-am335x_evm-boot-kernel-from-boot-in-ext2-3-filesyste.patch \
            file://2011.09git/0003-am335x_evm-set-bootdelay-to-1.patch \
            file://2011.09git/0004-am335x-evm-make-MMC-rootfs-RO-on-boot-so-fsck-works.patch \
+           file://2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch \
           "
 
 SRCREV = "f63b270e47f62f4d1a05b2001357e215966c6f5a"