From e29429e1ebc4c627584223004c52477660f5ae92 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 15 Nov 2011 15:26:28 +1000
Subject: [PATCH] --- yaml --- r: 279710 b: refs/heads/master c:
 ec84118795fa687192de04e0dcb63178e4bf63e5 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/m68k/platform/coldfire/head.S | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6f1d41397911..408736ca69a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84f3fb7a2aadeda3c0a34e61591a8eccf5e367b4
+refs/heads/master: ec84118795fa687192de04e0dcb63178e4bf63e5
diff --git a/trunk/arch/m68k/platform/coldfire/head.S b/trunk/arch/m68k/platform/coldfire/head.S
index c33483824a2e..49666b4dd091 100644
--- a/trunk/arch/m68k/platform/coldfire/head.S
+++ b/trunk/arch/m68k/platform/coldfire/head.S
@@ -143,6 +143,9 @@ __HEAD
 _start:
 	nop					/* filler */
 	movew	#0x2700, %sr			/* no interrupts */
+	movel	#CACHE_INIT,%d0			/* disable cache */
+	movec	%d0,%CACR
+	nop
 #if defined(CONFIG_UBOOT)
 	movel	%sp,_init_sp			/* save initial stack pointer */
 #endif
@@ -176,9 +179,6 @@ _start:
 	 *	it is very similar. Define the exact settings in the headers
 	 *	then the code here is the same for all.
 	 */
-	movel	#CACHE_INIT,%d0			/* invalidate whole cache */
-	movec	%d0,%CACR
-	nop
 	movel	#ACR0_MODE,%d0			/* set RAM region for caching */
 	movec	%d0,%ACR0
 	movel	#ACR1_MODE,%d0			/* anything else to cache? */