summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/arm926ejs
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/cpu/arm926ejs
parent306df2c8241bd363c71a99841630fb5e85d81fae (diff)
parent52305a829cd927aca2eb4a15985c567e98f562b9 (diff)
downloadtalos-obmc-uboot-aed03faa064cca56847571b13cbd4c849c6116aa.tar.gz
talos-obmc-uboot-aed03faa064cca56847571b13cbd4c849c6116aa.zip
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
-rw-r--r--arch/arm/cpu/arm926ejs/cpu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c
index e37e87b68d..a90ce3047b 100644
--- a/arch/arm/cpu/arm926ejs/cpu.c
+++ b/arch/arm/cpu/arm926ejs/cpu.c
@@ -45,7 +45,9 @@ int cleanup_before_linux (void)
/* flush I/D-cache */
static void cache_flush (void)
{
+#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
unsigned long i = 0;
asm ("mcr p15, 0, %0, c7, c7, 0": :"r" (i));
+#endif
}
OpenPOWER on IntegriCloud