summaryrefslogtreecommitdiffstats
path: root/arch/arm/lib
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-11-06 14:59:36 +0900
committerTom Rini <trini@ti.com>2014-11-20 11:28:25 -0500
commit5d7b131d41d8a8fb50edf27d945703e757ed8357 (patch)
treeafe5ad3bf85e7a274b360ac951c85f83c5332a89 /arch/arm/lib
parentf2168440de74036b207a6626c7a9fd9d164951df (diff)
downloadtalos-obmc-uboot-5d7b131d41d8a8fb50edf27d945703e757ed8357.tar.gz
talos-obmc-uboot-5d7b131d41d8a8fb50edf27d945703e757ed8357.zip
ARM: remove CONFIG_ARM926EJS defines
CONFIG_CPU_ARM926EJS was introduced into Kconfig by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs). This commit removes all the defines of CONFIG_ARM926EJS and replaces the only reference in arch/arm/lib/cache.c with CONFIG_CPU_ARM926EJS. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/lib')
-rw-r--r--arch/arm/lib/cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index 4e597a4c1d..d0863dac23 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -23,12 +23,12 @@ __weak void flush_cache(unsigned long start, unsigned long size)
#endif /* CONFIG_ARM1136 */
-#ifdef CONFIG_ARM926EJS
+#ifdef CONFIG_CPU_ARM926EJS
/* 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 /* CONFIG_ARM926EJS */
+#endif /* CONFIG_CPU_ARM926EJS */
return;
}
OpenPOWER on IntegriCloud