x86: turn off CONFIG_X86_GENERIC for geos and net5501

CONFIG_X86_GENERIC obscures CONFIG_MGEODE_LX, etc. and causes it to use wrong cache-line size.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
SVN-Revision: 24071

diff --git a/target/linux/x86/geos/config-default b/target/linux/x86/geos/config-default
index 8d6e3aee6ad6a09435871ee526634e363875d96f..071f754906bbb1e6a79f7cfe6fc9ca44a5987fa9 100644 (file)
--- a/target/linux/x86/geos/config-default
+++ b/target/linux/x86/geos/config-default
@@ -20,6 +20,8 @@ CONFIG_PROCESSOR_SELECT=y
 # CONFIG_SERIO_LIBPS2 is not set
 CONFIG_X86_DEBUGCTLMSR=y
 # CONFIG_X86_DS is not set
 # CONFIG_SERIO_LIBPS2 is not set
 CONFIG_X86_DEBUGCTLMSR=y
 # CONFIG_X86_DS is not set

+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5

 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_3DNOW=y

diff --git a/target/linux/x86/net5501/config-default b/target/linux/x86/net5501/config-default
index 77f6337741a66aa2dab4980ae9c1cc13bed833cf..173602794b7daaa37391fa83949b252cbf234b44 100644 (file)
--- a/target/linux/x86/net5501/config-default
+++ b/target/linux/x86/net5501/config-default
@@ -34,8 +34,9 @@ CONFIG_SCSI_MOD=y
 # CONFIG_TINY_RCU is not set
 CONFIG_X86_CMOV=y
 CONFIG_X86_DEBUGCTLMSR=y
 # CONFIG_TINY_RCU is not set
 CONFIG_X86_CMOV=y
 CONFIG_X86_DEBUGCTLMSR=y

-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5
+CONFIG_X86_L1_CACHE_SHIFT=5

 CONFIG_X86_TSC=y
 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y