Title: [6877] branches/2009R1/arch/blackfin: Fix bug[#5287] Remove redundant CONFIG_BFIN_L2_DCACHE
- Revision
- 6877
- Author
- sonicz
- Date
- 2009-06-30 04:54:40 -0500 (Tue, 30 Jun 2009)
Log Message
Fix bug[#5287] Remove redundant CONFIG_BFIN_L2_DCACHE
Modified Paths
Diff
Modified: branches/2009R1/arch/blackfin/Kconfig (6876 => 6877)
--- branches/2009R1/arch/blackfin/Kconfig 2009-06-30 09:48:03 UTC (rev 6876)
+++ branches/2009R1/arch/blackfin/Kconfig 2009-06-30 09:54:40 UTC (rev 6877)
@@ -962,6 +962,7 @@
endchoice
config BFIN_L2_DCACHE
+ depends on BFIN_DCACHE
depends on (BF54x || BF561) && !SMP
bool "Enable L2 DCACHE"
choice
Modified: branches/2009R1/arch/blackfin/include/asm/cacheflush.h (6876 => 6877)
--- branches/2009R1/arch/blackfin/include/asm/cacheflush.h 2009-06-30 09:48:03 UTC (rev 6876)
+++ branches/2009R1/arch/blackfin/include/asm/cacheflush.h 2009-06-30 09:54:40 UTC (rev 6877)
@@ -90,7 +90,7 @@
#define copy_from_user_page(vma, page, vaddr, dst, src, len) memcpy(dst, src, len)
-#if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_L2_DCACHE)
+#if defined(CONFIG_BFIN_DCACHE)
# define invalidate_dcache_range(start,end) blackfin_dcache_invalidate_range((start), (end))
#else
# define invalidate_dcache_range(start,end) do { } while (0)
Modified: branches/2009R1/arch/blackfin/kernel/cplb-nompu/cacheinit.c (6876 => 6877)
--- branches/2009R1/arch/blackfin/kernel/cplb-nompu/cacheinit.c 2009-06-30 09:48:03 UTC (rev 6876)
+++ branches/2009R1/arch/blackfin/kernel/cplb-nompu/cacheinit.c 2009-06-30 09:54:40 UTC (rev 6877)
@@ -42,7 +42,7 @@
}
#endif
-#if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_L2_DCACHE)
+#if defined(CONFIG_BFIN_DCACHE)
void __cpuinit bfin_dcache_init(struct cplb_entry *dcplb_tbl)
{
unsigned long ctrl;
Modified: branches/2009R1/arch/blackfin/kernel/setup.c (6876 => 6877)
--- branches/2009R1/arch/blackfin/kernel/setup.c 2009-06-30 09:48:03 UTC (rev 6876)
+++ branches/2009R1/arch/blackfin/kernel/setup.c 2009-06-30 09:54:40 UTC (rev 6877)
@@ -83,7 +83,7 @@
static int early_init_clkin_hz(char *buf);
-#if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_ICACHE) || defined(CONFIG_BFIN_L2_DCACHE)
+#if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_ICACHE)
void __init generate_cplb_tables(void)
{
unsigned int cpu;
@@ -101,7 +101,7 @@
bfin_icache_init(icplb_tbl[cpu]);
#endif
-#if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_L2_DCACHE)
+#if defined(CONFIG_BFIN_DCACHE)
bfin_dcache_init(dcplb_tbl[cpu]);
#endif
@@ -146,7 +146,7 @@
void __init bfin_cache_init(void)
{
-#if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_ICACHE) || defined(CONFIG_BFIN_L2_DCACHE)
+#if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_ICACHE)
generate_cplb_tables();
#endif
bfin_setup_caches(0);
Modified: branches/2009R1/arch/blackfin/mach-common/arch_checks.c (6876 => 6877)
--- branches/2009R1/arch/blackfin/mach-common/arch_checks.c 2009-06-30 09:48:03 UTC (rev 6876)
+++ branches/2009R1/arch/blackfin/mach-common/arch_checks.c 2009-06-30 09:54:40 UTC (rev 6877)
@@ -74,7 +74,7 @@
/* if 220 exists, can not set External Memory WB and L2 not_cached, either External Memory not_cached and L2 WB */
#if ANOMALY_05000220 && \
- ((defined(CONFIG_BFIN_WB) && !defined(CONFIG_BFIN_L2_DCACHED)) || \
+ ((defined(CONFIG_BFIN_WB) && !defined(CONFIG_BFIN_L2_DCACHE)) || \
(!defined(CONFIG_BFIN_DCACHE) && defined(CONFIG_BFIN_L2_WB)))
# error You are exposing Anomaly 220 in this config, either config L2 as Write Through, or make External Memory WB.
#endif
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
