aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig280
1 files changed, 177 insertions, 103 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index bf07b6f50fa1..2cfccc987a26 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -121,7 +121,7 @@ config ARCH_HAS_CACHE_LINE_SIZE
121 def_bool y 121 def_bool y
122 122
123config HAVE_SETUP_PER_CPU_AREA 123config HAVE_SETUP_PER_CPU_AREA
124 def_bool X86_64 || (X86_SMP && !X86_VOYAGER) 124 def_bool X86_64_SMP || (X86_SMP && !X86_VOYAGER)
125 125
126config HAVE_CPUMASK_OF_CPU_MAP 126config HAVE_CPUMASK_OF_CPU_MAP
127 def_bool X86_64_SMP 127 def_bool X86_64_SMP
@@ -181,12 +181,12 @@ config X86_64_SMP
181config X86_HT 181config X86_HT
182 bool 182 bool
183 depends on SMP 183 depends on SMP
184 depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || X86_64 184 depends on (X86_32 && !X86_VOYAGER) || X86_64
185 default y 185 default y
186 186
187config X86_BIOS_REBOOT 187config X86_BIOS_REBOOT
188 bool 188 bool
189 depends on !X86_VISWS && !X86_VOYAGER 189 depends on !X86_VOYAGER
190 default y 190 default y
191 191
192config X86_TRAMPOLINE 192config X86_TRAMPOLINE
@@ -230,6 +230,26 @@ config SMP
230 230
231 If you don't know what to do here, say N. 231 If you don't know what to do here, say N.
232 232
233config X86_FIND_SMP_CONFIG
234 def_bool y
235 depends on X86_MPPARSE || X86_VOYAGER
236
237if ACPI
238config X86_MPPARSE
239 def_bool y
240 bool "Enable MPS table"
241 depends on X86_LOCAL_APIC
242 help
243 For old smp systems that do not have proper acpi support. Newer systems
244 (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
245endif
246
247if !ACPI
248config X86_MPPARSE
249 def_bool y
250 depends on X86_LOCAL_APIC
251endif
252
233choice 253choice
234 prompt "Subarchitecture Type" 254 prompt "Subarchitecture Type"
235 default X86_PC 255 default X86_PC
@@ -251,7 +271,7 @@ config X86_ELAN
251 271
252config X86_VOYAGER 272config X86_VOYAGER
253 bool "Voyager (NCR)" 273 bool "Voyager (NCR)"
254 depends on X86_32 && (SMP || BROKEN) 274 depends on X86_32 && (SMP || BROKEN) && !PCI
255 help 275 help
256 Voyager is an MCA-based 32-way capable SMP architecture proprietary 276 Voyager is an MCA-based 32-way capable SMP architecture proprietary
257 to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. 277 to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -261,16 +281,27 @@ config X86_VOYAGER
261 If you do not specifically know you have a Voyager based machine, 281 If you do not specifically know you have a Voyager based machine,
262 say N here, otherwise the kernel you build will not be bootable. 282 say N here, otherwise the kernel you build will not be bootable.
263 283
284config X86_GENERICARCH
285 bool "Generic architecture"
286 depends on X86_32
287 help
288 This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
289 subarchitectures. It is intended for a generic binary kernel.
290 if you select them all, kernel will probe it one by one. and will
291 fallback to default.
292
293if X86_GENERICARCH
294
264config X86_NUMAQ 295config X86_NUMAQ
265 bool "NUMAQ (IBM/Sequent)" 296 bool "NUMAQ (IBM/Sequent)"
266 depends on SMP && X86_32 297 depends on SMP && X86_32 && PCI && X86_MPPARSE
267 select NUMA 298 select NUMA
268 help 299 help
269 This option is used for getting Linux to run on a (IBM/Sequent) NUMA 300 This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
270 multiquad box. This changes the way that processors are bootstrapped, 301 NUMA multiquad box. This changes the way that processors are
271 and uses Clustered Logical APIC addressing mode instead of Flat Logical. 302 bootstrapped, and uses Clustered Logical APIC addressing mode instead
272 You will need a new lynxer.elf file to flash your firmware with - send 303 of Flat Logical. You will need a new lynxer.elf file to flash your
273 email to <Martin.Bligh@us.ibm.com>. 304 firmware with - send email to <Martin.Bligh@us.ibm.com>.
274 305
275config X86_SUMMIT 306config X86_SUMMIT
276 bool "Summit/EXA (IBM x440)" 307 bool "Summit/EXA (IBM x440)"
@@ -279,46 +310,21 @@ config X86_SUMMIT
279 This option is needed for IBM systems that use the Summit/EXA chipset. 310 This option is needed for IBM systems that use the Summit/EXA chipset.
280 In particular, it is needed for the x440. 311 In particular, it is needed for the x440.
281 312
282 If you don't have one of these computers, you should say N here. 313config X86_ES7000
283 If you want to build a NUMA kernel, you must select ACPI. 314 bool "Support for Unisys ES7000 IA32 series"
315 depends on X86_32 && SMP
316 help
317 Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
318 supposed to run on an IA32-based Unisys ES7000 system.
284 319
285config X86_BIGSMP 320config X86_BIGSMP
286 bool "Support for other sub-arch SMP systems with more than 8 CPUs" 321 bool "Support for big SMP systems with more than 8 CPUs"
287 depends on X86_32 && SMP 322 depends on X86_32 && SMP
288 help 323 help
289 This option is needed for the systems that have more than 8 CPUs 324 This option is needed for the systems that have more than 8 CPUs
290 and if the system is not of any sub-arch type above. 325 and if the system is not of any sub-arch type above.
291 326
292 If you don't have such a system, you should say N here. 327endif
293
294config X86_VISWS
295 bool "SGI 320/540 (Visual Workstation)"
296 depends on X86_32
297 help
298 The SGI Visual Workstation series is an IA32-based workstation
299 based on SGI systems chips with some legacy PC hardware attached.
300
301 Say Y here to create a kernel to run on the SGI 320 or 540.
302
303 A kernel compiled for the Visual Workstation will not run on PCs
304 and vice versa. See <file:Documentation/sgi-visws.txt> for details.
305
306config X86_GENERICARCH
307 bool "Generic architecture (Summit, bigsmp, ES7000, default)"
308 depends on X86_32
309 help
310 This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
311 It is intended for a generic binary kernel.
312 If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
313
314config X86_ES7000
315 bool "Support for Unisys ES7000 IA32 series"
316 depends on X86_32 && SMP
317 help
318 Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
319 supposed to run on an IA32-based Unisys ES7000 system.
320 Only choose this option if you have such a system, otherwise you
321 should say N here.
322 328
323config X86_RDC321X 329config X86_RDC321X
324 bool "RDC R-321x SoC" 330 bool "RDC R-321x SoC"
@@ -337,7 +343,7 @@ config X86_RDC321X
337config X86_VSMP 343config X86_VSMP
338 bool "Support for ScaleMP vSMP" 344 bool "Support for ScaleMP vSMP"
339 select PARAVIRT 345 select PARAVIRT
340 depends on X86_64 346 depends on X86_64 && PCI
341 help 347 help
342 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is 348 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
343 supposed to run on these EM64T-based machines. Only choose this option 349 supposed to run on these EM64T-based machines. Only choose this option
@@ -345,6 +351,18 @@ config X86_VSMP
345 351
346endchoice 352endchoice
347 353
354config X86_VISWS
355 bool "SGI 320/540 (Visual Workstation)"
356 depends on X86_32 && PCI && !X86_VOYAGER && X86_MPPARSE && PCI_GODIRECT
357 help
358 The SGI Visual Workstation series is an IA32-based workstation
359 based on SGI systems chips with some legacy PC hardware attached.
360
361 Say Y here to create a kernel to run on the SGI 320 or 540.
362
363 A kernel compiled for the Visual Workstation will run on general
364 PCs as well. See <file:Documentation/sgi-visws.txt> for details.
365
348config SCHED_NO_NO_OMIT_FRAME_POINTER 366config SCHED_NO_NO_OMIT_FRAME_POINTER
349 def_bool y 367 def_bool y
350 prompt "Single-depth WCHAN output" 368 prompt "Single-depth WCHAN output"
@@ -373,7 +391,7 @@ config VMI
373 bool "VMI Guest support" 391 bool "VMI Guest support"
374 select PARAVIRT 392 select PARAVIRT
375 depends on X86_32 393 depends on X86_32
376 depends on !(X86_VISWS || X86_VOYAGER) 394 depends on !X86_VOYAGER
377 help 395 help
378 VMI provides a paravirtualized interface to the VMware ESX server 396 VMI provides a paravirtualized interface to the VMware ESX server
379 (it could be used by other hypervisors in theory too, but is not 397 (it could be used by other hypervisors in theory too, but is not
@@ -384,7 +402,7 @@ config KVM_CLOCK
384 bool "KVM paravirtualized clock" 402 bool "KVM paravirtualized clock"
385 select PARAVIRT 403 select PARAVIRT
386 select PARAVIRT_CLOCK 404 select PARAVIRT_CLOCK
387 depends on !(X86_VISWS || X86_VOYAGER) 405 depends on !X86_VOYAGER
388 help 406 help
389 Turning on this option will allow you to run a paravirtualized clock 407 Turning on this option will allow you to run a paravirtualized clock
390 when running over the KVM hypervisor. Instead of relying on a PIT 408 when running over the KVM hypervisor. Instead of relying on a PIT
@@ -395,7 +413,7 @@ config KVM_CLOCK
395config KVM_GUEST 413config KVM_GUEST
396 bool "KVM Guest support" 414 bool "KVM Guest support"
397 select PARAVIRT 415 select PARAVIRT
398 depends on !(X86_VISWS || X86_VOYAGER) 416 depends on !X86_VOYAGER
399 help 417 help
400 This option enables various optimizations for running under the KVM 418 This option enables various optimizations for running under the KVM
401 hypervisor. 419 hypervisor.
@@ -404,7 +422,7 @@ source "arch/x86/lguest/Kconfig"
404 422
405config PARAVIRT 423config PARAVIRT
406 bool "Enable paravirtualization code" 424 bool "Enable paravirtualization code"
407 depends on !(X86_VISWS || X86_VOYAGER) 425 depends on !X86_VOYAGER
408 help 426 help
409 This changes the kernel so it can modify itself when it is run 427 This changes the kernel so it can modify itself when it is run
410 under a hypervisor, potentially improving performance significantly 428 under a hypervisor, potentially improving performance significantly
@@ -417,51 +435,33 @@ config PARAVIRT_CLOCK
417 435
418endif 436endif
419 437
420config MEMTEST_BOOTPARAM 438config PARAVIRT_DEBUG
421 bool "Memtest boot parameter" 439 bool "paravirt-ops debugging"
440 depends on PARAVIRT && DEBUG_KERNEL
441 help
442 Enable to debug paravirt_ops internals. Specifically, BUG if
443 a paravirt_op is missing when it is called.
444
445config MEMTEST
446 bool "Memtest"
422 depends on X86_64 447 depends on X86_64
423 default y 448 default y
424 help 449 help
425 This option adds a kernel parameter 'memtest', which allows memtest 450 This option adds a kernel parameter 'memtest', which allows memtest
426 to be disabled at boot. If this option is selected, memtest 451 to be set.
427 functionality can be disabled with memtest=0 on the kernel 452 memtest=0, mean disabled; -- default
428 command line. The purpose of this option is to allow a single 453 memtest=1, mean do 1 test pattern;
429 kernel image to be distributed with memtest built in, but not 454 ...
430 necessarily enabled. 455 memtest=4, mean do 4 test patterns.
431
432 If you are unsure how to answer this question, answer Y. 456 If you are unsure how to answer this question, answer Y.
433 457
434config MEMTEST_BOOTPARAM_VALUE
435 int "Memtest boot parameter default value (0-4)"
436 depends on MEMTEST_BOOTPARAM
437 range 0 4
438 default 0
439 help
440 This option sets the default value for the kernel parameter
441 'memtest', which allows memtest to be disabled at boot. If this
442 option is set to 0 (zero), the memtest kernel parameter will
443 default to 0, disabling memtest at bootup. If this option is
444 set to 4, the memtest kernel parameter will default to 4,
445 enabling memtest at bootup, and use that as pattern number.
446
447 If you are unsure how to answer this question, answer 0.
448
449config ACPI_SRAT
450 def_bool y
451 depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH)
452 select ACPI_NUMA
453
454config HAVE_ARCH_PARSE_SRAT
455 def_bool y
456 depends on ACPI_SRAT
457
458config X86_SUMMIT_NUMA 458config X86_SUMMIT_NUMA
459 def_bool y 459 def_bool y
460 depends on X86_32 && NUMA && (X86_SUMMIT || X86_GENERICARCH) 460 depends on X86_32 && NUMA && X86_GENERICARCH
461 461
462config X86_CYCLONE_TIMER 462config X86_CYCLONE_TIMER
463 def_bool y 463 def_bool y
464 depends on X86_32 && X86_SUMMIT || X86_GENERICARCH 464 depends on X86_GENERICARCH
465 465
466config ES7000_CLUSTERED_APIC 466config ES7000_CLUSTERED_APIC
467 def_bool y 467 def_bool y
@@ -549,6 +549,21 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
549 Calgary anyway, pass 'iommu=calgary' on the kernel command line. 549 Calgary anyway, pass 'iommu=calgary' on the kernel command line.
550 If unsure, say Y. 550 If unsure, say Y.
551 551
552config AMD_IOMMU
553 bool "AMD IOMMU support"
554 select SWIOTLB
555 depends on X86_64 && PCI && ACPI
556 help
557 With this option you can enable support for AMD IOMMU hardware in
558 your system. An IOMMU is a hardware component which provides
559 remapping of DMA memory accesses from devices. With an AMD IOMMU you
560 can isolate the the DMA memory of different devices and protect the
561 system from misbehaving device drivers or hardware.
562
563 You can find out if your system has an AMD IOMMU if you look into
564 your BIOS for an option to enable it or if you have an IVRS ACPI
565 table.
566
552# need this always selected by IOMMU for the VIA workaround 567# need this always selected by IOMMU for the VIA workaround
553config SWIOTLB 568config SWIOTLB
554 bool 569 bool
@@ -560,21 +575,36 @@ config SWIOTLB
560 3 GB of memory. If unsure, say Y. 575 3 GB of memory. If unsure, say Y.
561 576
562config IOMMU_HELPER 577config IOMMU_HELPER
563 def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) 578 def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
579config MAXSMP
580 bool "Configure Maximum number of SMP Processors and NUMA Nodes"
581 depends on X86_64 && SMP
582 default n
583 help
584 Configure maximum number of CPUS and NUMA Nodes for this architecture.
585 If unsure, say N.
564 586
587if MAXSMP
565config NR_CPUS 588config NR_CPUS
566 int "Maximum number of CPUs (2-255)" 589 int
567 range 2 255 590 default "4096"
591endif
592
593if !MAXSMP
594config NR_CPUS
595 int "Maximum number of CPUs (2-4096)"
596 range 2 4096
568 depends on SMP 597 depends on SMP
569 default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 598 default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
570 default "8" 599 default "8"
571 help 600 help
572 This allows you to specify the maximum number of CPUs which this 601 This allows you to specify the maximum number of CPUs which this
573 kernel will support. The maximum supported value is 255 and the 602 kernel will support. The maximum supported value is 4096 and the
574 minimum value which makes sense is 2. 603 minimum value which makes sense is 2.
575 604
576 This is purely to save memory - each supported CPU adds 605 This is purely to save memory - each supported CPU adds
577 approximately eight kilobytes to the kernel image. 606 approximately eight kilobytes to the kernel image.
607endif
578 608
579config SCHED_SMT 609config SCHED_SMT
580 bool "SMT (Hyperthreading) scheduler support" 610 bool "SMT (Hyperthreading) scheduler support"
@@ -598,7 +628,7 @@ source "kernel/Kconfig.preempt"
598 628
599config X86_UP_APIC 629config X86_UP_APIC
600 bool "Local APIC support on uniprocessors" 630 bool "Local APIC support on uniprocessors"
601 depends on X86_32 && !SMP && !(X86_VISWS || X86_VOYAGER || X86_GENERICARCH) 631 depends on X86_32 && !SMP && !(X86_VOYAGER || X86_GENERICARCH)
602 help 632 help
603 A local APIC (Advanced Programmable Interrupt Controller) is an 633 A local APIC (Advanced Programmable Interrupt Controller) is an
604 integrated interrupt controller in the CPU. If you have a single-CPU 634 integrated interrupt controller in the CPU. If you have a single-CPU
@@ -623,11 +653,11 @@ config X86_UP_IOAPIC
623 653
624config X86_LOCAL_APIC 654config X86_LOCAL_APIC
625 def_bool y 655 def_bool y
626 depends on X86_64 || (X86_32 && (X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) || X86_GENERICARCH)) 656 depends on X86_64 || (X86_32 && (X86_UP_APIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH))
627 657
628config X86_IO_APIC 658config X86_IO_APIC
629 def_bool y 659 def_bool y
630 depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) || X86_GENERICARCH)) 660 depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH))
631 661
632config X86_VISWS_APIC 662config X86_VISWS_APIC
633 def_bool y 663 def_bool y
@@ -681,7 +711,7 @@ config X86_MCE_NONFATAL
681 711
682config X86_MCE_P4THERMAL 712config X86_MCE_P4THERMAL
683 bool "check for P4 thermal throttling interrupt." 713 bool "check for P4 thermal throttling interrupt."
684 depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP) && !X86_VISWS 714 depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP)
685 help 715 help
686 Enabling this feature will cause a message to be printed when the P4 716 Enabling this feature will cause a message to be printed when the P4
687 enters thermal throttling. 717 enters thermal throttling.
@@ -911,9 +941,9 @@ config X86_PAE
911config NUMA 941config NUMA
912 bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" 942 bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
913 depends on SMP 943 depends on SMP
914 depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL) 944 depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL)
915 default n if X86_PC 945 default n if X86_PC
916 default y if (X86_NUMAQ || X86_SUMMIT) 946 default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
917 help 947 help
918 Enable NUMA (Non Uniform Memory Access) support. 948 Enable NUMA (Non Uniform Memory Access) support.
919 The kernel will try to allocate memory used by a CPU on the 949 The kernel will try to allocate memory used by a CPU on the
@@ -965,13 +995,25 @@ config NUMA_EMU
965 into virtual nodes when booted with "numa=fake=N", where N is the 995 into virtual nodes when booted with "numa=fake=N", where N is the
966 number of nodes. This is only useful for debugging. 996 number of nodes. This is only useful for debugging.
967 997
998if MAXSMP
999
1000config NODES_SHIFT
1001 int
1002 default "9"
1003endif
1004
1005if !MAXSMP
968config NODES_SHIFT 1006config NODES_SHIFT
969 int "Max num nodes shift(1-9)" 1007 int "Maximum NUMA Nodes (as a power of 2)"
970 range 1 9 if X86_64 1008 range 1 9 if X86_64
971 default "6" if X86_64 1009 default "6" if X86_64
972 default "4" if X86_NUMAQ 1010 default "4" if X86_NUMAQ
973 default "3" 1011 default "3"
974 depends on NEED_MULTIPLE_NODES 1012 depends on NEED_MULTIPLE_NODES
1013 help
1014 Specify the maximum number of NUMA Nodes available on the target
1015 system. Increases memory reserved to accomodate various tables.
1016endif
975 1017
976config HAVE_ARCH_BOOTMEM_NODE 1018config HAVE_ARCH_BOOTMEM_NODE
977 def_bool y 1019 def_bool y
@@ -1090,6 +1132,40 @@ config MTRR
1090 1132
1091 See <file:Documentation/mtrr.txt> for more information. 1133 See <file:Documentation/mtrr.txt> for more information.
1092 1134
1135config MTRR_SANITIZER
1136 def_bool y
1137 prompt "MTRR cleanup support"
1138 depends on MTRR
1139 help
1140 Convert MTRR layout from continuous to discrete, so some X driver
1141 could add WB entries.
1142
1143 Say N here if you see bootup problems (boot crash, boot hang,
1144 spontaneous reboots).
1145
1146 Could be disabled with disable_mtrr_cleanup. Also mtrr_chunk_size
1147 could be used to send largest mtrr entry size for continuous block
1148 to hold holes (aka. UC entries)
1149
1150 If unsure, say Y.
1151
1152config MTRR_SANITIZER_ENABLE_DEFAULT
1153 int "MTRR cleanup enable value (0-1)"
1154 range 0 1
1155 default "0"
1156 depends on MTRR_SANITIZER
1157 help
1158 Enable mtrr cleanup default value
1159
1160config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
1161 int "MTRR cleanup spare reg num (0-7)"
1162 range 0 7
1163 default "1"
1164 depends on MTRR_SANITIZER
1165 help
1166 mtrr cleanup spare entries default, it can be changed via
1167 mtrr_spare_reg_nr=
1168
1093config X86_PAT 1169config X86_PAT
1094 bool 1170 bool
1095 prompt "x86 PAT support" 1171 prompt "x86 PAT support"
@@ -1190,7 +1266,6 @@ config KEXEC
1190 1266
1191config CRASH_DUMP 1267config CRASH_DUMP
1192 bool "kernel crash dumps (EXPERIMENTAL)" 1268 bool "kernel crash dumps (EXPERIMENTAL)"
1193 depends on EXPERIMENTAL
1194 depends on X86_64 || (X86_32 && HIGHMEM) 1269 depends on X86_64 || (X86_32 && HIGHMEM)
1195 help 1270 help
1196 Generate crash dump after being started by kexec. 1271 Generate crash dump after being started by kexec.
@@ -1339,7 +1414,7 @@ config X86_APM_BOOT
1339 1414
1340menuconfig APM 1415menuconfig APM
1341 tristate "APM (Advanced Power Management) BIOS support" 1416 tristate "APM (Advanced Power Management) BIOS support"
1342 depends on X86_32 && PM_SLEEP && !X86_VISWS 1417 depends on X86_32 && PM_SLEEP
1343 ---help--- 1418 ---help---
1344 APM is a BIOS specification for saving power using several different 1419 APM is a BIOS specification for saving power using several different
1345 techniques. This is mostly useful for battery powered laptops with 1420 techniques. This is mostly useful for battery powered laptops with
@@ -1475,8 +1550,7 @@ endmenu
1475menu "Bus options (PCI etc.)" 1550menu "Bus options (PCI etc.)"
1476 1551
1477config PCI 1552config PCI
1478 bool "PCI support" if !X86_VISWS && !X86_VSMP 1553 bool "PCI support"
1479 depends on !X86_VOYAGER
1480 default y 1554 default y
1481 select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) 1555 select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
1482 help 1556 help
@@ -1487,7 +1561,7 @@ config PCI
1487 1561
1488choice 1562choice
1489 prompt "PCI access mode" 1563 prompt "PCI access mode"
1490 depends on X86_32 && PCI && !X86_VISWS 1564 depends on X86_32 && PCI
1491 default PCI_GOANY 1565 default PCI_GOANY
1492 ---help--- 1566 ---help---
1493 On PCI systems, the BIOS can be used to detect the PCI devices and 1567 On PCI systems, the BIOS can be used to detect the PCI devices and
@@ -1524,12 +1598,12 @@ endchoice
1524 1598
1525config PCI_BIOS 1599config PCI_BIOS
1526 def_bool y 1600 def_bool y
1527 depends on X86_32 && !X86_VISWS && PCI && (PCI_GOBIOS || PCI_GOANY) 1601 depends on X86_32 && PCI && (PCI_GOBIOS || PCI_GOANY)
1528 1602
1529# x86-64 doesn't support PCI BIOS access from long mode so always go direct. 1603# x86-64 doesn't support PCI BIOS access from long mode so always go direct.
1530config PCI_DIRECT 1604config PCI_DIRECT
1531 def_bool y 1605 def_bool y
1532 depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC) || X86_VISWS) 1606 depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC))
1533 1607
1534config PCI_MMCONFIG 1608config PCI_MMCONFIG
1535 def_bool y 1609 def_bool y
@@ -1589,7 +1663,7 @@ if X86_32
1589 1663
1590config ISA 1664config ISA
1591 bool "ISA support" 1665 bool "ISA support"
1592 depends on !(X86_VOYAGER || X86_VISWS) 1666 depends on !X86_VOYAGER
1593 help 1667 help
1594 Find out whether you have ISA slots on your motherboard. ISA is the 1668 Find out whether you have ISA slots on your motherboard. ISA is the
1595 name of a bus system, i.e. the way the CPU talks to the other stuff 1669 name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -1616,7 +1690,7 @@ config EISA
1616source "drivers/eisa/Kconfig" 1690source "drivers/eisa/Kconfig"
1617 1691
1618config MCA 1692config MCA
1619 bool "MCA support" if !(X86_VISWS || X86_VOYAGER) 1693 bool "MCA support" if !X86_VOYAGER
1620 default y if X86_VOYAGER 1694 default y if X86_VOYAGER
1621 help 1695 help
1622 MicroChannel Architecture is found in some IBM PS/2 machines and 1696 MicroChannel Architecture is found in some IBM PS/2 machines and