Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[u-boot] / arch / arm / cpu / armv7 / cpu.c

diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
index 0b0e5003cc3c390e9cb86fe13d8426e5840ae731..6eac5ef3fe0049f5f41d11c1762f2a299527398d 100644 (file)
--- a/arch/arm/cpu/armv7/cpu.c
+++ b/arch/arm/cpu/armv7/cpu.c
@@ -36,12 +36,6 @@ int cleanup_before_linux_select(int flags)
        disable_interrupts();
 #endif
 
-       /*
-        * Turn off I-cache and invalidate it
-        */
-       icache_disable();
-       invalidate_icache_all();
-
        if (flags & CBL_DISABLE_CACHES) {
                /*
                * turn off D-cache
@@ -61,7 +55,16 @@ int cleanup_before_linux_select(int flags)
                * to avoid coherency problems for kernel
                */
                invalidate_dcache_all();
+
+               icache_disable();
+               invalidate_icache_all();
        } else {
+               /*
+                * Turn off I-cache and invalidate it
+                */
+               icache_disable();
+               invalidate_icache_all();
+
                flush_dcache_all();
                invalidate_icache_all();
                icache_enable();