aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/kernel/cpu/sh4/probe.c5
-rw-r--r--arch/sh/mm/Kconfig12
2 files changed, 0 insertions, 17 deletions
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 3d3a3c4425a9..91e3677ae09d 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -199,11 +199,6 @@ int __init detect_cpu_and_cache_system(void)
199 break; 199 break;
200 } 200 }
201 201
202#ifdef CONFIG_SH_DIRECT_MAPPED
203 boot_cpu_data.icache.ways = 1;
204 boot_cpu_data.dcache.ways = 1;
205#endif
206
207#ifdef CONFIG_CPU_HAS_PTEA 202#ifdef CONFIG_CPU_HAS_PTEA
208 boot_cpu_data.flags |= CPU_HAS_PTEA; 203 boot_cpu_data.flags |= CPU_HAS_PTEA;
209#endif 204#endif
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 10c24356d2d5..d4079cab2d58 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -251,18 +251,6 @@ config SH7705_CACHE_32KB
251 depends on CPU_SUBTYPE_SH7705 251 depends on CPU_SUBTYPE_SH7705
252 default y 252 default y
253 253
254config SH_DIRECT_MAPPED
255 bool "Use direct-mapped caching"
256 default n
257 help
258 Selecting this option will configure the caches to be direct-mapped,
259 even if the cache supports a 2 or 4-way mode. This is useful primarily
260 for debugging on platforms with 2 and 4-way caches (SH7750R/SH7751R,
261 SH4-202, SH4-501, etc.)
262
263 Turn this option off for platforms that do not have a direct-mapped
264 cache, and you have no need to run the caches in such a configuration.
265
266choice 254choice
267 prompt "Cache mode" 255 prompt "Cache mode"
268 default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5 256 default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5