u-boot 2011.12: fix L2 cache on non-omap4 platforms
authorKoen Kooi <koen@dominion.thruhere.net>
Fri, 20 Jan 2012 12:49:15 +0000 (13:49 +0100)
committerKoen Kooi <koen@dominion.thruhere.net>
Mon, 23 Jan 2012 08:39:54 +0000 (09:39 +0100)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Acked-by: Tom Rini <trini@ti.com>
recipes-bsp/u-boot/u-boot/2011.12/0001-Revert-armv7-disable-L2-cache-in-cleanup_before_linu.patch [new file with mode: 0644]
recipes-bsp/u-boot/u-boot_2011.12.bb

diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0001-Revert-armv7-disable-L2-cache-in-cleanup_before_linu.patch b/recipes-bsp/u-boot/u-boot/2011.12/0001-Revert-armv7-disable-L2-cache-in-cleanup_before_linu.patch
new file mode 100644 (file)
index 0000000..ea94709
--- /dev/null
@@ -0,0 +1,25 @@
+From 9ac047a112d8c6fe25e71a78946dbe9d707abd98 Mon Sep 17 00:00:00 2001
+From: Philip Balister <philip@opensdr.com>
+Date: Mon, 16 Jan 2012 09:45:11 -0500
+Subject: [PATCH] Revert "armv7: disable L2 cache in cleanup_before_linux()"
+
+This reverts commit dc7100f4080952798413fb63bb4134b22c57623a.
+---
+ arch/arm/cpu/armv7/cpu.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
+index 662c496..091e3e0 100644
+--- a/arch/arm/cpu/armv7/cpu.c
++++ b/arch/arm/cpu/armv7/cpu.c
+@@ -65,7 +65,6 @@ int cleanup_before_linux(void)
+        * dcache_disable() in turn flushes the d-cache and disables MMU
+        */
+       dcache_disable();
+-      v7_outer_cache_disable();
+       /*
+        * After D-cache is flushed and before it is disabled there may
+-- 
+1.7.6.5
+
index 7554badc912bfb1e2f765d291b48efb4d2cd6edf..4e50edb3d33d8abcb9cf3c03d77a0f8ecda86f74 100644 (file)
@@ -6,11 +6,15 @@ UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img"
 UBOOT_SYMLINK = "u-boot-${MACHINE}.img"
 
 PV = "2011.12"
-PR = "r2"
+PR = "r3"
 
 # No patches for other machines yet
 COMPATIBLE_MACHINE = "(beagleboard|pandaboard|hawkboard|am3517-evm|am37x-evm|omap3evm)"
 
+# Non-omap4 platforms need outer cache turned on
+CACHEFIX = "file://2011.12/0001-Revert-armv7-disable-L2-cache-in-cleanup_before_linu.patch"
+CACHEFIX_omap4 = ""
+
 SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git \
            file://2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch \
            file://2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch \
@@ -19,6 +23,7 @@ SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git \
            file://2011.12/0005-omap4-common-use-ext4-by-default.patch \
            file://2011.12/U-Boot-OMAP-MMC-Add-delay-before-waiting-for-status.patch \
            file://0001-config-Always-use-GNU-ld.patch \
+           ${CACHEFIX} \
           "
 
 # v2011.12 tag