summaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2008-02-01 17:38:24 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-01 21:00:01 +1100
commitb7dcf7fe7c3060db38fc625efffad5965a5c6d8a (patch)
tree5d72dc3cd8cc062e7dfdeb8750da524f1b570f34 /include/asm-m68knommu
parent9f69ba86d66297189916ceae401fe0944a207714 (diff)
downloadop-kernel-dev-b7dcf7fe7c3060db38fc625efffad5965a5c6d8a.zip
op-kernel-dev-b7dcf7fe7c3060db38fc625efffad5965a5c6d8a.tar.gz
m68knommu: fix 528x ColdFire cache settings
Fix problems with the 528x ColdFire CPU cache setup. Do not cache the flash region (if present), and make the runtime settings consistent with the init setting. Problems pointed out by Bernd Buttner <b.buettner@mkc-gmbh.de> Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-m68knommu')
-rw-r--r--include/asm-m68knommu/cacheflush.h2
-rw-r--r--include/asm-m68knommu/mcfcache.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-m68knommu/cacheflush.h b/include/asm-m68knommu/cacheflush.h
index 163dcb1..29bc0aa 100644
--- a/include/asm-m68knommu/cacheflush.h
+++ b/include/asm-m68knommu/cacheflush.h
@@ -53,7 +53,7 @@ static inline void __flush_cache_all(void)
#endif /* CONFIG_M5407 */
#if defined(CONFIG_M527x) || defined(CONFIG_M528x)
__asm__ __volatile__ (
- "movel #0x81400100, %%d0\n\t"
+ "movel #0x81000200, %%d0\n\t"
"movec %%d0, %%CACR\n\t"
"nop\n\t"
: : : "d0" );
diff --git a/include/asm-m68knommu/mcfcache.h b/include/asm-m68knommu/mcfcache.h
index 7b61a8a..c042634 100644
--- a/include/asm-m68knommu/mcfcache.h
+++ b/include/asm-m68knommu/mcfcache.h
@@ -60,7 +60,7 @@
nop
movel #0x0000c020, %d0 /* Set SDRAM cached only */
movec %d0, %ACR0
- movel #0xff00c000, %d0 /* Cache Flash also */
+ movel #0x00000000, %d0 /* No other regions cached */
movec %d0, %ACR1
movel #0x80000200, %d0 /* Setup cache mask */
movec %d0, %CACR /* Enable cache */
OpenPOWER on IntegriCloud