sh: Support explicit L1 cache disabling.

This reworks the cache mode configuration in Kconfig, and allows for
explicit selection of write-back/write-through/off configurations.
All of the cache flushing routines are optimized away for the off
case.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 7 insertions, 4 deletions

diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index 9172e97dc26a..fdc245b7b043 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -143,12 +143,15 @@ static void __init cache_init(void)
                 flags &= ~CCR_CACHE_EMODE;
 #endif
 
-#ifdef CONFIG_SH_WRITETHROUGH
-        /* Turn on Write-through caching */
+#if defined(CONFIG_CACHE_WRITETHROUGH)
+        /* Write-through */
         flags |= CCR_CACHE_WT;
-#else
-        /* .. or default to Write-back */
+#elif defined(CONFIG_CACHE_WRITEBACK)
+        /* Write-back */
         flags |= CCR_CACHE_CB;
+#else
+        /* Off */
+        flags &= ~CCR_CACHE_ENABLE;
 #endif
 
         ctrl_outl(flags, CCR);