From: Gabor Juhos <juhosg@openwrt.org>
Date: Sun, 26 Aug 2007 13:09:11 +0000 (+0000)
Subject: make overriding of CPU features configurable, and enable it by default
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a2b4d75799a33d37b09d2ff1d954ec9a1aadac5b;p=openwrt%2Fstaging%2Fblocktrron.git

make overriding of CPU features configurable, and enable it by default

SVN-Revision: 8493
---

diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index c21fc4b114..593d98ce4f 100644
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -1,6 +1,7 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set
+CONFIG_ADM5120_CPU_OVERRIDES=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig b/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig
index 1e2270d461..7738d8175b 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig
@@ -2,6 +2,10 @@ if MIPS_ADM5120
 
 menu "ADM5120 Implementation Options"
 
+config ADM5120_CPU_OVERRIDES
+	bool "Enable CPU feature overrides"
+	default y
+
 config PCI_ADM5120
 	bool "Enable PCI support"
 	select PCI
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h b/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h
index 54c1edd61b..6216b864f5 100644
--- a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h
+++ b/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h
@@ -28,6 +28,8 @@
 #ifndef __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H
 
+#ifdef CONFIG_ADM5120_CPU_OVERRIDES
+
 /*
  * The ADM5120 SOC has a built-in MIPS 4Kc core.
  */
@@ -81,4 +83,7 @@
 #define cpu_dcache_line_size()		16
 #define cpu_icache_line_size()		16
 
+#endif  /* CONFIG_ADM5120_CPU_OVERRIDES */
+
+
 #endif /* __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H */
diff --git a/target/linux/adm5120eb-2.6/config/default b/target/linux/adm5120eb-2.6/config/default
index 05de7eee60..96c2974e0b 100644
--- a/target/linux/adm5120eb-2.6/config/default
+++ b/target/linux/adm5120eb-2.6/config/default
@@ -1,6 +1,7 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set
+CONFIG_ADM5120_CPU_OVERRIDES=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set