diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 10:21:53 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:20 -0500 |
commit | 8f9ca475c994e4d32f405183d07e8c7eedbdbdb4 (patch) | |
tree | 3c2bdf052b53f22cbac9d2b844acbde477fad0c6 /arch/x86/Kconfig.cpu | |
parent | 4f179d121885142fb907b64956228b369d495958 (diff) |
x86: clean up arch/x86/Kconfig*
- Consistent alignment of help text
- Use the ---help--- keyword everywhere consistently as a visual separator
- fix whitespace mismatches
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig.cpu')
-rw-r--r-- | arch/x86/Kconfig.cpu | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 085fef4d8660..a95eaf0e582a 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
@@ -50,7 +50,7 @@ config M386 | |||
50 | config M486 | 50 | config M486 |
51 | bool "486" | 51 | bool "486" |
52 | depends on X86_32 | 52 | depends on X86_32 |
53 | help | 53 | ---help--- |
54 | Select this for a 486 series processor, either Intel or one of the | 54 | Select this for a 486 series processor, either Intel or one of the |
55 | compatible processors from AMD, Cyrix, IBM, or Intel. Includes DX, | 55 | compatible processors from AMD, Cyrix, IBM, or Intel. Includes DX, |
56 | DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or | 56 | DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or |
@@ -59,7 +59,7 @@ config M486 | |||
59 | config M586 | 59 | config M586 |
60 | bool "586/K5/5x86/6x86/6x86MX" | 60 | bool "586/K5/5x86/6x86/6x86MX" |
61 | depends on X86_32 | 61 | depends on X86_32 |
62 | help | 62 | ---help--- |
63 | Select this for an 586 or 686 series processor such as the AMD K5, | 63 | Select this for an 586 or 686 series processor such as the AMD K5, |
64 | the Cyrix 5x86, 6x86 and 6x86MX. This choice does not | 64 | the Cyrix 5x86, 6x86 and 6x86MX. This choice does not |
65 | assume the RDTSC (Read Time Stamp Counter) instruction. | 65 | assume the RDTSC (Read Time Stamp Counter) instruction. |
@@ -67,21 +67,21 @@ config M586 | |||
67 | config M586TSC | 67 | config M586TSC |
68 | bool "Pentium-Classic" | 68 | bool "Pentium-Classic" |
69 | depends on X86_32 | 69 | depends on X86_32 |
70 | help | 70 | ---help--- |
71 | Select this for a Pentium Classic processor with the RDTSC (Read | 71 | Select this for a Pentium Classic processor with the RDTSC (Read |
72 | Time Stamp Counter) instruction for benchmarking. | 72 | Time Stamp Counter) instruction for benchmarking. |
73 | 73 | ||
74 | config M586MMX | 74 | config M586MMX |
75 | bool "Pentium-MMX" | 75 | bool "Pentium-MMX" |
76 | depends on X86_32 | 76 | depends on X86_32 |
77 | help | 77 | ---help--- |
78 | Select this for a Pentium with the MMX graphics/multimedia | 78 | Select this for a Pentium with the MMX graphics/multimedia |
79 | extended instructions. | 79 | extended instructions. |
80 | 80 | ||
81 | config M686 | 81 | config M686 |
82 | bool "Pentium-Pro" | 82 | bool "Pentium-Pro" |
83 | depends on X86_32 | 83 | depends on X86_32 |
84 | help | 84 | ---help--- |
85 | Select this for Intel Pentium Pro chips. This enables the use of | 85 | Select this for Intel Pentium Pro chips. This enables the use of |
86 | Pentium Pro extended instructions, and disables the init-time guard | 86 | Pentium Pro extended instructions, and disables the init-time guard |
87 | against the f00f bug found in earlier Pentiums. | 87 | against the f00f bug found in earlier Pentiums. |
@@ -89,7 +89,7 @@ config M686 | |||
89 | config MPENTIUMII | 89 | config MPENTIUMII |
90 | bool "Pentium-II/Celeron(pre-Coppermine)" | 90 | bool "Pentium-II/Celeron(pre-Coppermine)" |
91 | depends on X86_32 | 91 | depends on X86_32 |
92 | help | 92 | ---help--- |
93 | Select this for Intel chips based on the Pentium-II and | 93 | Select this for Intel chips based on the Pentium-II and |
94 | pre-Coppermine Celeron core. This option enables an unaligned | 94 | pre-Coppermine Celeron core. This option enables an unaligned |
95 | copy optimization, compiles the kernel with optimization flags | 95 | copy optimization, compiles the kernel with optimization flags |
@@ -99,7 +99,7 @@ config MPENTIUMII | |||
99 | config MPENTIUMIII | 99 | config MPENTIUMIII |
100 | bool "Pentium-III/Celeron(Coppermine)/Pentium-III Xeon" | 100 | bool "Pentium-III/Celeron(Coppermine)/Pentium-III Xeon" |
101 | depends on X86_32 | 101 | depends on X86_32 |
102 | help | 102 | ---help--- |
103 | Select this for Intel chips based on the Pentium-III and | 103 | Select this for Intel chips based on the Pentium-III and |
104 | Celeron-Coppermine core. This option enables use of some | 104 | Celeron-Coppermine core. This option enables use of some |
105 | extended prefetch instructions in addition to the Pentium II | 105 | extended prefetch instructions in addition to the Pentium II |
@@ -108,14 +108,14 @@ config MPENTIUMIII | |||
108 | config MPENTIUMM | 108 | config MPENTIUMM |
109 | bool "Pentium M" | 109 | bool "Pentium M" |
110 | depends on X86_32 | 110 | depends on X86_32 |
111 | help | 111 | ---help--- |
112 | Select this for Intel Pentium M (not Pentium-4 M) | 112 | Select this for Intel Pentium M (not Pentium-4 M) |
113 | notebook chips. | 113 | notebook chips. |
114 | 114 | ||
115 | config MPENTIUM4 | 115 | config MPENTIUM4 |
116 | bool "Pentium-4/Celeron(P4-based)/Pentium-4 M/older Xeon" | 116 | bool "Pentium-4/Celeron(P4-based)/Pentium-4 M/older Xeon" |
117 | depends on X86_32 | 117 | depends on X86_32 |
118 | help | 118 | ---help--- |
119 | Select this for Intel Pentium 4 chips. This includes the | 119 | Select this for Intel Pentium 4 chips. This includes the |
120 | Pentium 4, Pentium D, P4-based Celeron and Xeon, and | 120 | Pentium 4, Pentium D, P4-based Celeron and Xeon, and |
121 | Pentium-4 M (not Pentium M) chips. This option enables compile | 121 | Pentium-4 M (not Pentium M) chips. This option enables compile |
@@ -151,7 +151,7 @@ config MPENTIUM4 | |||
151 | config MK6 | 151 | config MK6 |
152 | bool "K6/K6-II/K6-III" | 152 | bool "K6/K6-II/K6-III" |
153 | depends on X86_32 | 153 | depends on X86_32 |
154 | help | 154 | ---help--- |
155 | Select this for an AMD K6-family processor. Enables use of | 155 | Select this for an AMD K6-family processor. Enables use of |
156 | some extended instructions, and passes appropriate optimization | 156 | some extended instructions, and passes appropriate optimization |
157 | flags to GCC. | 157 | flags to GCC. |
@@ -159,14 +159,14 @@ config MK6 | |||
159 | config MK7 | 159 | config MK7 |
160 | bool "Athlon/Duron/K7" | 160 | bool "Athlon/Duron/K7" |
161 | depends on X86_32 | 161 | depends on X86_32 |
162 | help | 162 | ---help--- |
163 | Select this for an AMD Athlon K7-family processor. Enables use of | 163 | Select this for an AMD Athlon K7-family processor. Enables use of |
164 | some extended instructions, and passes appropriate optimization | 164 | some extended instructions, and passes appropriate optimization |
165 | flags to GCC. | 165 | flags to GCC. |
166 | 166 | ||
167 | config MK8 | 167 | config MK8 |
168 | bool "Opteron/Athlon64/Hammer/K8" | 168 | bool "Opteron/Athlon64/Hammer/K8" |
169 | help | 169 | ---help--- |
170 | Select this for an AMD Opteron or Athlon64 Hammer-family processor. | 170 | Select this for an AMD Opteron or Athlon64 Hammer-family processor. |
171 | Enables use of some extended instructions, and passes appropriate | 171 | Enables use of some extended instructions, and passes appropriate |
172 | optimization flags to GCC. | 172 | optimization flags to GCC. |
@@ -174,7 +174,7 @@ config MK8 | |||
174 | config MCRUSOE | 174 | config MCRUSOE |
175 | bool "Crusoe" | 175 | bool "Crusoe" |
176 | depends on X86_32 | 176 | depends on X86_32 |
177 | help | 177 | ---help--- |
178 | Select this for a Transmeta Crusoe processor. Treats the processor | 178 | Select this for a Transmeta Crusoe processor. Treats the processor |
179 | like a 586 with TSC, and sets some GCC optimization flags (like a | 179 | like a 586 with TSC, and sets some GCC optimization flags (like a |
180 | Pentium Pro with no alignment requirements). | 180 | Pentium Pro with no alignment requirements). |
@@ -182,13 +182,13 @@ config MCRUSOE | |||
182 | config MEFFICEON | 182 | config MEFFICEON |
183 | bool "Efficeon" | 183 | bool "Efficeon" |
184 | depends on X86_32 | 184 | depends on X86_32 |
185 | help | 185 | ---help--- |
186 | Select this for a Transmeta Efficeon processor. | 186 | Select this for a Transmeta Efficeon processor. |
187 | 187 | ||
188 | config MWINCHIPC6 | 188 | config MWINCHIPC6 |
189 | bool "Winchip-C6" | 189 | bool "Winchip-C6" |
190 | depends on X86_32 | 190 | depends on X86_32 |
191 | help | 191 | ---help--- |
192 | Select this for an IDT Winchip C6 chip. Linux and GCC | 192 | Select this for an IDT Winchip C6 chip. Linux and GCC |
193 | treat this chip as a 586TSC with some extended instructions | 193 | treat this chip as a 586TSC with some extended instructions |
194 | and alignment requirements. | 194 | and alignment requirements. |
@@ -196,7 +196,7 @@ config MWINCHIPC6 | |||
196 | config MWINCHIP3D | 196 | config MWINCHIP3D |
197 | bool "Winchip-2/Winchip-2A/Winchip-3" | 197 | bool "Winchip-2/Winchip-2A/Winchip-3" |
198 | depends on X86_32 | 198 | depends on X86_32 |
199 | help | 199 | ---help--- |
200 | Select this for an IDT Winchip-2, 2A or 3. Linux and GCC | 200 | Select this for an IDT Winchip-2, 2A or 3. Linux and GCC |
201 | treat this chip as a 586TSC with some extended instructions | 201 | treat this chip as a 586TSC with some extended instructions |
202 | and alignment requirements. Also enable out of order memory | 202 | and alignment requirements. Also enable out of order memory |
@@ -206,19 +206,19 @@ config MWINCHIP3D | |||
206 | config MGEODEGX1 | 206 | config MGEODEGX1 |
207 | bool "GeodeGX1" | 207 | bool "GeodeGX1" |
208 | depends on X86_32 | 208 | depends on X86_32 |
209 | help | 209 | ---help--- |
210 | Select this for a Geode GX1 (Cyrix MediaGX) chip. | 210 | Select this for a Geode GX1 (Cyrix MediaGX) chip. |
211 | 211 | ||
212 | config MGEODE_LX | 212 | config MGEODE_LX |
213 | bool "Geode GX/LX" | 213 | bool "Geode GX/LX" |
214 | depends on X86_32 | 214 | depends on X86_32 |
215 | help | 215 | ---help--- |
216 | Select this for AMD Geode GX and LX processors. | 216 | Select this for AMD Geode GX and LX processors. |
217 | 217 | ||
218 | config MCYRIXIII | 218 | config MCYRIXIII |
219 | bool "CyrixIII/VIA-C3" | 219 | bool "CyrixIII/VIA-C3" |
220 | depends on X86_32 | 220 | depends on X86_32 |
221 | help | 221 | ---help--- |
222 | Select this for a Cyrix III or C3 chip. Presently Linux and GCC | 222 | Select this for a Cyrix III or C3 chip. Presently Linux and GCC |
223 | treat this chip as a generic 586. Whilst the CPU is 686 class, | 223 | treat this chip as a generic 586. Whilst the CPU is 686 class, |
224 | it lacks the cmov extension which gcc assumes is present when | 224 | it lacks the cmov extension which gcc assumes is present when |
@@ -230,7 +230,7 @@ config MCYRIXIII | |||
230 | config MVIAC3_2 | 230 | config MVIAC3_2 |
231 | bool "VIA C3-2 (Nehemiah)" | 231 | bool "VIA C3-2 (Nehemiah)" |
232 | depends on X86_32 | 232 | depends on X86_32 |
233 | help | 233 | ---help--- |
234 | Select this for a VIA C3 "Nehemiah". Selecting this enables usage | 234 | Select this for a VIA C3 "Nehemiah". Selecting this enables usage |
235 | of SSE and tells gcc to treat the CPU as a 686. | 235 | of SSE and tells gcc to treat the CPU as a 686. |
236 | Note, this kernel will not boot on older (pre model 9) C3s. | 236 | Note, this kernel will not boot on older (pre model 9) C3s. |
@@ -238,14 +238,14 @@ config MVIAC3_2 | |||
238 | config MVIAC7 | 238 | config MVIAC7 |
239 | bool "VIA C7" | 239 | bool "VIA C7" |
240 | depends on X86_32 | 240 | depends on X86_32 |
241 | help | 241 | ---help--- |
242 | Select this for a VIA C7. Selecting this uses the correct cache | 242 | Select this for a VIA C7. Selecting this uses the correct cache |
243 | shift and tells gcc to treat the CPU as a 686. | 243 | shift and tells gcc to treat the CPU as a 686. |
244 | 244 | ||
245 | config MPSC | 245 | config MPSC |
246 | bool "Intel P4 / older Netburst based Xeon" | 246 | bool "Intel P4 / older Netburst based Xeon" |
247 | depends on X86_64 | 247 | depends on X86_64 |
248 | help | 248 | ---help--- |
249 | Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey | 249 | Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey |
250 | Xeon CPUs with Intel 64bit which is compatible with x86-64. | 250 | Xeon CPUs with Intel 64bit which is compatible with x86-64. |
251 | Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the | 251 | Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the |
@@ -255,7 +255,7 @@ config MPSC | |||
255 | 255 | ||
256 | config MCORE2 | 256 | config MCORE2 |
257 | bool "Core 2/newer Xeon" | 257 | bool "Core 2/newer Xeon" |
258 | help | 258 | ---help--- |
259 | 259 | ||
260 | Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and | 260 | Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and |
261 | 53xx) CPUs. You can distinguish newer from older Xeons by the CPU | 261 | 53xx) CPUs. You can distinguish newer from older Xeons by the CPU |
@@ -265,7 +265,7 @@ config MCORE2 | |||
265 | config GENERIC_CPU | 265 | config GENERIC_CPU |
266 | bool "Generic-x86-64" | 266 | bool "Generic-x86-64" |
267 | depends on X86_64 | 267 | depends on X86_64 |
268 | help | 268 | ---help--- |
269 | Generic x86-64 CPU. | 269 | Generic x86-64 CPU. |
270 | Run equally well on all x86-64 CPUs. | 270 | Run equally well on all x86-64 CPUs. |
271 | 271 | ||
@@ -274,7 +274,7 @@ endchoice | |||
274 | config X86_GENERIC | 274 | config X86_GENERIC |
275 | bool "Generic x86 support" | 275 | bool "Generic x86 support" |
276 | depends on X86_32 | 276 | depends on X86_32 |
277 | help | 277 | ---help--- |
278 | Instead of just including optimizations for the selected | 278 | Instead of just including optimizations for the selected |
279 | x86 variant (e.g. PII, Crusoe or Athlon), include some more | 279 | x86 variant (e.g. PII, Crusoe or Athlon), include some more |
280 | generic optimizations as well. This will make the kernel | 280 | generic optimizations as well. This will make the kernel |
@@ -319,7 +319,7 @@ config X86_XADD | |||
319 | config X86_PPRO_FENCE | 319 | config X86_PPRO_FENCE |
320 | bool "PentiumPro memory ordering errata workaround" | 320 | bool "PentiumPro memory ordering errata workaround" |
321 | depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1 | 321 | depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1 |
322 | help | 322 | ---help--- |
323 | Old PentiumPro multiprocessor systems had errata that could cause | 323 | Old PentiumPro multiprocessor systems had errata that could cause |
324 | memory operations to violate the x86 ordering standard in rare cases. | 324 | memory operations to violate the x86 ordering standard in rare cases. |
325 | Enabling this option will attempt to work around some (but not all) | 325 | Enabling this option will attempt to work around some (but not all) |
@@ -412,14 +412,14 @@ config X86_DEBUGCTLMSR | |||
412 | 412 | ||
413 | menuconfig PROCESSOR_SELECT | 413 | menuconfig PROCESSOR_SELECT |
414 | bool "Supported processor vendors" if EMBEDDED | 414 | bool "Supported processor vendors" if EMBEDDED |
415 | help | 415 | ---help--- |
416 | This lets you choose what x86 vendor support code your kernel | 416 | This lets you choose what x86 vendor support code your kernel |
417 | will include. | 417 | will include. |
418 | 418 | ||
419 | config CPU_SUP_INTEL | 419 | config CPU_SUP_INTEL |
420 | default y | 420 | default y |
421 | bool "Support Intel processors" if PROCESSOR_SELECT | 421 | bool "Support Intel processors" if PROCESSOR_SELECT |
422 | help | 422 | ---help--- |
423 | This enables detection, tunings and quirks for Intel processors | 423 | This enables detection, tunings and quirks for Intel processors |
424 | 424 | ||
425 | You need this enabled if you want your kernel to run on an | 425 | You need this enabled if you want your kernel to run on an |
@@ -433,7 +433,7 @@ config CPU_SUP_CYRIX_32 | |||
433 | default y | 433 | default y |
434 | bool "Support Cyrix processors" if PROCESSOR_SELECT | 434 | bool "Support Cyrix processors" if PROCESSOR_SELECT |
435 | depends on !64BIT | 435 | depends on !64BIT |
436 | help | 436 | ---help--- |
437 | This enables detection, tunings and quirks for Cyrix processors | 437 | This enables detection, tunings and quirks for Cyrix processors |
438 | 438 | ||
439 | You need this enabled if you want your kernel to run on a | 439 | You need this enabled if you want your kernel to run on a |
@@ -446,7 +446,7 @@ config CPU_SUP_CYRIX_32 | |||
446 | config CPU_SUP_AMD | 446 | config CPU_SUP_AMD |
447 | default y | 447 | default y |
448 | bool "Support AMD processors" if PROCESSOR_SELECT | 448 | bool "Support AMD processors" if PROCESSOR_SELECT |
449 | help | 449 | ---help--- |
450 | This enables detection, tunings and quirks for AMD processors | 450 | This enables detection, tunings and quirks for AMD processors |
451 | 451 | ||
452 | You need this enabled if you want your kernel to run on an | 452 | You need this enabled if you want your kernel to run on an |
@@ -460,7 +460,7 @@ config CPU_SUP_CENTAUR_32 | |||
460 | default y | 460 | default y |
461 | bool "Support Centaur processors" if PROCESSOR_SELECT | 461 | bool "Support Centaur processors" if PROCESSOR_SELECT |
462 | depends on !64BIT | 462 | depends on !64BIT |
463 | help | 463 | ---help--- |
464 | This enables detection, tunings and quirks for Centaur processors | 464 | This enables detection, tunings and quirks for Centaur processors |
465 | 465 | ||
466 | You need this enabled if you want your kernel to run on a | 466 | You need this enabled if you want your kernel to run on a |
@@ -474,7 +474,7 @@ config CPU_SUP_CENTAUR_64 | |||
474 | default y | 474 | default y |
475 | bool "Support Centaur processors" if PROCESSOR_SELECT | 475 | bool "Support Centaur processors" if PROCESSOR_SELECT |
476 | depends on 64BIT | 476 | depends on 64BIT |
477 | help | 477 | ---help--- |
478 | This enables detection, tunings and quirks for Centaur processors | 478 | This enables detection, tunings and quirks for Centaur processors |
479 | 479 | ||
480 | You need this enabled if you want your kernel to run on a | 480 | You need this enabled if you want your kernel to run on a |
@@ -488,7 +488,7 @@ config CPU_SUP_TRANSMETA_32 | |||
488 | default y | 488 | default y |
489 | bool "Support Transmeta processors" if PROCESSOR_SELECT | 489 | bool "Support Transmeta processors" if PROCESSOR_SELECT |
490 | depends on !64BIT | 490 | depends on !64BIT |
491 | help | 491 | ---help--- |
492 | This enables detection, tunings and quirks for Transmeta processors | 492 | This enables detection, tunings and quirks for Transmeta processors |
493 | 493 | ||
494 | You need this enabled if you want your kernel to run on a | 494 | You need this enabled if you want your kernel to run on a |
@@ -502,7 +502,7 @@ config CPU_SUP_UMC_32 | |||
502 | default y | 502 | default y |
503 | bool "Support UMC processors" if PROCESSOR_SELECT | 503 | bool "Support UMC processors" if PROCESSOR_SELECT |
504 | depends on !64BIT | 504 | depends on !64BIT |
505 | help | 505 | ---help--- |
506 | This enables detection, tunings and quirks for UMC processors | 506 | This enables detection, tunings and quirks for UMC processors |
507 | 507 | ||
508 | You need this enabled if you want your kernel to run on a | 508 | You need this enabled if you want your kernel to run on a |
@@ -521,7 +521,7 @@ config X86_PTRACE_BTS | |||
521 | bool "Branch Trace Store" | 521 | bool "Branch Trace Store" |
522 | default y | 522 | default y |
523 | depends on X86_DEBUGCTLMSR | 523 | depends on X86_DEBUGCTLMSR |
524 | help | 524 | ---help--- |
525 | This adds a ptrace interface to the hardware's branch trace store. | 525 | This adds a ptrace interface to the hardware's branch trace store. |
526 | 526 | ||
527 | Debuggers may use it to collect an execution trace of the debugged | 527 | Debuggers may use it to collect an execution trace of the debugged |