patch-2.4.0-test1 linux/arch/i386/config.in

• Lines: 64
• Date: Thu May 25 09:35:10 2000
• Orig file: v2.3.99-pre9/linux/arch/i386/config.in
• Orig date: Tue May 23 15:31:33 2000

diff -u --recursive --new-file v2.3.99-pre9/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -18,13 +18,15 @@
 mainmenu_option next_comment
 comment 'Processor type and features'
 choice 'Processor family' \
-	"386			CONFIG_M386	\
-	 486/Cx486		CONFIG_M486	\
-	 586/K5/5x86/6x86/6x86MX	CONFIG_M586	\
-	 Pentium/TSC		CONFIG_M586TSC	\
-	 PPro/P-II/P-III	CONFIG_M686 \
-	 K6/II/III		CONFIG_MK6 \
-	 Athlon                 CONFIG_MK7" PPro
+	"386				CONFIG_M386 \
+	 486/Cx486			CONFIG_M486 \
+	 586/K5/5x86/6x86/6x86MX	CONFIG_M586 \
+	 Pentium/TSC			CONFIG_M586TSC \
+	 PPro/Pentium-II		CONFIG_M686 \
+	 Pentium-III			CONFIG_M686FX \
+	 K6/K6-II/K6-III		CONFIG_MK6 \
+	 Athlon				CONFIG_MK7 \
+	 Crusoe				CONFIG_MCRUSOE" PPro
 #
 # Define implied options from the CPU selection here
 #
@@ -60,6 +62,14 @@
    define_bool CONFIG_X86_PGE y
    define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
 fi
+if [ "$CONFIG_M686FX" = "y" ]; then
+   define_int  CONFIG_X86_L1_CACHE_BYTES 32
+   define_bool CONFIG_X86_TSC y
+   define_bool CONFIG_X86_GOOD_APIC y
+   define_bool CONFIG_X86_PGE y
+   define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
+   define_bool CONFIG_X86_FX y
+fi
 if [ "$CONFIG_MK6" = "y" ]; then
    define_int  CONFIG_X86_L1_CACHE_BYTES 32
    define_bool CONFIG_X86_ALIGNMENT_16 y
@@ -74,8 +84,14 @@
    define_bool CONFIG_X86_PGE y
    define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
 fi
+if [ "$CONFIG_MCRUSOE" = "y" ]; then
+   define_int  CONFIG_X86_L1_CACHE_BYTES 32
+   define_bool CONFIG_X86_TSC y
+fi
 
 tristate '/dev/cpu/microcode - Intel P6 CPU microcode support' CONFIG_MICROCODE
+tristate '/dev/cpu/*/msr - Model-specific register support' CONFIG_X86_MSR
+tristate '/dev/cpu/*/cpuid - CPU information support' CONFIG_X86_CPUID
 
 choice 'High Memory Support' \
 	"off    CONFIG_NOHIGHMEM \
@@ -89,7 +105,9 @@
    define_bool CONFIG_X86_PAE y
 fi
 
-bool 'Math emulation' CONFIG_MATH_EMULATION
+if [ "$CONFIG_X86_FX" != "y" ]; then
+   bool 'Math emulation' CONFIG_MATH_EMULATION
+fi
 bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR
 bool 'Symmetric multi-processing support' CONFIG_SMP
 if [ "$CONFIG_SMP" != "y" ]; then