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

• Lines: 85
• Date: Mon Jun 19 12:56:08 2000
• Orig file: v2.4.0-test1/linux/arch/i386/config.in
• Orig date: Mon Jun 19 16:31:57 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see the Configure script.
+# see Documentation/kbuild/config-language.txt.
 #
 mainmenu_name "Linux Kernel Configuration"
 
@@ -19,14 +19,17 @@
 comment 'Processor type and features'
 choice 'Processor family' \
 	"386				CONFIG_M386 \
-	 486/Cx486			CONFIG_M486 \
+	 486				CONFIG_M486 \
 	 586/K5/5x86/6x86/6x86MX	CONFIG_M586 \
-	 Pentium/TSC			CONFIG_M586TSC \
-	 PPro/Pentium-II		CONFIG_M686 \
-	 Pentium-III			CONFIG_M686FX \
+	 Pentium/Pentium-MMX		CONFIG_M586TSC \
+	 Pentium-Pro/Celeron/Pentium-II	CONFIG_M686 \
+	 Pentium-III			CONFIG_M686FXSR \
 	 K6/K6-II/K6-III		CONFIG_MK6 \
-	 Athlon				CONFIG_MK7 \
-	 Crusoe				CONFIG_MCRUSOE" PPro
+	 Athlon/K7			CONFIG_MK7 \
+	 Crusoe				CONFIG_MCRUSOE \
+	 Winchip-C6			CONFIG_MWINCHIPC6 \
+	 Winchip-2			CONFIG_MWINCHIP2 \
+	 Winchip-2A/3			CONFIG_MWINCHIP3D" Pentium-Pro
 #
 # Define implied options from the CPU selection here
 #
@@ -62,13 +65,16 @@
    define_bool CONFIG_X86_PGE y
    define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
 fi
-if [ "$CONFIG_M686FX" = "y" ]; then
+if [ "$CONFIG_M686FXSR" = "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
+   define_bool CONFIG_X86_FXSR y
+   define_bool CONFIG_X86_XMM y
+else
+   define_bool CONFIG_X86_FXSR n
 fi
 if [ "$CONFIG_MK6" = "y" ]; then
    define_int  CONFIG_X86_L1_CACHE_BYTES 32
@@ -88,6 +94,24 @@
    define_int  CONFIG_X86_L1_CACHE_BYTES 32
    define_bool CONFIG_X86_TSC y
 fi
+if [ "$CONFIG_MWINCHIPC6" = "y" ]; then
+   define_int  CONFIG_X86_L1_CACHE_BYTES 32
+   define_bool CONFIG_X86_ALIGNMENT_16 y
+   define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
+fi
+if [ "$CONFIG_MWINCHIP2" = "y" ]; then
+   define_int  CONFIG_X86_L1_CACHE_BYTES 32
+   define_bool CONFIG_X86_ALIGNMENT_16 y
+   define_bool CONFIG_X86_TSC y
+   define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
+fi
+if [ "$CONFIG_MWINCHIP3D" = "y" ]; then
+   define_int  CONFIG_X86_L1_CACHE_BYTES 32
+   define_bool CONFIG_X86_ALIGNMENT_16 y
+   define_bool CONFIG_X86_TSC y
+   define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
+   define_bool CONFIG_X86_USE_3DNOW y
+fi
 
 tristate '/dev/cpu/microcode - Intel P6 CPU microcode support' CONFIG_MICROCODE
 tristate '/dev/cpu/*/msr - Model-specific register support' CONFIG_X86_MSR
@@ -105,7 +129,7 @@
    define_bool CONFIG_X86_PAE y
 fi
 
-if [ "$CONFIG_X86_FX" != "y" ]; then
+if [ "$CONFIG_X86_FXSR" != "y" ]; then
    bool 'Math emulation' CONFIG_MATH_EMULATION
 fi
 bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR