summaryrefslogtreecommitdiff
path: root/arch/arm/lib
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-01-26 06:42:40 -0500
committerTom Rini <trini@ti.com>2015-01-26 06:42:40 -0500
commitaed03faa064cca56847571b13cbd4c849c6116aa (patch)
treecb136b3bd51851e1fd107c16a5744c8a775df29f /arch/arm/lib
parent306df2c8241bd363c71a99841630fb5e85d81fae (diff)
parent52305a829cd927aca2eb4a15985c567e98f562b9 (diff)
downloadu-boot-imx-aed03faa064cca56847571b13cbd4c849c6116aa.zip
u-boot-imx-aed03faa064cca56847571b13cbd4c849c6116aa.tar.gz
u-boot-imx-aed03faa064cca56847571b13cbd4c849c6116aa.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch/arm/lib')
-rw-r--r--arch/arm/lib/cache.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index 9cedeac..74cfde6 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -25,10 +25,12 @@ __weak void flush_cache(unsigned long start, unsigned long size)
#endif /* CONFIG_CPU_ARM1136 */
#ifdef CONFIG_CPU_ARM926EJS
+#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
/* test and clean, page 2-23 of arm926ejs manual */
asm("0: mrc p15, 0, r15, c7, c10, 3\n\t" "bne 0b\n" : : : "memory");
/* disable write buffer as well (page 2-22) */
asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
+#endif
#endif /* CONFIG_CPU_ARM926EJS */
return;
}