[adm5120] 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 c21fc4b1148a7cf7ee5af2cdcd70f4ac56037f81..593d98ce4f0b08ee4b56e50c66bba4c00b37dc77 100644 (file)
--- 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 1e2270d46195df2a4505cc6ef9e940a4f2d2d0eb..7738d8175b2449376da0780b2c123902914e6c81 100644 (file)
--- 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 54c1edd61b5ed478037e974a45df37b790261c71..6216b864f587f0346392fcec783ddaa3d4639c0e 100644 (file)
--- 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 05de7eee60461bdfe952309ce556cacf2cfa2662..96c2974e0bf03548a6763ecc0765974811bfe802 100644 (file)
--- 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