diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-20 13:49:15 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-23 09:39:54 +0100 |
commit | 294c589cd748ef627a39840bc216bfe7f11e32c7 (patch) | |
tree | 96b92179c2db81aec90ae8ab9630cd62b3b1afff /recipes-bsp | |
parent | 3b9c2d238b95f0f6e9da1036dc19daccdd152ad6 (diff) | |
download | meta-ti-294c589cd748ef627a39840bc216bfe7f11e32c7.tar.gz |
u-boot 2011.12: fix L2 cache on non-omap4 platforms
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Acked-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'recipes-bsp')
-rw-r--r-- | recipes-bsp/u-boot/u-boot/2011.12/0001-Revert-armv7-disable-L2-cache-in-cleanup_before_linu.patch | 25 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot_2011.12.bb | 7 |
2 files changed, 31 insertions, 1 deletions
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 index 00000000..ea947099 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0001-Revert-armv7-disable-L2-cache-in-cleanup_before_linu.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 9ac047a112d8c6fe25e71a78946dbe9d707abd98 Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Balister <philip@opensdr.com> | ||
3 | Date: Mon, 16 Jan 2012 09:45:11 -0500 | ||
4 | Subject: [PATCH] Revert "armv7: disable L2 cache in cleanup_before_linux()" | ||
5 | |||
6 | This reverts commit dc7100f4080952798413fb63bb4134b22c57623a. | ||
7 | --- | ||
8 | arch/arm/cpu/armv7/cpu.c | 1 - | ||
9 | 1 files changed, 0 insertions(+), 1 deletions(-) | ||
10 | |||
11 | diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c | ||
12 | index 662c496..091e3e0 100644 | ||
13 | --- a/arch/arm/cpu/armv7/cpu.c | ||
14 | +++ b/arch/arm/cpu/armv7/cpu.c | ||
15 | @@ -65,7 +65,6 @@ int cleanup_before_linux(void) | ||
16 | * dcache_disable() in turn flushes the d-cache and disables MMU | ||
17 | */ | ||
18 | dcache_disable(); | ||
19 | - v7_outer_cache_disable(); | ||
20 | |||
21 | /* | ||
22 | * After D-cache is flushed and before it is disabled there may | ||
23 | -- | ||
24 | 1.7.6.5 | ||
25 | |||
diff --git a/recipes-bsp/u-boot/u-boot_2011.12.bb b/recipes-bsp/u-boot/u-boot_2011.12.bb index 7554badc..4e50edb3 100644 --- a/recipes-bsp/u-boot/u-boot_2011.12.bb +++ b/recipes-bsp/u-boot/u-boot_2011.12.bb | |||
@@ -6,11 +6,15 @@ UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img" | |||
6 | UBOOT_SYMLINK = "u-boot-${MACHINE}.img" | 6 | UBOOT_SYMLINK = "u-boot-${MACHINE}.img" |
7 | 7 | ||
8 | PV = "2011.12" | 8 | PV = "2011.12" |
9 | PR = "r2" | 9 | PR = "r3" |
10 | 10 | ||
11 | # No patches for other machines yet | 11 | # No patches for other machines yet |
12 | COMPATIBLE_MACHINE = "(beagleboard|pandaboard|hawkboard|am3517-evm|am37x-evm|omap3evm)" | 12 | COMPATIBLE_MACHINE = "(beagleboard|pandaboard|hawkboard|am3517-evm|am37x-evm|omap3evm)" |
13 | 13 | ||
14 | # Non-omap4 platforms need outer cache turned on | ||
15 | CACHEFIX = "file://2011.12/0001-Revert-armv7-disable-L2-cache-in-cleanup_before_linu.patch" | ||
16 | CACHEFIX_omap4 = "" | ||
17 | |||
14 | SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git \ | 18 | SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git \ |
15 | file://2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch \ | 19 | file://2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch \ |
16 | file://2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch \ | 20 | 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 \ | |||
19 | file://2011.12/0005-omap4-common-use-ext4-by-default.patch \ | 23 | file://2011.12/0005-omap4-common-use-ext4-by-default.patch \ |
20 | file://2011.12/U-Boot-OMAP-MMC-Add-delay-before-waiting-for-status.patch \ | 24 | file://2011.12/U-Boot-OMAP-MMC-Add-delay-before-waiting-for-status.patch \ |
21 | file://0001-config-Always-use-GNU-ld.patch \ | 25 | file://0001-config-Always-use-GNU-ld.patch \ |
26 | ${CACHEFIX} \ | ||
22 | " | 27 | " |
23 | 28 | ||
24 | # v2011.12 tag | 29 | # v2011.12 tag |