ia64/xen-unstable

changeset 2123:c43fdad0eca0

bitkeeper revision 1.1159.1.13 (411741a3BEQR1OU0KjkBd6_-F2KuEw)

Clean up 2.6 processor config.
author kaf24@scramble.cl.cam.ac.uk
date Mon Aug 09 09:19:31 2004 +0000 (2004-08-09)
parents eb5e0b2dcb3e
children 513263463666
files linux-2.6.7-xen-sparse/arch/xen/i386/Kconfig
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/Kconfig	Sun Aug 08 20:25:07 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/Kconfig	Mon Aug 09 09:19:31 2004 +0000
     1.3 @@ -29,69 +29,69 @@ choice
     1.4  	prompt "Processor family"
     1.5  	default M686
     1.6  
     1.7 -config M386
     1.8 -	bool "386"
     1.9 -	---help---
    1.10 -	  This is the processor type of your CPU. This information is used for
    1.11 -	  optimizing purposes. In order to compile a kernel that can run on
    1.12 -	  all x86 CPU types (albeit not optimally fast), you can specify
    1.13 -	  "386" here.
    1.14 -
    1.15 -	  The kernel will not necessarily run on earlier architectures than
    1.16 -	  the one you have chosen, e.g. a Pentium optimized kernel will run on
    1.17 -	  a PPro, but not necessarily on a i486.
    1.18 +#config M386
    1.19 +#	bool "386"
    1.20 +#	---help---
    1.21 +#	  This is the processor type of your CPU. This information is used for
    1.22 +#	  optimizing purposes. In order to compile a kernel that can run on
    1.23 +#	  all x86 CPU types (albeit not optimally fast), you can specify
    1.24 +#	  "386" here.
    1.25 +#
    1.26 +#	  The kernel will not necessarily run on earlier architectures than
    1.27 +#	  the one you have chosen, e.g. a Pentium optimized kernel will run on
    1.28 +#	  a PPro, but not necessarily on a i486.
    1.29 +#
    1.30 +#	  Here are the settings recommended for greatest speed:
    1.31 +#	  - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
    1.32 +#	  486DLC/DLC2, UMC 486SX-S and NexGen Nx586.  Only "386" kernels
    1.33 +#	  will run on a 386 class machine.
    1.34 +#	  - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
    1.35 +#	  SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
    1.36 +#	  - "586" for generic Pentium CPUs lacking the TSC
    1.37 +#	  (time stamp counter) register.
    1.38 +#	  - "Pentium-Classic" for the Intel Pentium.
    1.39 +#	  - "Pentium-MMX" for the Intel Pentium MMX.
    1.40 +#	  - "Pentium-Pro" for the Intel Pentium Pro.
    1.41 +#	  - "Pentium-II" for the Intel Pentium II or pre-Coppermine Celeron.
    1.42 +#	  - "Pentium-III" for the Intel Pentium III or Coppermine Celeron.
    1.43 +#	  - "Pentium-4" for the Intel Pentium 4 or P4-based Celeron.
    1.44 +#	  - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
    1.45 +#	  - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
    1.46 +#	  - "Crusoe" for the Transmeta Crusoe series.
    1.47 +#	  - "Winchip-C6" for original IDT Winchip.
    1.48 +#	  - "Winchip-2" for IDT Winchip 2.
    1.49 +#	  - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
    1.50 +#	  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
    1.51 +#	  - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above).
    1.52 +#
    1.53 +#	  If you don't know what to do, choose "386".
    1.54  
    1.55 -	  Here are the settings recommended for greatest speed:
    1.56 -	  - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
    1.57 -	  486DLC/DLC2, UMC 486SX-S and NexGen Nx586.  Only "386" kernels
    1.58 -	  will run on a 386 class machine.
    1.59 -	  - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
    1.60 -	  SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
    1.61 -	  - "586" for generic Pentium CPUs lacking the TSC
    1.62 -	  (time stamp counter) register.
    1.63 -	  - "Pentium-Classic" for the Intel Pentium.
    1.64 -	  - "Pentium-MMX" for the Intel Pentium MMX.
    1.65 -	  - "Pentium-Pro" for the Intel Pentium Pro.
    1.66 -	  - "Pentium-II" for the Intel Pentium II or pre-Coppermine Celeron.
    1.67 -	  - "Pentium-III" for the Intel Pentium III or Coppermine Celeron.
    1.68 -	  - "Pentium-4" for the Intel Pentium 4 or P4-based Celeron.
    1.69 -	  - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
    1.70 -	  - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
    1.71 -	  - "Crusoe" for the Transmeta Crusoe series.
    1.72 -	  - "Winchip-C6" for original IDT Winchip.
    1.73 -	  - "Winchip-2" for IDT Winchip 2.
    1.74 -	  - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
    1.75 -	  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
    1.76 -	  - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above).
    1.77 -
    1.78 -	  If you don't know what to do, choose "386".
    1.79 +#config M486
    1.80 +#	bool "486"
    1.81 +#	help
    1.82 +#	  Select this for a 486 series processor, either Intel or one of the
    1.83 +#	  compatible processors from AMD, Cyrix, IBM, or Intel.  Includes DX,
    1.84 +#	  DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or
    1.85 +#	  U5S.
    1.86  
    1.87 -config M486
    1.88 -	bool "486"
    1.89 -	help
    1.90 -	  Select this for a 486 series processor, either Intel or one of the
    1.91 -	  compatible processors from AMD, Cyrix, IBM, or Intel.  Includes DX,
    1.92 -	  DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or
    1.93 -	  U5S.
    1.94 +#config M586
    1.95 +#	bool "586/K5/5x86/6x86/6x86MX"
    1.96 +#	help
    1.97 +#	  Select this for an 586 or 686 series processor such as the AMD K5,
    1.98 +#	  the Intel 5x86 or 6x86, or the Intel 6x86MX.  This choice does not
    1.99 +#	  assume the RDTSC (Read Time Stamp Counter) instruction.
   1.100  
   1.101 -config M586
   1.102 -	bool "586/K5/5x86/6x86/6x86MX"
   1.103 -	help
   1.104 -	  Select this for an 586 or 686 series processor such as the AMD K5,
   1.105 -	  the Intel 5x86 or 6x86, or the Intel 6x86MX.  This choice does not
   1.106 -	  assume the RDTSC (Read Time Stamp Counter) instruction.
   1.107 +#config M586TSC
   1.108 +#	bool "Pentium-Classic"
   1.109 +#	help
   1.110 +#	  Select this for a Pentium Classic processor with the RDTSC (Read
   1.111 +#	  Time Stamp Counter) instruction for benchmarking.
   1.112  
   1.113 -config M586TSC
   1.114 -	bool "Pentium-Classic"
   1.115 -	help
   1.116 -	  Select this for a Pentium Classic processor with the RDTSC (Read
   1.117 -	  Time Stamp Counter) instruction for benchmarking.
   1.118 -
   1.119 -config M586MMX
   1.120 -	bool "Pentium-MMX"
   1.121 -	help
   1.122 -	  Select this for a Pentium with the MMX graphics/multimedia
   1.123 -	  extended instructions.
   1.124 +#config M586MMX
   1.125 +#	bool "Pentium-MMX"
   1.126 +#	help
   1.127 +#	  Select this for a Pentium with the MMX graphics/multimedia
   1.128 +#	  extended instructions.
   1.129  
   1.130  config M686
   1.131  	bool "Pentium-Pro"
   1.132 @@ -160,28 +160,28 @@ config MCRUSOE
   1.133  	  like a 586 with TSC, and sets some GCC optimization flags (like a
   1.134  	  Pentium Pro with no alignment requirements).
   1.135  
   1.136 -config MWINCHIPC6
   1.137 -	bool "Winchip-C6"
   1.138 -	help
   1.139 -	  Select this for an IDT Winchip C6 chip.  Linux and GCC
   1.140 -	  treat this chip as a 586TSC with some extended instructions
   1.141 -	  and alignment requirements.
   1.142 +#config MWINCHIPC6
   1.143 +#	bool "Winchip-C6"
   1.144 +#	help
   1.145 +#	  Select this for an IDT Winchip C6 chip.  Linux and GCC
   1.146 +#	  treat this chip as a 586TSC with some extended instructions
   1.147 +#	  and alignment requirements.
   1.148  
   1.149 -config MWINCHIP2
   1.150 -	bool "Winchip-2"
   1.151 -	help
   1.152 -	  Select this for an IDT Winchip-2.  Linux and GCC
   1.153 -	  treat this chip as a 586TSC with some extended instructions
   1.154 -	  and alignment requirements.
   1.155 +#config MWINCHIP2
   1.156 +#	bool "Winchip-2"
   1.157 +#	help
   1.158 +#	  Select this for an IDT Winchip-2.  Linux and GCC
   1.159 +#	  treat this chip as a 586TSC with some extended instructions
   1.160 +#	  and alignment requirements.
   1.161  
   1.162 -config MWINCHIP3D
   1.163 -	bool "Winchip-2A/Winchip-3"
   1.164 -	help
   1.165 -	  Select this for an IDT Winchip-2A or 3.  Linux and GCC
   1.166 -	  treat this chip as a 586TSC with some extended instructions
   1.167 -	  and alignment reqirements.  Also enable out of order memory
   1.168 -	  stores for this CPU, which can increase performance of some
   1.169 -	  operations.
   1.170 +#config MWINCHIP3D
   1.171 +#	bool "Winchip-2A/Winchip-3"
   1.172 +#	help
   1.173 +#	  Select this for an IDT Winchip-2A or 3.  Linux and GCC
   1.174 +#	  treat this chip as a 586TSC with some extended instructions
   1.175 +#	  and alignment reqirements.  Also enable out of order memory
   1.176 +#	  stores for this CPU, which can increase performance of some
   1.177 +#	  operations.
   1.178  
   1.179  config MCYRIXIII
   1.180  	bool "CyrixIII/VIA-C3"
   1.181 @@ -305,47 +305,53 @@ config X86_OOSTORE
   1.182  	default y
   1.183  
   1.184  config HPET_TIMER
   1.185 -	bool "HPET Timer Support"
   1.186 -	help
   1.187 -	  This enables the use of the HPET for the kernel's internal timer.
   1.188 -	  HPET is the next generation timer replacing legacy 8254s.
   1.189 -	  You can safely choose Y here.  However, HPET will only be
   1.190 -	  activated if the platform and the BIOS support this feature.
   1.191 -	  Otherwise the 8254 will be used for timing services.
   1.192 -
   1.193 -	  Choose N to continue using the legacy 8254 timer.
   1.194 +	bool
   1.195 +	default n
   1.196 +#config HPET_TIMER
   1.197 +#	bool "HPET Timer Support"
   1.198 +#	help
   1.199 +#	  This enables the use of the HPET for the kernel's internal timer.
   1.200 +#	  HPET is the next generation timer replacing legacy 8254s.
   1.201 +#	  You can safely choose Y here.  However, HPET will only be
   1.202 +#	  activated if the platform and the BIOS support this feature.
   1.203 +#	  Otherwise the 8254 will be used for timing services.
   1.204 +#
   1.205 +#	  Choose N to continue using the legacy 8254 timer.
   1.206  
   1.207  config HPET_EMULATE_RTC
   1.208  	def_bool HPET_TIMER && RTC=y
   1.209  
   1.210  config SMP
   1.211 -	bool "Symmetric multi-processing support"
   1.212 -	---help---
   1.213 -	  This enables support for systems with more than one CPU. If you have
   1.214 -	  a system with only one CPU, like most personal computers, say N. If
   1.215 -	  you have a system with more than one CPU, say Y.
   1.216 -
   1.217 -	  If you say N here, the kernel will run on single and multiprocessor
   1.218 -	  machines, but will use only one CPU of a multiprocessor machine. If
   1.219 -	  you say Y here, the kernel will run on many, but not all,
   1.220 -	  singleprocessor machines. On a singleprocessor machine, the kernel
   1.221 -	  will run faster if you say N here.
   1.222 -
   1.223 -	  Note that if you say Y here and choose architecture "586" or
   1.224 -	  "Pentium" under "Processor family", the kernel will not work on 486
   1.225 -	  architectures. Similarly, multiprocessor kernels for the "PPro"
   1.226 -	  architecture may not work on all Pentium based boards.
   1.227 -
   1.228 -	  People using multiprocessor machines who say Y here should also say
   1.229 -	  Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
   1.230 -	  Management" code will be disabled if you say Y here.
   1.231 -
   1.232 -	  See also the <file:Documentation/smp.txt>,
   1.233 -	  <file:Documentation/i386/IO-APIC.txt>,
   1.234 -	  <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
   1.235 -	  <http://www.tldp.org/docs.html#howto>.
   1.236 -
   1.237 -	  If you don't know what to do here, say N.
   1.238 +	bool
   1.239 +	default n
   1.240 +#config SMP
   1.241 +#	bool "Symmetric multi-processing support"
   1.242 +#	---help---
   1.243 +#	  This enables support for systems with more than one CPU. If you have
   1.244 +#	  a system with only one CPU, like most personal computers, say N. If
   1.245 +#	  you have a system with more than one CPU, say Y.
   1.246 +#
   1.247 +#	  If you say N here, the kernel will run on single and multiprocessor
   1.248 +#	  machines, but will use only one CPU of a multiprocessor machine. If
   1.249 +#	  you say Y here, the kernel will run on many, but not all,
   1.250 +#	  singleprocessor machines. On a singleprocessor machine, the kernel
   1.251 +#	  will run faster if you say N here.
   1.252 +#
   1.253 +#	  Note that if you say Y here and choose architecture "586" or
   1.254 +#	  "Pentium" under "Processor family", the kernel will not work on 486
   1.255 +#	  architectures. Similarly, multiprocessor kernels for the "PPro"
   1.256 +#	  architecture may not work on all Pentium based boards.
   1.257 +#
   1.258 +#	  People using multiprocessor machines who say Y here should also say
   1.259 +#	  Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
   1.260 +#	  Management" code will be disabled if you say Y here.
   1.261 +#
   1.262 +#	  See also the <file:Documentation/smp.txt>,
   1.263 +#	  <file:Documentation/i386/IO-APIC.txt>,
   1.264 +#	  <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
   1.265 +#	  <http://www.tldp.org/docs.html#howto>.
   1.266 +#
   1.267 +#	  If you don't know what to do here, say N.
   1.268  
   1.269  config NR_CPUS
   1.270  	int "Maximum number of CPUs (2-255)"
   1.271 @@ -507,11 +513,11 @@ config HIGHMEM4G
   1.272  	  Select this if you have a 32-bit processor and between 1 and 4
   1.273  	  gigabytes of physical RAM.
   1.274  
   1.275 -config HIGHMEM64G
   1.276 -	bool "64GB"
   1.277 -	help
   1.278 -	  Select this if you have a 32-bit processor and more than 4
   1.279 -	  gigabytes of physical RAM.
   1.280 +#config HIGHMEM64G
   1.281 +#	bool "64GB"
   1.282 +#	help
   1.283 +#	  Select this if you have a 32-bit processor and more than 4
   1.284 +#	  gigabytes of physical RAM.
   1.285  
   1.286  endchoice
   1.287