From 9527207acdb78b8702382866a0d06c42c6842ee7 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 2 Apr 2009 17:40:16 +0900 Subject: [PATCH] --- yaml --- r: 141825 b: refs/heads/master c: e8208828dc014dc0193dc5558995556df0fbe3a5 h: refs/heads/master i: 141823: 42eb9640b7616b14e924da5a36778846a495f571 v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/sh4/probe.c | 5 ----- trunk/arch/sh/mm/Kconfig | 12 ------------ 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index f8ee327bf662..44c2487533f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e869a90ee1235a4f89ecb956e7b7d724d65217c8 +refs/heads/master: e8208828dc014dc0193dc5558995556df0fbe3a5 diff --git a/trunk/arch/sh/kernel/cpu/sh4/probe.c b/trunk/arch/sh/kernel/cpu/sh4/probe.c index 3d3a3c4425a9..91e3677ae09d 100644 --- a/trunk/arch/sh/kernel/cpu/sh4/probe.c +++ b/trunk/arch/sh/kernel/cpu/sh4/probe.c @@ -199,11 +199,6 @@ int __init detect_cpu_and_cache_system(void) break; } -#ifdef CONFIG_SH_DIRECT_MAPPED - boot_cpu_data.icache.ways = 1; - boot_cpu_data.dcache.ways = 1; -#endif - #ifdef CONFIG_CPU_HAS_PTEA boot_cpu_data.flags |= CPU_HAS_PTEA; #endif diff --git a/trunk/arch/sh/mm/Kconfig b/trunk/arch/sh/mm/Kconfig index 10c24356d2d5..d4079cab2d58 100644 --- a/trunk/arch/sh/mm/Kconfig +++ b/trunk/arch/sh/mm/Kconfig @@ -251,18 +251,6 @@ config SH7705_CACHE_32KB depends on CPU_SUBTYPE_SH7705 default y -config SH_DIRECT_MAPPED - bool "Use direct-mapped caching" - default n - help - Selecting this option will configure the caches to be direct-mapped, - even if the cache supports a 2 or 4-way mode. This is useful primarily - for debugging on platforms with 2 and 4-way caches (SH7750R/SH7751R, - SH4-202, SH4-501, etc.) - - Turn this option off for platforms that do not have a direct-mapped - cache, and you have no need to run the caches in such a configuration. - choice prompt "Cache mode" default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5