Skip to content

L
linux
Commit 19530313 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 

Pull Kconfig file consolidation from Masahiro Yamada:
 "Consolidation of bus (PCI, PCMCIA, EISA, RapidIO) config entries by
  Christoph Hellwig.

  Currently, every architecture that wants to provide common peripheral
  busses needs to add some boilerplate code and include the right
  Kconfig files. This series instead just selects the presence (when
  needed) and then handles everything in the bus-specific Kconfig file
  under drivers/"

* tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  pcmcia: remove per-arch PCMCIA config entry
  eisa: consolidate EISA Kconfig entry in drivers/eisa
  rapidio: consolidate RAPIDIO config entry in drivers/rapidio
  pcmcia: allow PCMCIA support independent of the architecture
  PCI: consolidate the PCI_SYSCALL symbol
  PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options
  PCI: consolidate PCI config entry in drivers/pci
  MIPS: remove the HT_PCI config option
parents 769e4709 5cfc879c
Show whitespace changes
Inline Side-by-side
Showing with 287 additions and 641 deletions
arch/alpha/Kconfig
View file @ 19530313
...@@ -7,6 +7,9 @@ config ALPHA ...@@ -7,6 +7,9 @@ config ALPHA
select ARCH_NO_PREEMPT select ARCH_NO_PREEMPT
select ARCH_NO_SG_CHAIN select ARCH_NO_SG_CHAIN
select ARCH_USE_CMPXCHG_LOCKREF select ARCH_USE_CMPXCHG_LOCKREF
select FORCE_PCI if !ALPHA_JENSEN
select PCI_DOMAINS if PCI
select PCI_SYSCALL if PCI
select HAVE_AOUT select HAVE_AOUT
select HAVE_IDE select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
...@@ -16,6 +19,7 @@ config ALPHA ...@@ -16,6 +19,7 @@ config ALPHA
select NEED_SG_DMA_LENGTH select NEED_SG_DMA_LENGTH
select VIRT_TO_BUS select VIRT_TO_BUS
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE
select GENERIC_PCI_IOMAP if PCI
select AUTO_IRQ_AFFINITY if SMP select AUTO_IRQ_AFFINITY if SMP
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
...@@ -126,11 +130,13 @@ choice ...@@ -126,11 +130,13 @@ choice
config ALPHA_GENERIC config ALPHA_GENERIC
bool "Generic" bool "Generic"
depends on TTY depends on TTY
select HAVE_EISA
help help
A generic kernel will run on all supported Alpha hardware. A generic kernel will run on all supported Alpha hardware.
config ALPHA_ALCOR config ALPHA_ALCOR
bool "Alcor/Alpha-XLT" bool "Alcor/Alpha-XLT"
select HAVE_EISA
help help
For systems using the Digital ALCOR chipset: 5 chips (4, 64-bit data For systems using the Digital ALCOR chipset: 5 chips (4, 64-bit data
slices (Data Switch, DSW) - 208-pin PQFP and 1 control (Control, I/O slices (Data Switch, DSW) - 208-pin PQFP and 1 control (Control, I/O
...@@ -203,6 +209,7 @@ config ALPHA_EIGER ...@@ -203,6 +209,7 @@ config ALPHA_EIGER
config ALPHA_JENSEN config ALPHA_JENSEN
bool "Jensen" bool "Jensen"
depends on BROKEN depends on BROKEN
select HAVE_EISA
help help
DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one
of the first-generation Alpha systems. A number of these systems of the first-generation Alpha systems. A number of these systems
...@@ -219,6 +226,7 @@ config ALPHA_LX164 ...@@ -219,6 +226,7 @@ config ALPHA_LX164
config ALPHA_LYNX config ALPHA_LYNX
bool "Lynx" bool "Lynx"
select HAVE_EISA
help help
AlphaServer 2100A-based systems. AlphaServer 2100A-based systems.
...@@ -229,6 +237,7 @@ config ALPHA_MARVEL ...@@ -229,6 +237,7 @@ config ALPHA_MARVEL
config ALPHA_MIATA config ALPHA_MIATA
bool "Miata" bool "Miata"
select HAVE_EISA
help help
The Digital PersonalWorkStation (PWS 433a, 433au, 500a, 500au, 600a, The Digital PersonalWorkStation (PWS 433a, 433au, 500a, 500au, 600a,
or 600au). or 600au).
...@@ -248,6 +257,7 @@ config ALPHA_NONAME_CH ...@@ -248,6 +257,7 @@ config ALPHA_NONAME_CH
config ALPHA_NORITAKE config ALPHA_NORITAKE
bool "Noritake" bool "Noritake"
select HAVE_EISA
help help
AlphaServer 1000A, AlphaServer 600A, and AlphaServer 800-based AlphaServer 1000A, AlphaServer 600A, and AlphaServer 800-based
systems. systems.
...@@ -260,6 +270,7 @@ config ALPHA_P2K ...@@ -260,6 +270,7 @@ config ALPHA_P2K
config ALPHA_RAWHIDE config ALPHA_RAWHIDE
bool "Rawhide" bool "Rawhide"
select HAVE_EISA
help help
AlphaServer 1200, AlphaServer 4000 and AlphaServer 4100 machines. AlphaServer 1200, AlphaServer 4000 and AlphaServer 4100 machines.
See HOWTO at See HOWTO at
...@@ -279,6 +290,7 @@ config ALPHA_SX164 ...@@ -279,6 +290,7 @@ config ALPHA_SX164
config ALPHA_SABLE config ALPHA_SABLE
bool "Sable" bool "Sable"
select HAVE_EISA
help help
Digital AlphaServer 2000 and 2100-based systems. Digital AlphaServer 2000 and 2100-based systems.
...@@ -319,24 +331,6 @@ config ISA_DMA_API ...@@ -319,24 +331,6 @@ config ISA_DMA_API
bool bool
default y default y
config PCI
bool
depends on !ALPHA_JENSEN
select GENERIC_PCI_IOMAP
default y
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
VESA. If you have PCI, say Y, otherwise N.
config PCI_DOMAINS
bool
default y
config PCI_SYSCALL
def_bool PCI
config ALPHA_NONAME config ALPHA_NONAME
bool bool
depends on ALPHA_BOOK1 || ALPHA_NONAME_CH depends on ALPHA_BOOK1 || ALPHA_NONAME_CH
...@@ -526,11 +520,6 @@ config ALPHA_SRM ...@@ -526,11 +520,6 @@ config ALPHA_SRM
If unsure, say N. If unsure, say N.
config EISA
bool
depends on ALPHA_GENERIC || ALPHA_JENSEN || ALPHA_ALCOR || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_RAWHIDE
default y
config ARCH_MAY_HAVE_PC_FDC config ARCH_MAY_HAVE_PC_FDC
def_bool y def_bool y
...@@ -681,11 +670,6 @@ config HZ ...@@ -681,11 +670,6 @@ config HZ
default 1200 if HZ_1200 default 1200 if HZ_1200
default 1024 default 1024
source "drivers/pci/Kconfig"
source "drivers/eisa/Kconfig"
source "drivers/pcmcia/Kconfig"
config SRM_ENV config SRM_ENV
tristate "SRM environment through procfs" tristate "SRM environment through procfs"
depends on PROC_FS depends on PROC_FS
......
arch/arc/Kconfig
View file @ 19530313
...@@ -45,14 +45,12 @@ config ARC ...@@ -45,14 +45,12 @@ config ARC
select OF select OF
select OF_EARLY_FLATTREE select OF_EARLY_FLATTREE
select OF_RESERVED_MEM select OF_RESERVED_MEM
select PCI_SYSCALL if PCI
select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING
config ARCH_HAS_CACHE_LINE_SIZE config ARCH_HAS_CACHE_LINE_SIZE
def_bool y def_bool y
config MIGHT_HAVE_PCI
bool
config TRACE_IRQFLAGS_SUPPORT config TRACE_IRQFLAGS_SUPPORT
def_bool y def_bool y
...@@ -541,24 +539,4 @@ config FORCE_MAX_ZONEORDER ...@@ -541,24 +539,4 @@ config FORCE_MAX_ZONEORDER
default "12" if ARC_HUGEPAGE_16M default "12" if ARC_HUGEPAGE_16M
default "11" default "11"
menu "Bus Support"
config PCI
bool "PCI support" if MIGHT_HAVE_PCI
help
PCI is the name of a bus system, i.e., the way the CPU talks to
the other stuff inside your box. Find out if your board/platform
has PCI.
Note: PCIe support for Synopsys Device will be available only
when HAPS DX is configured with PCIe RC bitmap. If you have PCI,
say Y, otherwise N.
config PCI_SYSCALL
def_bool PCI
source "drivers/pci/Kconfig"
endmenu
source "kernel/power/Kconfig" source "kernel/power/Kconfig"
arch/arc/plat-axs10x/Kconfig
View file @ 19530313
...@@ -11,7 +11,7 @@ menuconfig ARC_PLAT_AXS10X ...@@ -11,7 +11,7 @@ menuconfig ARC_PLAT_AXS10X
select DW_APB_ICTL select DW_APB_ICTL
select GPIO_DWAPB select GPIO_DWAPB
select OF_GPIO select OF_GPIO
select MIGHT_HAVE_PCI select HAVE_PCI
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select GPIOLIB select GPIOLIB
select AXS101 if ISA_ARCOMPACT select AXS101 if ISA_ARCOMPACT
......
arch/arc/plat-hsdk/Kconfig
View file @ 19530313
...@@ -11,4 +11,4 @@ menuconfig ARC_SOC_HSDK ...@@ -11,4 +11,4 @@ menuconfig ARC_SOC_HSDK
select ARC_HAS_ACCL_REGS select ARC_HAS_ACCL_REGS
select CLK_HSDK select CLK_HSDK
select RESET_HSDK select RESET_HSDK
select MIGHT_HAVE_PCI select HAVE_PCI
arch/arm/Kconfig
View file @ 19530313
...@@ -104,6 +104,7 @@ config ARM ...@@ -104,6 +104,7 @@ config ARM
select OF_RESERVED_MEM if OF select OF_RESERVED_MEM if OF
select OLD_SIGACTION select OLD_SIGACTION
select OLD_SIGSUSPEND3 select OLD_SIGSUSPEND3
select PCI_SYSCALL if PCI
select PERF_USE_VMALLOC select PERF_USE_VMALLOC
select REFCOUNT_FULL select REFCOUNT_FULL
select RTC_LIB select RTC_LIB
...@@ -147,9 +148,6 @@ config ARM_DMA_IOMMU_ALIGNMENT ...@@ -147,9 +148,6 @@ config ARM_DMA_IOMMU_ALIGNMENT
endif endif
config MIGHT_HAVE_PCI
bool
config SYS_SUPPORTS_APM_EMULATION config SYS_SUPPORTS_APM_EMULATION
bool bool
...@@ -163,21 +161,6 @@ config HAVE_PROC_CPU ...@@ -163,21 +161,6 @@ config HAVE_PROC_CPU
config NO_IOPORT_MAP config NO_IOPORT_MAP
bool bool
config EISA
bool
---help---
The Extended Industry Standard Architecture (EISA) bus was
developed as an open alternative to the IBM MicroChannel bus.
The EISA bus provided some of the features of the IBM MicroChannel
bus while maintaining backward compatibility with cards made for
the older ISA bus. The EISA bus saw limited use between 1988 and
1995 when it was made obsolete by the PCI bus.
Say Y here if you are building a kernel for an EISA-based machine.
Otherwise, say N.
config SBUS config SBUS
bool bool
...@@ -333,8 +316,8 @@ config ARCH_MULTIPLATFORM ...@@ -333,8 +316,8 @@ config ARCH_MULTIPLATFORM
select COMMON_CLK select COMMON_CLK
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_MULTI_HANDLER
select MIGHT_HAVE_PCI select HAVE_PCI
select PCI_DOMAINS if PCI select PCI_DOMAINS_GENERIC if PCI
select SPARSE_IRQ select SPARSE_IRQ
select USE_OF select USE_OF
...@@ -407,7 +390,7 @@ config ARCH_IOP13XX ...@@ -407,7 +390,7 @@ config ARCH_IOP13XX
select CPU_XSC3 select CPU_XSC3
select NEED_MACH_MEMORY_H select NEED_MACH_MEMORY_H
select NEED_RET_TO_USER select NEED_RET_TO_USER
select PCI select FORCE_PCI
select PLAT_IOP select PLAT_IOP
select VMSPLIT_1G select VMSPLIT_1G
select SPARSE_IRQ select SPARSE_IRQ
...@@ -421,7 +404,7 @@ config ARCH_IOP32X ...@@ -421,7 +404,7 @@ config ARCH_IOP32X
select GPIO_IOP select GPIO_IOP
select GPIOLIB select GPIOLIB
select NEED_RET_TO_USER select NEED_RET_TO_USER
select PCI select FORCE_PCI
select PLAT_IOP select PLAT_IOP
help help
Support for Intel's 80219 and IOP32X (XScale) family of Support for Intel's 80219 and IOP32X (XScale) family of
...@@ -434,7 +417,7 @@ config ARCH_IOP33X ...@@ -434,7 +417,7 @@ config ARCH_IOP33X
select GPIO_IOP select GPIO_IOP
select GPIOLIB select GPIOLIB
select NEED_RET_TO_USER select NEED_RET_TO_USER
select PCI select FORCE_PCI
select PLAT_IOP select PLAT_IOP
help help
Support for Intel's IOP33X (XScale) family of processors. Support for Intel's IOP33X (XScale) family of processors.
...@@ -449,7 +432,7 @@ config ARCH_IXP4XX ...@@ -449,7 +432,7 @@ config ARCH_IXP4XX
select DMABOUNCE if PCI select DMABOUNCE if PCI
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GPIOLIB select GPIOLIB
select MIGHT_HAVE_PCI select HAVE_PCI
select NEED_MACH_IO_H select NEED_MACH_IO_H
select USB_EHCI_BIG_ENDIAN_DESC select USB_EHCI_BIG_ENDIAN_DESC
select USB_EHCI_BIG_ENDIAN_MMIO select USB_EHCI_BIG_ENDIAN_MMIO
...@@ -462,7 +445,7 @@ config ARCH_DOVE ...@@ -462,7 +445,7 @@ config ARCH_DOVE
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_MULTI_HANDLER
select GPIOLIB select GPIOLIB
select MIGHT_HAVE_PCI select HAVE_PCI
select MVEBU_MBUS select MVEBU_MBUS
select PINCTRL select PINCTRL
select PINCTRL_DOVE select PINCTRL_DOVE
...@@ -1230,46 +1213,18 @@ config ISA_DMA ...@@ -1230,46 +1213,18 @@ config ISA_DMA
config ISA_DMA_API config ISA_DMA_API
bool bool
config PCI
bool "PCI support" if MIGHT_HAVE_PCI
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
VESA. If you have PCI, say Y, otherwise N.
config PCI_DOMAINS
bool "Support for multiple PCI domains"
depends on PCI
help
Enable PCI domains kernel management. Say Y if your machine
has a PCI bus hierarchy that requires more than one PCI
domain (aka segment) to be correctly managed. Say N otherwise.
If you don't know what to do here, say N.
config PCI_DOMAINS_GENERIC
def_bool PCI_DOMAINS
config PCI_NANOENGINE config PCI_NANOENGINE
bool "BSE nanoEngine PCI support" bool "BSE nanoEngine PCI support"
depends on SA1100_NANOENGINE depends on SA1100_NANOENGINE
help help
Enable PCI on the BSE nanoEngine board. Enable PCI on the BSE nanoEngine board.
config PCI_SYSCALL
def_bool PCI
config PCI_HOST_ITE8152 config PCI_HOST_ITE8152
bool bool
depends on PCI && MACH_ARMCORE depends on PCI && MACH_ARMCORE
default y default y
select DMABOUNCE select DMABOUNCE
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
endmenu endmenu
menu "Kernel Features" menu "Kernel Features"
......
arch/arm/mach-alpine/Kconfig
View file @ 19530313
...@@ -9,7 +9,7 @@ config ARCH_ALPINE ...@@ -9,7 +9,7 @@ config ARCH_ALPINE
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
select HAVE_SMP select HAVE_SMP
select MFD_SYSCON select MFD_SYSCON
select PCI select FORCE_PCI
select PCI_HOST_GENERIC select PCI_HOST_GENERIC
help help
This enables support for the Annapurna Labs Alpine V1 boards. This enables support for the Annapurna Labs Alpine V1 boards.
arch/arm/mach-bcm/Kconfig
View file @ 19530313
...@@ -20,7 +20,7 @@ config ARCH_BCM_IPROC ...@@ -20,7 +20,7 @@ config ARCH_BCM_IPROC
select GPIOLIB select GPIOLIB
select ARM_AMBA select ARM_AMBA
select PINCTRL select PINCTRL
select PCI_DOMAINS if PCI select PCI_DOMAINS_GENERIC if PCI
help help
This enables support for systems based on Broadcom IPROC architected SoCs. This enables support for systems based on Broadcom IPROC architected SoCs.
The IPROC complex contains one or more ARM CPUs along with common The IPROC complex contains one or more ARM CPUs along with common
......
arch/arm/mach-footbridge/Kconfig
View file @ 19530313
...@@ -9,7 +9,7 @@ config ARCH_CATS ...@@ -9,7 +9,7 @@ config ARCH_CATS
select FOOTBRIDGE_HOST select FOOTBRIDGE_HOST
select ISA select ISA
select ISA_DMA select ISA_DMA
select PCI select FORCE_PCI
help help
Say Y here if you intend to run this kernel on the CATS. Say Y here if you intend to run this kernel on the CATS.
...@@ -20,7 +20,7 @@ config ARCH_PERSONAL_SERVER ...@@ -20,7 +20,7 @@ config ARCH_PERSONAL_SERVER
select FOOTBRIDGE_HOST select FOOTBRIDGE_HOST
select ISA select ISA
select ISA_DMA select ISA_DMA
select PCI select FORCE_PCI
---help--- ---help---
Say Y here if you intend to run this kernel on the Compaq Say Y here if you intend to run this kernel on the Compaq
Personal Server. Personal Server.
...@@ -53,7 +53,7 @@ config ARCH_EBSA285_HOST ...@@ -53,7 +53,7 @@ config ARCH_EBSA285_HOST
select ISA select ISA
select ISA_DMA select ISA_DMA
select ARCH_MAY_HAVE_PC_FDC select ARCH_MAY_HAVE_PC_FDC
select PCI select FORCE_PCI
help help
Say Y here if you intend to run this kernel on the EBSA285 card Say Y here if you intend to run this kernel on the EBSA285 card
in host ("central function") mode. in host ("central function") mode.
...@@ -67,7 +67,7 @@ config ARCH_NETWINDER ...@@ -67,7 +67,7 @@ config ARCH_NETWINDER
select FOOTBRIDGE_HOST select FOOTBRIDGE_HOST
select ISA select ISA
select ISA_DMA select ISA_DMA
select PCI select FORCE_PCI
help help
Say Y here if you intend to run this kernel on the Rebel.COM Say Y here if you intend to run this kernel on the Rebel.COM
NetWinder. Information about this machine can be found at: NetWinder. Information about this machine can be found at:
......
arch/arm/mach-ixp4xx/Kconfig
View file @ 19530313
...@@ -7,7 +7,7 @@ comment "IXP4xx Platforms" ...@@ -7,7 +7,7 @@ comment "IXP4xx Platforms"
config MACH_NSLU2 config MACH_NSLU2
bool bool
prompt "Linksys NSLU2" prompt "Linksys NSLU2"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Linksys's Say 'Y' here if you want your kernel to support Linksys's
NSLU2 NAS device. For more information on this platform, NSLU2 NAS device. For more information on this platform,
...@@ -15,7 +15,7 @@ config MACH_NSLU2 ...@@ -15,7 +15,7 @@ config MACH_NSLU2
config MACH_AVILA config MACH_AVILA
bool "Avila" bool "Avila"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support the Gateworks Say 'Y' here if you want your kernel to support the Gateworks
Avila Network Platform. For more information on this platform, Avila Network Platform. For more information on this platform,
...@@ -31,7 +31,7 @@ config MACH_LOFT ...@@ -31,7 +31,7 @@ config MACH_LOFT
config ARCH_ADI_COYOTE config ARCH_ADI_COYOTE
bool "Coyote" bool "Coyote"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support the ADI Say 'Y' here if you want your kernel to support the ADI
Engineering Coyote Gateway Reference Platform. For more Engineering Coyote Gateway Reference Platform. For more
...@@ -39,7 +39,7 @@ config ARCH_ADI_COYOTE ...@@ -39,7 +39,7 @@ config ARCH_ADI_COYOTE
config MACH_GATEWAY7001 config MACH_GATEWAY7001
bool "Gateway 7001" bool "Gateway 7001"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Gateway's Say 'Y' here if you want your kernel to support Gateway's
7001 Access Point. For more information on this platform, 7001 Access Point. For more information on this platform,
...@@ -47,7 +47,7 @@ config MACH_GATEWAY7001 ...@@ -47,7 +47,7 @@ config MACH_GATEWAY7001
config MACH_WG302V2 config MACH_WG302V2
bool "Netgear WG302 v2 / WAG302 v2" bool "Netgear WG302 v2 / WAG302 v2"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Netgear's Say 'Y' here if you want your kernel to support Netgear's
WG302 v2 or WAG302 v2 Access Points. For more information WG302 v2 or WAG302 v2 Access Points. For more information
...@@ -107,7 +107,7 @@ config ARCH_PRPMC1100 ...@@ -107,7 +107,7 @@ config ARCH_PRPMC1100
config MACH_NAS100D config MACH_NAS100D
bool bool
prompt "NAS100D" prompt "NAS100D"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Iomega's Say 'Y' here if you want your kernel to support Iomega's
NAS 100d device. For more information on this platform, NAS 100d device. For more information on this platform,
...@@ -116,7 +116,7 @@ config MACH_NAS100D ...@@ -116,7 +116,7 @@ config MACH_NAS100D
config MACH_DSMG600 config MACH_DSMG600
bool bool
prompt "D-Link DSM-G600 RevA" prompt "D-Link DSM-G600 RevA"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support D-Link's Say 'Y' here if you want your kernel to support D-Link's
DSM-G600 RevA device. For more information on this platform, DSM-G600 RevA device. For more information on this platform,
...@@ -130,7 +130,7 @@ config ARCH_IXDP4XX ...@@ -130,7 +130,7 @@ config ARCH_IXDP4XX
config MACH_FSG config MACH_FSG
bool bool
prompt "Freecom FSG-3" prompt "Freecom FSG-3"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Freecom's Say 'Y' here if you want your kernel to support Freecom's
FSG-3 device. For more information on this platform, FSG-3 device. For more information on this platform,
...@@ -139,7 +139,7 @@ config MACH_FSG ...@@ -139,7 +139,7 @@ config MACH_FSG
config MACH_ARCOM_VULCAN config MACH_ARCOM_VULCAN
bool bool
prompt "Arcom/Eurotech Vulcan" prompt "Arcom/Eurotech Vulcan"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Arcom's Say 'Y' here if you want your kernel to support Arcom's
Vulcan board. Vulcan board.
...@@ -160,7 +160,7 @@ config CPU_IXP43X ...@@ -160,7 +160,7 @@ config CPU_IXP43X
config MACH_GTWX5715 config MACH_GTWX5715
bool "Gemtek WX5715 (Linksys WRV54G)" bool "Gemtek WX5715 (Linksys WRV54G)"
depends on ARCH_IXP4XX depends on ARCH_IXP4XX
select PCI select FORCE_PCI
help help
This board is currently inside the Linksys WRV54G Gateways. This board is currently inside the Linksys WRV54G Gateways.
...@@ -183,7 +183,7 @@ config MACH_DEVIXP ...@@ -183,7 +183,7 @@ config MACH_DEVIXP
config MACH_MICCPT config MACH_MICCPT
bool "Omicron MICCPT" bool "Omicron MICCPT"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support the MICCPT Say 'Y' here if you want your kernel to support the MICCPT
board from OMICRON electronics GmbH. board from OMICRON electronics GmbH.
......
arch/arm/mach-ks8695/Kconfig
View file @ 19530313
...@@ -4,7 +4,7 @@ menu "Kendin/Micrel KS8695 Implementations" ...@@ -4,7 +4,7 @@ menu "Kendin/Micrel KS8695 Implementations"
config MACH_KS8695 config MACH_KS8695
bool "KS8695 development board" bool "KS8695 development board"
select MIGHT_HAVE_PCI select HAVE_PCI
help help
Say 'Y' here if you want your kernel to run on the original Say 'Y' here if you want your kernel to run on the original
Kendin-Micrel KS8695 development board. Kendin-Micrel KS8695 development board.
...@@ -52,7 +52,7 @@ config MACH_CM4002 ...@@ -52,7 +52,7 @@ config MACH_CM4002
config MACH_CM4008 config MACH_CM4008
bool "OpenGear CM4008" bool "OpenGear CM4008"
select MIGHT_HAVE_PCI select HAVE_PCI
help help
Say 'Y' here if you want your kernel to support the OpenGear Say 'Y' here if you want your kernel to support the OpenGear
CM4008 Console Server. See http://www.opengear.com for more CM4008 Console Server. See http://www.opengear.com for more
...@@ -60,7 +60,7 @@ config MACH_CM4008 ...@@ -60,7 +60,7 @@ config MACH_CM4008
config MACH_CM41xx config MACH_CM41xx
bool "OpenGear CM41xx" bool "OpenGear CM41xx"
select MIGHT_HAVE_PCI select HAVE_PCI
help help
Say 'Y' here if you want your kernel to support the OpenGear Say 'Y' here if you want your kernel to support the OpenGear
CM4016 or CM4048 Console Servers. See http://www.opengear.com for CM4016 or CM4048 Console Servers. See http://www.opengear.com for
...@@ -68,7 +68,7 @@ config MACH_CM41xx ...@@ -68,7 +68,7 @@ config MACH_CM41xx
config MACH_IM4004 config MACH_IM4004
bool "OpenGear IM4004" bool "OpenGear IM4004"
select MIGHT_HAVE_PCI select HAVE_PCI
help help
Say 'Y' here if you want your kernel to support the OpenGear Say 'Y' here if you want your kernel to support the OpenGear
IM4004 Secure Access Server. See http://www.opengear.com for IM4004 Secure Access Server. See http://www.opengear.com for
...@@ -76,7 +76,7 @@ config MACH_IM4004 ...@@ -76,7 +76,7 @@ config MACH_IM4004
config MACH_IM42xx config MACH_IM42xx
bool "OpenGear IM42xx" bool "OpenGear IM42xx"
select MIGHT_HAVE_PCI select HAVE_PCI
help help
Say 'Y' here if you want your kernel to support the OpenGear Say 'Y' here if you want your kernel to support the OpenGear
IM4216 or IM4248 Console Servers. See http://www.opengear.com for IM4216 or IM4248 Console Servers. See http://www.opengear.com for
......
arch/arm/mach-mv78xx0/Kconfig
View file @ 19530313
...@@ -4,7 +4,7 @@ menuconfig ARCH_MV78XX0 ...@@ -4,7 +4,7 @@ menuconfig ARCH_MV78XX0
select CPU_FEROCEON select CPU_FEROCEON
select GPIOLIB select GPIOLIB
select MVEBU_MBUS select MVEBU_MBUS
select PCI select FORCE_PCI
select PLAT_ORION_LEGACY select PLAT_ORION_LEGACY
help help
Support for the following Marvell MV78xx0 series SoCs: Support for the following Marvell MV78xx0 series SoCs:
......
arch/arm/mach-mvebu/Kconfig
View file @ 19530313
...@@ -124,7 +124,7 @@ config MACH_KIRKWOOD ...@@ -124,7 +124,7 @@ config MACH_KIRKWOOD
select MACH_MVEBU_ANY select MACH_MVEBU_ANY
select ORION_IRQCHIP select ORION_IRQCHIP
select ORION_TIMER select ORION_TIMER
select PCI select FORCE_PCI
select PCI_QUIRKS select PCI_QUIRKS
select PINCTRL_KIRKWOOD select PINCTRL_KIRKWOOD
help help
......
arch/arm/mach-orion5x/Kconfig
View file @ 19530313
...@@ -5,7 +5,7 @@ menuconfig ARCH_ORION5X ...@@ -5,7 +5,7 @@ menuconfig ARCH_ORION5X
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GPIOLIB select GPIOLIB
select MVEBU_MBUS select MVEBU_MBUS
select PCI select FORCE_PCI
select PHYLIB if NETDEVICES select PHYLIB if NETDEVICES
select PLAT_ORION_LEGACY select PLAT_ORION_LEGACY
help help
......
arch/arm/mach-pxa/Kconfig
View file @ 19530313
...@@ -125,7 +125,7 @@ config MACH_ARMCORE ...@@ -125,7 +125,7 @@ config MACH_ARMCORE
bool "CompuLab CM-X255/CM-X270 modules" bool "CompuLab CM-X255/CM-X270 modules"
select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI
select IWMMXT select IWMMXT
select MIGHT_HAVE_PCI select HAVE_PCI
select NEED_MACH_IO_H if PCI select NEED_MACH_IO_H if PCI
select PXA25x select PXA25x
select PXA27x select PXA27x
......
arch/arm/mach-sa1100/Kconfig
View file @ 19530313
...@@ -120,7 +120,7 @@ config SA1100_LART ...@@ -120,7 +120,7 @@ config SA1100_LART
config SA1100_NANOENGINE config SA1100_NANOENGINE
bool "nanoEngine" bool "nanoEngine"
select ARM_SA1110_CPUFREQ select ARM_SA1110_CPUFREQ
select PCI select FORCE_PCI
select PCI_NANOENGINE select PCI_NANOENGINE
help help
Say Y here if you are using the Bright Star Engineering nanoEngine. Say Y here if you are using the Bright Star Engineering nanoEngine.
......
arch/arm/mach-socfpga/Kconfig
View file @ 19530313
...@@ -10,7 +10,7 @@ menuconfig ARCH_SOCFPGA ...@@ -10,7 +10,7 @@ menuconfig ARCH_SOCFPGA
select HAVE_ARM_SCU select HAVE_ARM_SCU
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select MFD_SYSCON select MFD_SYSCON
select PCI_DOMAINS if PCI select PCI_DOMAINS_GENERIC if PCI
if ARCH_SOCFPGA if ARCH_SOCFPGA
config SOCFPGA_SUSPEND config SOCFPGA_SUSPEND
......
arch/arm64/Kconfig
View file @ 19530313
...@@ -102,6 +102,7 @@ config ARM64 ...@@ -102,6 +102,7 @@ config ARM64
select GENERIC_TIME_VSYSCALL select GENERIC_TIME_VSYSCALL
select HANDLE_DOMAIN_IRQ select HANDLE_DOMAIN_IRQ
select HARDIRQS_SW_RESEND select HARDIRQS_SW_RESEND
select HAVE_PCI
select HAVE_ACPI_APEI if (ACPI && EFI) select HAVE_ACPI_APEI if (ACPI && EFI)
select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_ALIGNED_STRUCT_PAGE if SLUB
select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_AUDITSYSCALL
...@@ -163,7 +164,9 @@ config ARM64 ...@@ -163,7 +164,9 @@ config ARM64
select OF select OF
select OF_EARLY_FLATTREE select OF_EARLY_FLATTREE
select OF_RESERVED_MEM select OF_RESERVED_MEM
select PCI_DOMAINS_GENERIC if PCI
select PCI_ECAM if (ACPI && PCI) select PCI_ECAM if (ACPI && PCI)
select PCI_SYSCALL if PCI
select POWER_RESET select POWER_RESET
select POWER_SUPPLY select POWER_SUPPLY
select REFCOUNT_FULL select REFCOUNT_FULL
...@@ -290,28 +293,6 @@ config ARCH_PROC_KCORE_TEXT ...@@ -290,28 +293,6 @@ config ARCH_PROC_KCORE_TEXT
source "arch/arm64/Kconfig.platforms" source "arch/arm64/Kconfig.platforms"
menu "Bus support"
config PCI
bool "PCI support"
help
This feature enables support for PCI bus system. If you say Y
here, the kernel will include drivers and infrastructure code
to support PCI bus devices.
config PCI_DOMAINS
def_bool PCI
config PCI_DOMAINS_GENERIC
def_bool PCI
config PCI_SYSCALL
def_bool PCI
source "drivers/pci/Kconfig"
endmenu
menu "Kernel Features" menu "Kernel Features"
menu "ARM errata workarounds via the alternatives framework" menu "ARM errata workarounds via the alternatives framework"
......
arch/hexagon/Kconfig
View file @ 19530313
...@@ -46,9 +46,6 @@ config FRAME_POINTER ...@@ -46,9 +46,6 @@ config FRAME_POINTER
config LOCKDEP_SUPPORT config LOCKDEP_SUPPORT
def_bool y def_bool y
config PCI
def_bool n
config EARLY_PRINTK config EARLY_PRINTK
def_bool y def_bool y
......
arch/ia64/Kconfig
View file @ 19530313
...@@ -10,11 +10,13 @@ config IA64 ...@@ -10,11 +10,13 @@ config IA64
bool bool
select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_MIGHT_HAVE_PC_SERIO
select PCI if (!IA64_HP_SIM)
select ACPI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM)
select ARCH_SUPPORTS_ACPI if (!IA64_HP_SIM) select ARCH_SUPPORTS_ACPI if (!IA64_HP_SIM)
select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
select FORCE_PCI if (!IA64_HP_SIM)
select PCI_DOMAINS if PCI
select PCI_SYSCALL if PCI
select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_EXIT_THREAD select HAVE_EXIT_THREAD
select HAVE_IDE select HAVE_IDE
...@@ -540,30 +542,6 @@ endif ...@@ -540,30 +542,6 @@ endif
endmenu endmenu
if !IA64_HP_SIM
menu "Bus options (PCI, PCMCIA)"
config PCI
bool "PCI support"
help
Real IA-64 machines all have PCI/PCI-X/PCI Express busses. Say Y
here unless you are using a simulator without PCI support.
config PCI_DOMAINS
def_bool PCI
config PCI_SYSCALL
def_bool PCI
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
endmenu
endif
source "arch/ia64/hp/sim/Kconfig" source "arch/ia64/hp/sim/Kconfig"
config MSPEC config MSPEC
......
arch/m68k/Kconfig.bus
View file @ 19530313
...@@ -63,22 +63,9 @@ source "drivers/zorro/Kconfig" ...@@ -63,22 +63,9 @@ source "drivers/zorro/Kconfig"
endif endif
config PCI
bool "PCI support"
depends on M54xx
help
Enable the PCI bus. Support for the PCI bus hardware built into the
ColdFire 547x and 548x processors.
if PCI
source "drivers/pci/Kconfig"
endif
if !MMU if !MMU
config ISA_DMA_API config ISA_DMA_API
def_bool !M5272 def_bool !M5272
source "drivers/pcmcia/Kconfig"
endif endif
arch/m68k/Kconfig.cpu
View file @ 19530313
...@@ -299,6 +299,7 @@ config M53xx ...@@ -299,6 +299,7 @@ config M53xx
bool bool
config M54xx config M54xx
select HAVE_PCI
bool bool
endif # COLDFIRE endif # COLDFIRE
......
arch/microblaze/Kconfig
View file @ 19530313
...@@ -29,11 +29,14 @@ config MICROBLAZE ...@@ -29,11 +29,14 @@ config MICROBLAZE
select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACER
select HAVE_MEMBLOCK_NODE_MAP select HAVE_MEMBLOCK_NODE_MAP
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_PCI
select IRQ_DOMAIN select IRQ_DOMAIN
select XILINX_INTC select XILINX_INTC
select MODULES_USE_ELF_RELA select MODULES_USE_ELF_RELA
select OF select OF
select OF_EARLY_FLATTREE select OF_EARLY_FLATTREE
select PCI_DOMAINS_GENERIC if PCI
select PCI_SYSCALL if PCI
select TRACING_SUPPORT select TRACING_SUPPORT
select VIRT_TO_BUS select VIRT_TO_BUS
select CPU_NO_EFFICIENT_FFS select CPU_NO_EFFICIENT_FFS
...@@ -265,22 +268,8 @@ endmenu ...@@ -265,22 +268,8 @@ endmenu
menu "Bus Options" menu "Bus Options"
config PCI
bool "PCI support"
config PCI_DOMAINS
def_bool PCI
config PCI_DOMAINS_GENERIC
def_bool PCI_DOMAINS
config PCI_SYSCALL
def_bool PCI
config PCI_XILINX config PCI_XILINX
bool "Xilinx PCI host bridge support" bool "Xilinx PCI host bridge support"
depends on PCI depends on PCI
source "drivers/pci/Kconfig"
endmenu endmenu
arch/mips/Kconfig
View file @ 19530313
...@@ -25,6 +25,7 @@ config MIPS ...@@ -25,6 +25,7 @@ config MIPS
select GENERIC_IOMAP select GENERIC_IOMAP
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select GENERIC_ISA_DMA if EISA
select GENERIC_LIB_ASHLDI3 select GENERIC_LIB_ASHLDI3
select GENERIC_LIB_ASHRDI3 select GENERIC_LIB_ASHRDI3
select GENERIC_LIB_CMPDI2 select GENERIC_LIB_CMPDI2
...@@ -74,6 +75,7 @@ config MIPS ...@@ -74,6 +75,7 @@ config MIPS
select HAVE_SYSCALL_TRACEPOINTS select HAVE_SYSCALL_TRACEPOINTS
select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT || !SMP select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT || !SMP
select IRQ_FORCED_THREADING select IRQ_FORCED_THREADING
select ISA if EISA
select MODULES_USE_ELF_RELA if MODULES && 64BIT select MODULES_USE_ELF_RELA if MODULES && 64BIT
select MODULES_USE_ELF_REL if MODULES select MODULES_USE_ELF_REL if MODULES
select PERF_USE_VMALLOC select PERF_USE_VMALLOC
...@@ -98,7 +100,7 @@ config MIPS_GENERIC ...@@ -98,7 +100,7 @@ config MIPS_GENERIC
select CPU_MIPSR2_IRQ_EI select CPU_MIPSR2_IRQ_EI
select CSRC_R4K select CSRC_R4K
select DMA_PERDEV_COHERENT select DMA_PERDEV_COHERENT
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select LIBFDT select LIBFDT
select MIPS_AUTO_PFN_OFFSET select MIPS_AUTO_PFN_OFFSET
...@@ -259,7 +261,7 @@ config BCM47XX ...@@ -259,7 +261,7 @@ config BCM47XX
select CEVT_R4K select CEVT_R4K
select CSRC_R4K select CSRC_R4K
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select SYS_HAS_CPU_MIPS32_R1 select SYS_HAS_CPU_MIPS32_R1
select NO_EXCEPT_FILL select NO_EXCEPT_FILL
...@@ -302,13 +304,12 @@ config MIPS_COBALT ...@@ -302,13 +304,12 @@ config MIPS_COBALT
select CSRC_R4K select CSRC_R4K
select CEVT_GT641XX select CEVT_GT641XX
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_PCI select FORCE_PCI
select I8253 select I8253
select I8259 select I8259
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select IRQ_GT641XX select IRQ_GT641XX
select PCI_GT64XXX_PCI0 select PCI_GT64XXX_PCI0
select PCI
select SYS_HAS_CPU_NEVADA select SYS_HAS_CPU_NEVADA
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
...@@ -425,7 +426,7 @@ config LASAT ...@@ -425,7 +426,7 @@ config LASAT
select CSRC_R4K select CSRC_R4K
select DMA_NONCOHERENT select DMA_NONCOHERENT
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select PCI_GT64XXX_PCI0 select PCI_GT64XXX_PCI0
select MIPS_NILE4 select MIPS_NILE4
...@@ -503,7 +504,7 @@ config MIPS_MALTA ...@@ -503,7 +504,7 @@ config MIPS_MALTA
select DMA_MAYBE_COHERENT select DMA_MAYBE_COHERENT
select GENERIC_ISA_DMA select GENERIC_ISA_DMA
select HAVE_PCSPKR_PLATFORM select HAVE_PCSPKR_PLATFORM
select HW_HAS_PCI select HAVE_PCI
select I8253 select I8253
select I8259 select I8259
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
...@@ -557,7 +558,7 @@ config MACH_PIC32 ...@@ -557,7 +558,7 @@ config MACH_PIC32
config NEC_MARKEINS config NEC_MARKEINS
bool "NEC EMMA2RH Mark-eins board" bool "NEC EMMA2RH Mark-eins board"
select SOC_EMMA2RH select SOC_EMMA2RH
select HW_HAS_PCI select HAVE_PCI
help help
This enables support for the NEC Electronics Mark-eins boards. This enables support for the NEC Electronics Mark-eins boards.
...@@ -634,7 +635,7 @@ config SGI_IP22 ...@@ -634,7 +635,7 @@ config SGI_IP22
select CSRC_R4K select CSRC_R4K
select DEFAULT_SGI_PARTITION select DEFAULT_SGI_PARTITION
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_EISA select HAVE_EISA
select I8253 select I8253
select I8259 select I8259
select IP22_CPU_SCACHE select IP22_CPU_SCACHE
...@@ -674,7 +675,7 @@ config SGI_IP27 ...@@ -674,7 +675,7 @@ config SGI_IP27
select BOOT_ELF64 select BOOT_ELF64
select DEFAULT_SGI_PARTITION select DEFAULT_SGI_PARTITION
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
select HW_HAS_PCI select HAVE_PCI
select NR_CPUS_DEFAULT_64 select NR_CPUS_DEFAULT_64
select SYS_HAS_CPU_R10000 select SYS_HAS_CPU_R10000
select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL
...@@ -699,7 +700,7 @@ config SGI_IP28 ...@@ -699,7 +700,7 @@ config SGI_IP28
select DMA_NONCOHERENT select DMA_NONCOHERENT
select GENERIC_ISA_DMA_SUPPORT_BROKEN select GENERIC_ISA_DMA_SUPPORT_BROKEN
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select HW_HAS_EISA select HAVE_EISA
select I8253 select I8253
select I8259 select I8259
select SGI_HAS_I8042 select SGI_HAS_I8042
...@@ -734,7 +735,7 @@ config SGI_IP32 ...@@ -734,7 +735,7 @@ config SGI_IP32
select CEVT_R4K select CEVT_R4K
select CSRC_R4K select CSRC_R4K
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select R5000_CPU_SCACHE select R5000_CPU_SCACHE
select RM7000_CPU_SCACHE select RM7000_CPU_SCACHE
...@@ -846,9 +847,9 @@ config SNI_RM ...@@ -846,9 +847,9 @@ config SNI_RM
select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN
select DMA_NONCOHERENT select DMA_NONCOHERENT
select GENERIC_ISA_DMA select GENERIC_ISA_DMA
select HAVE_EISA
select HAVE_PCSPKR_PLATFORM select HAVE_PCSPKR_PLATFORM
select HW_HAS_EISA select HAVE_PCI
select HW_HAS_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select I8253 select I8253
select I8259 select I8259
...@@ -881,7 +882,7 @@ config MIKROTIK_RB532 ...@@ -881,7 +882,7 @@ config MIKROTIK_RB532
select CEVT_R4K select CEVT_R4K
select CSRC_R4K select CSRC_R4K
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select SYS_HAS_CPU_MIPS32_R1 select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
...@@ -898,7 +899,7 @@ config CAVIUM_OCTEON_SOC ...@@ -898,7 +899,7 @@ config CAVIUM_OCTEON_SOC
bool "Cavium Networks Octeon SoC based boards" bool "Cavium Networks Octeon SoC based boards"
select CEVT_R4K select CEVT_R4K
select ARCH_HAS_PHYS_TO_DMA select ARCH_HAS_PHYS_TO_DMA
select HAS_RAPIDIO select HAVE_RAPIDIO
select PHYS_ADDR_T_64BIT select PHYS_ADDR_T_64BIT
select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL
select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_BIG_ENDIAN
...@@ -908,7 +909,7 @@ config CAVIUM_OCTEON_SOC ...@@ -908,7 +909,7 @@ config CAVIUM_OCTEON_SOC
select SYS_SUPPORTS_HOTPLUG_CPU if CPU_BIG_ENDIAN select SYS_SUPPORTS_HOTPLUG_CPU if CPU_BIG_ENDIAN
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
select SYS_HAS_CPU_CAVIUM_OCTEON select SYS_HAS_CPU_CAVIUM_OCTEON
select HW_HAS_PCI select HAVE_PCI
select ZONE_DMA32 select ZONE_DMA32
select HOLES_IN_ZONE select HOLES_IN_ZONE
select GPIOLIB select GPIOLIB
...@@ -941,7 +942,7 @@ config NLM_XLR_BOARD ...@@ -941,7 +942,7 @@ config NLM_XLR_BOARD
select NLM_COMMON select NLM_COMMON
select SYS_HAS_CPU_XLR select SYS_HAS_CPU_XLR
select SYS_SUPPORTS_SMP select SYS_SUPPORTS_SMP
select HW_HAS_PCI select HAVE_PCI
select SWAP_IO_SPACE select SWAP_IO_SPACE
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL
...@@ -967,7 +968,7 @@ config NLM_XLP_BOARD ...@@ -967,7 +968,7 @@ config NLM_XLP_BOARD
select NLM_COMMON select NLM_COMMON
select SYS_HAS_CPU_XLP select SYS_HAS_CPU_XLP
select SYS_SUPPORTS_SMP select SYS_SUPPORTS_SMP
select HW_HAS_PCI select HAVE_PCI
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL
select PHYS_ADDR_T_64BIT select PHYS_ADDR_T_64BIT
...@@ -1002,7 +1003,7 @@ config MIPS_PARAVIRT ...@@ -1002,7 +1003,7 @@ config MIPS_PARAVIRT
select SYS_HAS_CPU_MIPS32_R2 select SYS_HAS_CPU_MIPS32_R2
select SYS_HAS_CPU_MIPS64_R2 select SYS_HAS_CPU_MIPS64_R2
select SYS_HAS_CPU_CAVIUM_OCTEON select SYS_HAS_CPU_CAVIUM_OCTEON
select HW_HAS_PCI select HAVE_PCI
select SWAP_IO_SPACE select SWAP_IO_SPACE
help help
This option supports guest running under ???? This option supports guest running under ????
...@@ -3063,47 +3064,14 @@ config MIPS_AUTO_PFN_OFFSET ...@@ -3063,47 +3064,14 @@ config MIPS_AUTO_PFN_OFFSET
menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
config HW_HAS_EISA
bool
config HW_HAS_PCI
bool
config PCI
bool "Support for PCI controller"
depends on HW_HAS_PCI
select PCI_DOMAINS
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
say Y, otherwise N.
config HT_PCI
bool "Support for HT-linked PCI"
default y
depends on CPU_LOONGSON3
select PCI
select PCI_DOMAINS
help
Loongson family machines use Hyper-Transport bus for inter-core
connection and device connection. The PCI bus is a subordinate
linked at HT. Choose Y for Loongson-3 based machines.
config PCI_DOMAINS
bool
config PCI_DOMAINS_GENERIC
bool
config PCI_DRIVERS_GENERIC config PCI_DRIVERS_GENERIC
select PCI_DOMAINS_GENERIC if PCI_DOMAINS select PCI_DOMAINS_GENERIC if PCI
bool bool
config PCI_DRIVERS_LEGACY config PCI_DRIVERS_LEGACY
def_bool !PCI_DRIVERS_GENERIC def_bool !PCI_DRIVERS_GENERIC
select NO_GENERIC_PCI_IOPORT_MAP select NO_GENERIC_PCI_IOPORT_MAP
select PCI_DOMAINS if PCI
source "drivers/pci/Kconfig"
# #
# ISA support is now enabled via select. Too many systems still have the one # ISA support is now enabled via select. Too many systems still have the one
...@@ -3113,26 +3081,6 @@ source "drivers/pci/Kconfig" ...@@ -3113,26 +3081,6 @@ source "drivers/pci/Kconfig"
config ISA config ISA
bool bool
config EISA
bool "EISA support"
depends on HW_HAS_EISA
select ISA
select GENERIC_ISA_DMA
---help---
The Extended Industry Standard Architecture (EISA) bus was
developed as an open alternative to the IBM MicroChannel bus.
The EISA bus provided some of the features of the IBM MicroChannel
bus while maintaining backward compatibility with cards made for
the older ISA bus. The EISA bus saw limited use between 1988 and
1995 when it was made obsolete by the PCI bus.
Say Y here if you are building a kernel for an EISA-based machine.
Otherwise, say N.
source "drivers/eisa/Kconfig"
config TC config TC
bool "TURBOchannel support" bool "TURBOchannel support"
depends on MACH_DECSTATION depends on MACH_DECSTATION
...@@ -3176,21 +3124,6 @@ config ZONE_DMA ...@@ -3176,21 +3124,6 @@ config ZONE_DMA
config ZONE_DMA32 config ZONE_DMA32
bool bool
source "drivers/pcmcia/Kconfig"
config HAS_RAPIDIO
bool
default n
config RAPIDIO
tristate "RapidIO support"
depends on HAS_RAPIDIO || PCI
help
If you say Y here, the kernel will include drivers and
infrastructure code to support RapidIO interconnect devices.
source "drivers/rapidio/Kconfig"
endmenu endmenu
config TRAD_SIGNALS config TRAD_SIGNALS
......
arch/mips/alchemy/Kconfig
View file @ 19530313
...@@ -14,7 +14,7 @@ choice ...@@ -14,7 +14,7 @@ choice
config MIPS_MTX1 config MIPS_MTX1
bool "4G Systems MTX-1 board" bool "4G Systems MTX-1 board"
select HW_HAS_PCI select HAVE_PCI
select ALCHEMY_GPIOINT_AU1000 select ALCHEMY_GPIOINT_AU1000
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
...@@ -22,7 +22,7 @@ config MIPS_MTX1 ...@@ -22,7 +22,7 @@ config MIPS_MTX1
config MIPS_DB1XXX config MIPS_DB1XXX
bool "Alchemy DB1XXX / PB1XXX boards" bool "Alchemy DB1XXX / PB1XXX boards"
select GPIOLIB select GPIOLIB
select HW_HAS_PCI select HAVE_PCI
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
help help
...@@ -40,7 +40,7 @@ config MIPS_XXS1500 ...@@ -40,7 +40,7 @@ config MIPS_XXS1500
config MIPS_GPR config MIPS_GPR
bool "Trapeze ITS GPR board" bool "Trapeze ITS GPR board"
select ALCHEMY_GPIOINT_AU1000 select ALCHEMY_GPIOINT_AU1000
select HW_HAS_PCI select HAVE_PCI
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
......
arch/mips/ath25/Kconfig
View file @ 19530313
...@@ -13,6 +13,5 @@ config PCI_AR2315 ...@@ -13,6 +13,5 @@ config PCI_AR2315
bool "Atheros AR2315 PCI controller support" bool "Atheros AR2315 PCI controller support"
depends on SOC_AR2315 depends on SOC_AR2315
select ARCH_HAS_PHYS_TO_DMA select ARCH_HAS_PHYS_TO_DMA
select HW_HAS_PCI select FORCE_PCI
select PCI
default y default y
arch/mips/ath79/Kconfig
View file @ 19530313
...@@ -75,11 +75,11 @@ config ATH79_MACH_UBNT_XM ...@@ -75,11 +75,11 @@ config ATH79_MACH_UBNT_XM
endmenu endmenu
config SOC_AR71XX config SOC_AR71XX
select HW_HAS_PCI select HAVE_PCI
def_bool n def_bool n
config SOC_AR724X config SOC_AR724X
select HW_HAS_PCI select HAVE_PCI
select PCI_AR724X if PCI select PCI_AR724X if PCI
def_bool n def_bool n
...@@ -90,12 +90,12 @@ config SOC_AR933X ...@@ -90,12 +90,12 @@ config SOC_AR933X
def_bool n def_bool n
config SOC_AR934X config SOC_AR934X
select HW_HAS_PCI select HAVE_PCI
select PCI_AR724X if PCI select PCI_AR724X if PCI
def_bool n def_bool n
config SOC_QCA955X config SOC_QCA955X
select HW_HAS_PCI select HAVE_PCI
select PCI_AR724X if PCI select PCI_AR724X if PCI
def_bool n def_bool n
......
arch/mips/bcm63xx/Kconfig
View file @ 19530313
...@@ -5,17 +5,17 @@ menu "CPU support" ...@@ -5,17 +5,17 @@ menu "CPU support"
config BCM63XX_CPU_3368 config BCM63XX_CPU_3368
bool "support 3368 CPU" bool "support 3368 CPU"
select SYS_HAS_CPU_BMIPS4350 select SYS_HAS_CPU_BMIPS4350
select HW_HAS_PCI select HAVE_PCI
config BCM63XX_CPU_6328 config BCM63XX_CPU_6328
bool "support 6328 CPU" bool "support 6328 CPU"
select SYS_HAS_CPU_BMIPS4350 select SYS_HAS_CPU_BMIPS4350
select HW_HAS_PCI select HAVE_PCI
config BCM63XX_CPU_6338 config BCM63XX_CPU_6338
bool "support 6338 CPU" bool "support 6338 CPU"
select SYS_HAS_CPU_BMIPS32_3300 select SYS_HAS_CPU_BMIPS32_3300
select HW_HAS_PCI select HAVE_PCI
config BCM63XX_CPU_6345 config BCM63XX_CPU_6345
bool "support 6345 CPU" bool "support 6345 CPU"
...@@ -24,22 +24,22 @@ config BCM63XX_CPU_6345 ...@@ -24,22 +24,22 @@ config BCM63XX_CPU_6345
config BCM63XX_CPU_6348 config BCM63XX_CPU_6348
bool "support 6348 CPU" bool "support 6348 CPU"
select SYS_HAS_CPU_BMIPS32_3300 select SYS_HAS_CPU_BMIPS32_3300
select HW_HAS_PCI select HAVE_PCI
config BCM63XX_CPU_6358 config BCM63XX_CPU_6358
bool "support 6358 CPU" bool "support 6358 CPU"
select SYS_HAS_CPU_BMIPS4350 select SYS_HAS_CPU_BMIPS4350
select HW_HAS_PCI select HAVE_PCI
config BCM63XX_CPU_6362 config BCM63XX_CPU_6362
bool "support 6362 CPU" bool "support 6362 CPU"
select SYS_HAS_CPU_BMIPS4350 select SYS_HAS_CPU_BMIPS4350
select HW_HAS_PCI select HAVE_PCI
config BCM63XX_CPU_6368 config BCM63XX_CPU_6368
bool "support 6368 CPU" bool "support 6368 CPU"
select SYS_HAS_CPU_BMIPS4350 select SYS_HAS_CPU_BMIPS4350
select HW_HAS_PCI select HAVE_PCI
endmenu endmenu
source "arch/mips/bcm63xx/boards/Kconfig" source "arch/mips/bcm63xx/boards/Kconfig"
arch/mips/include/asm/mach-loongson64/loongson.h
View file @ 19530313
...@@ -113,7 +113,7 @@ static inline void do_perfcnt_IRQ(void) ...@@ -113,7 +113,7 @@ static inline void do_perfcnt_IRQ(void)
#define LOONGSON_PCICFG_SIZE 0x00000800 /* 2K */ #define LOONGSON_PCICFG_SIZE 0x00000800 /* 2K */
#define LOONGSON_PCICFG_TOP (LOONGSON_PCICFG_BASE+LOONGSON_PCICFG_SIZE-1) #define LOONGSON_PCICFG_TOP (LOONGSON_PCICFG_BASE+LOONGSON_PCICFG_SIZE-1)
#if defined(CONFIG_HT_PCI) #ifdef CONFIG_CPU_LOONGSON3
#define LOONGSON_PCIIO_BASE loongson_sysconf.pci_io_base #define LOONGSON_PCIIO_BASE loongson_sysconf.pci_io_base
#else #else
#define LOONGSON_PCIIO_BASE 0x1fd00000 #define LOONGSON_PCIIO_BASE 0x1fd00000
......
arch/mips/lantiq/Kconfig
View file @ 19530313
...@@ -19,7 +19,7 @@ config SOC_AMAZON_SE ...@@ -19,7 +19,7 @@ config SOC_AMAZON_SE
config SOC_XWAY config SOC_XWAY
bool "XWAY" bool "XWAY"
select SOC_TYPE_XWAY select SOC_TYPE_XWAY
select HW_HAS_PCI select HAVE_PCI
select MFD_SYSCON select MFD_SYSCON
select MFD_CORE select MFD_CORE
......
arch/mips/loongson64/Kconfig
View file @ 19530313
...@@ -15,7 +15,7 @@ config LEMOTE_FULOONG2E ...@@ -15,7 +15,7 @@ config LEMOTE_FULOONG2E
select DMA_NONCOHERENT select DMA_NONCOHERENT
select BOOT_ELF32 select BOOT_ELF32
select BOARD_SCACHE select BOARD_SCACHE
select HW_HAS_PCI select HAVE_PCI
select I8259 select I8259
select ISA select ISA
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
...@@ -46,7 +46,7 @@ config LEMOTE_MACH2F ...@@ -46,7 +46,7 @@ config LEMOTE_MACH2F
select DMA_NONCOHERENT select DMA_NONCOHERENT
select GENERIC_ISA_DMA_SUPPORT_BROKEN select GENERIC_ISA_DMA_SUPPORT_BROKEN
select HAVE_CLK select HAVE_CLK
select HW_HAS_PCI select HAVE_PCI
select I8259 select I8259
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select ISA select ISA
...@@ -74,9 +74,8 @@ config LOONGSON_MACH3X ...@@ -74,9 +74,8 @@ config LOONGSON_MACH3X
select CSRC_R4K select CSRC_R4K
select CEVT_R4K select CEVT_R4K
select CPU_HAS_WB select CPU_HAS_WB
select HW_HAS_PCI select FORCE_PCI
select ISA select ISA
select HT_PCI
select I8259 select I8259
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select NR_CPUS_DEFAULT_4 select NR_CPUS_DEFAULT_4
......
arch/mips/pmcs-msp71xx/Kconfig
View file @ 19530313
...@@ -6,25 +6,25 @@ choice ...@@ -6,25 +6,25 @@ choice
config PMC_MSP4200_EVAL config PMC_MSP4200_EVAL
bool "PMC-Sierra MSP4200 Eval Board" bool "PMC-Sierra MSP4200 Eval Board"
select IRQ_MSP_SLP select IRQ_MSP_SLP
select HW_HAS_PCI select HAVE_PCI
select MIPS_L1_CACHE_SHIFT_4 select MIPS_L1_CACHE_SHIFT_4
config PMC_MSP4200_GW config PMC_MSP4200_GW
bool "PMC-Sierra MSP4200 VoIP Gateway" bool "PMC-Sierra MSP4200 VoIP Gateway"
select IRQ_MSP_SLP select IRQ_MSP_SLP
select HW_HAS_PCI select HAVE_PCI
config PMC_MSP7120_EVAL config PMC_MSP7120_EVAL
bool "PMC-Sierra MSP7120 Eval Board" bool "PMC-Sierra MSP7120 Eval Board"
select SYS_SUPPORTS_MULTITHREADING select SYS_SUPPORTS_MULTITHREADING
select IRQ_MSP_CIC select IRQ_MSP_CIC
select HW_HAS_PCI select HAVE_PCI
config PMC_MSP7120_GW config PMC_MSP7120_GW
bool "PMC-Sierra MSP7120 Residential Gateway" bool "PMC-Sierra MSP7120 Residential Gateway"
select SYS_SUPPORTS_MULTITHREADING select SYS_SUPPORTS_MULTITHREADING
select IRQ_MSP_CIC select IRQ_MSP_CIC
select HW_HAS_PCI select HAVE_PCI
select MSP_HAS_USB select MSP_HAS_USB
select MSP_ETH select MSP_ETH
...@@ -32,7 +32,7 @@ config PMC_MSP7120_FPGA ...@@ -32,7 +32,7 @@ config PMC_MSP7120_FPGA
bool "PMC-Sierra MSP7120 FPGA" bool "PMC-Sierra MSP7120 FPGA"
select SYS_SUPPORTS_MULTITHREADING select SYS_SUPPORTS_MULTITHREADING
select IRQ_MSP_CIC select IRQ_MSP_CIC
select HW_HAS_PCI select HAVE_PCI
endchoice endchoice
......
arch/mips/ralink/Kconfig
View file @ 19530313
...@@ -27,18 +27,18 @@ choice ...@@ -27,18 +27,18 @@ choice
config SOC_RT288X config SOC_RT288X
bool "RT288x" bool "RT288x"
select MIPS_L1_CACHE_SHIFT_4 select MIPS_L1_CACHE_SHIFT_4
select HW_HAS_PCI select HAVE_PCI
config SOC_RT305X config SOC_RT305X
bool "RT305x" bool "RT305x"
config SOC_RT3883 config SOC_RT3883
bool "RT3883" bool "RT3883"
select HW_HAS_PCI select HAVE_PCI
config SOC_MT7620 config SOC_MT7620
bool "MT7620/8" bool "MT7620/8"
select HW_HAS_PCI select HAVE_PCI
config SOC_MT7621 config SOC_MT7621
bool "MT7621" bool "MT7621"
...@@ -50,7 +50,7 @@ choice ...@@ -50,7 +50,7 @@ choice
select MIPS_GIC select MIPS_GIC
select COMMON_CLK select COMMON_CLK
select CLKSRC_MIPS_GIC select CLKSRC_MIPS_GIC
select HW_HAS_PCI select HAVE_PCI
endchoice endchoice
choice choice
......
arch/mips/sibyte/Kconfig
View file @ 19530313
...@@ -3,7 +3,7 @@ config SIBYTE_SB1250 ...@@ -3,7 +3,7 @@ config SIBYTE_SB1250
bool bool
select CEVT_SB1250 select CEVT_SB1250
select CSRC_SB1250 select CSRC_SB1250
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select SIBYTE_ENABLE_LDT_IF_PCI select SIBYTE_ENABLE_LDT_IF_PCI
select SIBYTE_HAS_ZBUS_PROFILING select SIBYTE_HAS_ZBUS_PROFILING
...@@ -23,7 +23,7 @@ config SIBYTE_BCM1125 ...@@ -23,7 +23,7 @@ config SIBYTE_BCM1125
bool bool
select CEVT_SB1250 select CEVT_SB1250
select CSRC_SB1250 select CSRC_SB1250
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select SIBYTE_BCM112X select SIBYTE_BCM112X
select SIBYTE_HAS_ZBUS_PROFILING select SIBYTE_HAS_ZBUS_PROFILING
...@@ -33,7 +33,7 @@ config SIBYTE_BCM1125H ...@@ -33,7 +33,7 @@ config SIBYTE_BCM1125H
bool bool
select CEVT_SB1250 select CEVT_SB1250
select CSRC_SB1250 select CSRC_SB1250
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select SIBYTE_BCM112X select SIBYTE_BCM112X
select SIBYTE_ENABLE_LDT_IF_PCI select SIBYTE_ENABLE_LDT_IF_PCI
...@@ -52,7 +52,7 @@ config SIBYTE_BCM1x80 ...@@ -52,7 +52,7 @@ config SIBYTE_BCM1x80
bool bool
select CEVT_BCM1480 select CEVT_BCM1480
select CSRC_BCM1480 select CSRC_BCM1480
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select SIBYTE_HAS_ZBUS_PROFILING select SIBYTE_HAS_ZBUS_PROFILING
select SIBYTE_SB1xxx_SOC select SIBYTE_SB1xxx_SOC
...@@ -62,7 +62,7 @@ config SIBYTE_BCM1x55 ...@@ -62,7 +62,7 @@ config SIBYTE_BCM1x55
bool bool
select CEVT_BCM1480 select CEVT_BCM1480
select CSRC_BCM1480 select CSRC_BCM1480
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select SIBYTE_SB1xxx_SOC select SIBYTE_SB1xxx_SOC
select SIBYTE_HAS_ZBUS_PROFILING select SIBYTE_HAS_ZBUS_PROFILING
......
arch/mips/txx9/Kconfig
View file @ 19530313
...@@ -59,7 +59,7 @@ config SOC_TX3927 ...@@ -59,7 +59,7 @@ config SOC_TX3927
bool bool
select CEVT_TXX9 select CEVT_TXX9
select HAS_TXX9_SERIAL select HAS_TXX9_SERIAL
select HW_HAS_PCI select HAVE_PCI
select IRQ_TXX9 select IRQ_TXX9
select GPIO_TXX9 select GPIO_TXX9
...@@ -67,7 +67,7 @@ config SOC_TX4927 ...@@ -67,7 +67,7 @@ config SOC_TX4927
bool bool
select CEVT_TXX9 select CEVT_TXX9
select HAS_TXX9_SERIAL select HAS_TXX9_SERIAL
select HW_HAS_PCI select HAVE_PCI
select IRQ_TXX9 select IRQ_TXX9
select PCI_TX4927 select PCI_TX4927
select GPIO_TXX9 select GPIO_TXX9
...@@ -77,7 +77,7 @@ config SOC_TX4938 ...@@ -77,7 +77,7 @@ config SOC_TX4938
bool bool
select CEVT_TXX9 select CEVT_TXX9
select HAS_TXX9_SERIAL select HAS_TXX9_SERIAL
select HW_HAS_PCI select HAVE_PCI
select IRQ_TXX9 select IRQ_TXX9
select PCI_TX4927 select PCI_TX4927
select GPIO_TXX9 select GPIO_TXX9
...@@ -87,7 +87,7 @@ config SOC_TX4939 ...@@ -87,7 +87,7 @@ config SOC_TX4939
bool bool
select CEVT_TXX9 select CEVT_TXX9
select HAS_TXX9_SERIAL select HAS_TXX9_SERIAL
select HW_HAS_PCI select HAVE_PCI
select PCI_TX4927 select PCI_TX4927
select HAS_TXX9_ACLC select HAS_TXX9_ACLC
......
arch/mips/vr41xx/Kconfig
View file @ 19530313
...@@ -30,7 +30,7 @@ config TANBAC_TB022X ...@@ -30,7 +30,7 @@ config TANBAC_TB022X
select CSRC_R4K select CSRC_R4K
select DMA_NONCOHERENT select DMA_NONCOHERENT
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select HW_HAS_PCI select HAVE_PCI
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
help help
...@@ -46,7 +46,7 @@ config VICTOR_MPC30X ...@@ -46,7 +46,7 @@ config VICTOR_MPC30X
select CSRC_R4K select CSRC_R4K
select DMA_NONCOHERENT select DMA_NONCOHERENT
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select HW_HAS_PCI select HAVE_PCI
select PCI_VR41XX select PCI_VR41XX
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
...@@ -57,7 +57,7 @@ config ZAO_CAPCELLA ...@@ -57,7 +57,7 @@ config ZAO_CAPCELLA
select CSRC_R4K select CSRC_R4K
select DMA_NONCOHERENT select DMA_NONCOHERENT
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select HW_HAS_PCI select HAVE_PCI
select PCI_VR41XX select PCI_VR41XX
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
...@@ -99,6 +99,6 @@ endchoice ...@@ -99,6 +99,6 @@ endchoice
config PCI_VR41XX config PCI_VR41XX
bool "Add PCI control unit support of NEC VR4100 series" bool "Add PCI control unit support of NEC VR4100 series"
depends on MACH_VR41XX && HW_HAS_PCI depends on MACH_VR41XX && HAVE_PCI
default y default y
select PCI select PCI
arch/parisc/Kconfig
View file @ 19530313
...@@ -18,6 +18,7 @@ config PARISC ...@@ -18,6 +18,7 @@ config PARISC
select INIT_ALL_POSSIBLE select INIT_ALL_POSSIBLE
select BUG select BUG
select BUILDTIME_EXTABLE_SORT select BUILDTIME_EXTABLE_SORT
select HAVE_PCI
select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS
select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_BZIP2
select HAVE_KERNEL_GZIP select HAVE_KERNEL_GZIP
......
arch/powerpc/Kconfig
View file @ 19530313
...@@ -168,6 +168,7 @@ config PPC ...@@ -168,6 +168,7 @@ config PPC
select GENERIC_CPU_VULNERABILITIES if PPC_BARRIER_NOSPEC select GENERIC_CPU_VULNERABILITIES if PPC_BARRIER_NOSPEC
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select GENERIC_IRQ_SHOW_LEVEL select GENERIC_IRQ_SHOW_LEVEL
select GENERIC_PCI_IOMAP if PCI
select GENERIC_SMP_IDLE_THREAD select GENERIC_SMP_IDLE_THREAD
select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER select GENERIC_STRNLEN_USER
...@@ -235,6 +236,8 @@ config PPC ...@@ -235,6 +236,8 @@ config PPC
select OF_RESERVED_MEM select OF_RESERVED_MEM
select OLD_SIGACTION if PPC32 select OLD_SIGACTION if PPC32
select OLD_SIGSUSPEND select OLD_SIGSUSPEND
select PCI_DOMAINS if PCI
select PCI_SYSCALL if PCI
select RTC_LIB select RTC_LIB
select SPARSE_IRQ select SPARSE_IRQ
select SYSCTL_EXCEPTION_TRACE select SYSCTL_EXCEPTION_TRACE
...@@ -879,9 +882,6 @@ config PPC_INDIRECT_PCI ...@@ -879,9 +882,6 @@ config PPC_INDIRECT_PCI
depends on PCI depends on PCI
default y if 40x || 44x default y if 40x || 44x
config EISA
bool
config SBUS config SBUS
bool bool
...@@ -926,59 +926,20 @@ config FSL_GTM ...@@ -926,59 +926,20 @@ config FSL_GTM
help help
Freescale General-purpose Timers support Freescale General-purpose Timers support
# Platforms that what PCI turned unconditionally just do select PCI
# in their config node. Platforms that want to choose at config
# time should select PPC_PCI_CHOICE
config PPC_PCI_CHOICE
bool
config PCI
bool "PCI support" if PPC_PCI_CHOICE
default y if !40x && !CPM2 && !PPC_8xx && !PPC_83xx \
&& !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
select GENERIC_PCI_IOMAP
help
Find out whether your system includes a PCI bus. PCI is the name of
a bus system, i.e. the way the CPU talks to the other stuff inside
your box. If you say Y here, the kernel will include drivers and
infrastructure code to support PCI bus devices.
config PCI_DOMAINS
def_bool PCI
config PCI_SYSCALL
def_bool PCI
config PCI_8260 config PCI_8260
bool bool
depends on PCI && 8260 depends on PCI && 8260
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
default y default y
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
config HAS_RAPIDIO
bool
config RAPIDIO
tristate "RapidIO support"
depends on HAS_RAPIDIO || PCI
help
If you say Y here, the kernel will include drivers and
infrastructure code to support RapidIO interconnect devices.
config FSL_RIO config FSL_RIO
bool "Freescale Embedded SRIO Controller support" bool "Freescale Embedded SRIO Controller support"
depends on RAPIDIO = y && HAS_RAPIDIO depends on RAPIDIO = y && HAVE_RAPIDIO
default "n" default "n"
---help--- ---help---
Include support for RapidIO controller on Freescale embedded Include support for RapidIO controller on Freescale embedded
processors (MPC8548, MPC8641, etc). processors (MPC8548, MPC8641, etc).
source "drivers/rapidio/Kconfig"
endmenu endmenu
config NONSTATIC_KERNEL config NONSTATIC_KERNEL
......
arch/powerpc/platforms/40x/Kconfig
View file @ 19530313
...@@ -11,7 +11,7 @@ config EP405 ...@@ -11,7 +11,7 @@ config EP405
bool "EP405/EP405PC" bool "EP405/EP405PC"
depends on 40x depends on 40x
select 405GP select 405GP
select PCI select FORCE_PCI
help help
This option enables support for the EP405/EP405PC boards. This option enables support for the EP405/EP405PC boards.
...@@ -19,7 +19,7 @@ config HOTFOOT ...@@ -19,7 +19,7 @@ config HOTFOOT
bool "Hotfoot" bool "Hotfoot"
depends on 40x depends on 40x
select PPC40x_SIMPLE select PPC40x_SIMPLE
select PCI select FORCE_PCI
help help
This option enables support for the ESTEEM 195E Hotfoot board. This option enables support for the ESTEEM 195E Hotfoot board.
...@@ -29,7 +29,7 @@ config KILAUEA ...@@ -29,7 +29,7 @@ config KILAUEA
select 405EX select 405EX
select PPC40x_SIMPLE select PPC40x_SIMPLE
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select PCI select FORCE_PCI
select PCI_MSI select PCI_MSI
select PPC4xx_MSI select PPC4xx_MSI
help help
...@@ -39,7 +39,7 @@ config MAKALU ...@@ -39,7 +39,7 @@ config MAKALU
bool "Makalu" bool "Makalu"
depends on 40x depends on 40x
select 405EX select 405EX
select PCI select FORCE_PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select PPC40x_SIMPLE select PPC40x_SIMPLE
help help
...@@ -50,7 +50,7 @@ config WALNUT ...@@ -50,7 +50,7 @@ config WALNUT
depends on 40x depends on 40x
default y default y
select 405GP select 405GP
select PCI select FORCE_PCI
select OF_RTC select OF_RTC
help help
This option enables support for the IBM PPC405GP evaluation board. This option enables support for the IBM PPC405GP evaluation board.
......
arch/powerpc/platforms/44x/Kconfig
View file @ 19530313
...@@ -12,7 +12,7 @@ config BAMBOO ...@@ -12,7 +12,7 @@ config BAMBOO
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select 440EP select 440EP
select PCI select FORCE_PCI
help help
This option enables support for the IBM PPC440EP evaluation board. This option enables support for the IBM PPC440EP evaluation board.
...@@ -21,7 +21,7 @@ config BLUESTONE ...@@ -21,7 +21,7 @@ config BLUESTONE
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select APM821xx select APM821xx
select PCI select FORCE_PCI
select PCI_MSI select PCI_MSI
select PPC4xx_MSI select PPC4xx_MSI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
...@@ -34,7 +34,7 @@ config EBONY ...@@ -34,7 +34,7 @@ config EBONY
depends on 44x depends on 44x
default y default y
select 440GP select 440GP
select PCI select FORCE_PCI
select OF_RTC select OF_RTC
help help
This option enables support for the IBM PPC440GP evaluation board. This option enables support for the IBM PPC440GP evaluation board.
...@@ -43,7 +43,7 @@ config SAM440EP ...@@ -43,7 +43,7 @@ config SAM440EP
bool "Sam440ep" bool "Sam440ep"
depends on 44x depends on 44x
select 440EP select 440EP
select PCI select FORCE_PCI
help help
This option enables support for the ACube Sam440ep board. This option enables support for the ACube Sam440ep board.
...@@ -60,7 +60,7 @@ config TAISHAN ...@@ -60,7 +60,7 @@ config TAISHAN
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select 440GX select 440GX
select PCI select FORCE_PCI
help help
This option enables support for the AMCC PPC440GX "Taishan" This option enables support for the AMCC PPC440GX "Taishan"
evaluation board. evaluation board.
...@@ -70,7 +70,7 @@ config KATMAI ...@@ -70,7 +70,7 @@ config KATMAI
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select 440SPe select 440SPe
select PCI select FORCE_PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select PCI_MSI select PCI_MSI
select PPC4xx_MSI select PPC4xx_MSI
...@@ -82,7 +82,7 @@ config RAINIER ...@@ -82,7 +82,7 @@ config RAINIER
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select 440GRX select 440GRX
select PCI select FORCE_PCI
help help
This option enables support for the AMCC PPC440GRX evaluation board. This option enables support for the AMCC PPC440GRX evaluation board.
...@@ -103,7 +103,7 @@ config ARCHES ...@@ -103,7 +103,7 @@ config ARCHES
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select 460EX # Odd since it uses 460GT but the effects are the same select 460EX # Odd since it uses 460GT but the effects are the same
select PCI select FORCE_PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
help help
This option enables support for the AMCC Dual PPC460GT evaluation board. This option enables support for the AMCC Dual PPC460GT evaluation board.
...@@ -112,7 +112,7 @@ config CANYONLANDS ...@@ -112,7 +112,7 @@ config CANYONLANDS
bool "Canyonlands" bool "Canyonlands"
depends on 44x depends on 44x
select 460EX select 460EX
select PCI select FORCE_PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select PCI_MSI select PCI_MSI
select PPC4xx_MSI select PPC4xx_MSI
...@@ -126,7 +126,7 @@ config GLACIER ...@@ -126,7 +126,7 @@ config GLACIER
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select 460EX # Odd since it uses 460GT but the effects are the same select 460EX # Odd since it uses 460GT but the effects are the same
select PCI select FORCE_PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select IBM_EMAC_RGMII if IBM_EMAC select IBM_EMAC_RGMII if IBM_EMAC
select IBM_EMAC_ZMII if IBM_EMAC select IBM_EMAC_ZMII if IBM_EMAC
...@@ -138,7 +138,7 @@ config REDWOOD ...@@ -138,7 +138,7 @@ config REDWOOD
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select 460SX select 460SX
select PCI select FORCE_PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select PCI_MSI select PCI_MSI
select PPC4xx_MSI select PPC4xx_MSI
...@@ -150,7 +150,7 @@ config EIGER ...@@ -150,7 +150,7 @@ config EIGER
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select 460SX select 460SX
select PCI select FORCE_PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select IBM_EMAC_RGMII if IBM_EMAC select IBM_EMAC_RGMII if IBM_EMAC
help help
...@@ -161,7 +161,7 @@ config YOSEMITE ...@@ -161,7 +161,7 @@ config YOSEMITE
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select 440EP select 440EP
select PCI select FORCE_PCI
help help
This option enables support for the AMCC PPC440EP evaluation board. This option enables support for the AMCC PPC440EP evaluation board.
...@@ -201,7 +201,7 @@ config AKEBONO ...@@ -201,7 +201,7 @@ config AKEBONO
select SWIOTLB select SWIOTLB
select 476FPE select 476FPE
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select PCI select FORCE_PCI
select PCI_MSI select PCI_MSI
select PPC4xx_HSTA_MSI select PPC4xx_HSTA_MSI
select I2C select I2C
...@@ -226,7 +226,7 @@ config ICON ...@@ -226,7 +226,7 @@ config ICON
depends on 44x depends on 44x
select PPC44x_SIMPLE select PPC44x_SIMPLE
select 440SPe select 440SPe
select PCI select FORCE_PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
help help
This option enables support for the AMCC PPC440SPe evaluation board. This option enables support for the AMCC PPC440SPe evaluation board.
...@@ -250,7 +250,7 @@ config XILINX_VIRTEX440_GENERIC_BOARD ...@@ -250,7 +250,7 @@ config XILINX_VIRTEX440_GENERIC_BOARD
config XILINX_ML510 config XILINX_ML510
bool "Xilinx ML510 extra support" bool "Xilinx ML510 extra support"
depends on XILINX_VIRTEX440_GENERIC_BOARD depends on XILINX_VIRTEX440_GENERIC_BOARD
select PPC_PCI_CHOICE select HAVE_PCI
select XILINX_PCI if PCI select XILINX_PCI if PCI
select PPC_INDIRECT_PCI if PCI select PPC_INDIRECT_PCI if PCI
select PPC_I8259 if PCI select PPC_I8259 if PCI
......
arch/powerpc/platforms/512x/Kconfig
View file @ 19530313
...@@ -5,7 +5,7 @@ config PPC_MPC512x ...@@ -5,7 +5,7 @@ config PPC_MPC512x
select COMMON_CLK select COMMON_CLK
select FSL_SOC select FSL_SOC
select IPIC select IPIC
select PPC_PCI_CHOICE select HAVE_PCI
select FSL_PCI if PCI select FSL_PCI if PCI
select USB_EHCI_BIG_ENDIAN_MMIO if USB_EHCI_HCD select USB_EHCI_BIG_ENDIAN_MMIO if USB_EHCI_HCD
select USB_EHCI_BIG_ENDIAN_DESC if USB_EHCI_HCD select USB_EHCI_BIG_ENDIAN_DESC if USB_EHCI_HCD
......
arch/powerpc/platforms/52xx/Kconfig
View file @ 19530313
...@@ -3,7 +3,7 @@ config PPC_MPC52xx ...@@ -3,7 +3,7 @@ config PPC_MPC52xx
bool "52xx-based boards" bool "52xx-based boards"
depends on PPC_BOOK3S_32 depends on PPC_BOOK3S_32
select COMMON_CLK select COMMON_CLK
select PPC_PCI_CHOICE select HAVE_PCI
config PPC_MPC5200_SIMPLE config PPC_MPC5200_SIMPLE
bool "Generic support for simple MPC5200 based boards" bool "Generic support for simple MPC5200 based boards"
......
arch/powerpc/platforms/83xx/Kconfig
View file @ 19530313
...@@ -3,7 +3,7 @@ menuconfig PPC_83xx ...@@ -3,7 +3,7 @@ menuconfig PPC_83xx
bool "83xx-based boards" bool "83xx-based boards"
depends on PPC_BOOK3S_32 depends on PPC_BOOK3S_32
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_PCI_CHOICE select HAVE_PCI
select FSL_PCI if PCI select FSL_PCI if PCI
select FSL_SOC select FSL_SOC
select IPIC select IPIC
......
arch/powerpc/platforms/85xx/Kconfig
View file @ 19530313
...@@ -5,7 +5,7 @@ menuconfig FSL_SOC_BOOKE ...@@ -5,7 +5,7 @@ menuconfig FSL_SOC_BOOKE
select FSL_SOC select FSL_SOC
select PPC_UDBG_16550 select PPC_UDBG_16550
select MPIC select MPIC
select PPC_PCI_CHOICE select HAVE_PCI
select FSL_PCI if PCI select FSL_PCI if PCI
select SERIAL_8250_EXTENDED if SERIAL_8250 select SERIAL_8250_EXTENDED if SERIAL_8250
select SERIAL_8250_SHARE_IRQ if SERIAL_8250 select SERIAL_8250_SHARE_IRQ if SERIAL_8250
...@@ -66,7 +66,7 @@ config MPC85xx_CDS ...@@ -66,7 +66,7 @@ config MPC85xx_CDS
bool "Freescale MPC85xx CDS" bool "Freescale MPC85xx CDS"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select PPC_I8259 select PPC_I8259
select HAS_RAPIDIO select HAVE_RAPIDIO
help help
This option enables support for the MPC85xx CDS board This option enables support for the MPC85xx CDS board
...@@ -74,7 +74,7 @@ config MPC85xx_MDS ...@@ -74,7 +74,7 @@ config MPC85xx_MDS
bool "Freescale MPC85xx MDS" bool "Freescale MPC85xx MDS"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select PHYLIB if NETDEVICES select PHYLIB if NETDEVICES
select HAS_RAPIDIO select HAVE_RAPIDIO
select SWIOTLB select SWIOTLB
help help
This option enables support for the MPC85xx MDS board This option enables support for the MPC85xx MDS board
...@@ -219,7 +219,7 @@ config PPA8548 ...@@ -219,7 +219,7 @@ config PPA8548
help help
This option enables support for the Prodrive PPA8548 board. This option enables support for the Prodrive PPA8548 board.
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select HAS_RAPIDIO select HAVE_RAPIDIO
config GE_IMP3A config GE_IMP3A
bool "GE Intelligent Platforms IMP3A" bool "GE Intelligent Platforms IMP3A"
...@@ -277,7 +277,7 @@ config CORENET_GENERIC ...@@ -277,7 +277,7 @@ config CORENET_GENERIC
select SWIOTLB select SWIOTLB
select GPIOLIB select GPIOLIB
select GPIO_MPC8XXX select GPIO_MPC8XXX
select HAS_RAPIDIO select HAVE_RAPIDIO
select PPC_EPAPR_HV_PIC select PPC_EPAPR_HV_PIC
help help
This option enables support for the FSL CoreNet based boards. This option enables support for the FSL CoreNet based boards.
......
arch/powerpc/platforms/86xx/Kconfig
View file @ 19530313
...@@ -15,7 +15,7 @@ config MPC8641_HPCN ...@@ -15,7 +15,7 @@ config MPC8641_HPCN
select PPC_I8259 select PPC_I8259
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select FSL_ULI1575 if PCI select FSL_ULI1575 if PCI
select HAS_RAPIDIO select HAVE_RAPIDIO
select SWIOTLB select SWIOTLB
help help
This option enables support for the MPC8641 HPCN board. This option enables support for the MPC8641 HPCN board.
...@@ -57,7 +57,7 @@ config GEF_SBC610 ...@@ -57,7 +57,7 @@ config GEF_SBC610
select MMIO_NVRAM select MMIO_NVRAM
select GPIOLIB select GPIOLIB
select GE_FPGA select GE_FPGA
select HAS_RAPIDIO select HAVE_RAPIDIO
help help
This option enables support for the GE SBC610. This option enables support for the GE SBC610.
...@@ -70,7 +70,7 @@ endif ...@@ -70,7 +70,7 @@ endif
config MPC8641 config MPC8641
bool bool
select PPC_PCI_CHOICE select HAVE_PCI
select FSL_PCI if PCI select FSL_PCI if PCI
select PPC_UDBG_16550 select PPC_UDBG_16550
select MPIC select MPIC
...@@ -79,7 +79,7 @@ config MPC8641 ...@@ -79,7 +79,7 @@ config MPC8641
config MPC8610 config MPC8610
bool bool
select PPC_PCI_CHOICE select HAVE_PCI
select FSL_PCI if PCI select FSL_PCI if PCI
select PPC_UDBG_16550 select PPC_UDBG_16550
select MPIC select MPIC
......
arch/powerpc/platforms/Kconfig
View file @ 19530313
...@@ -265,7 +265,7 @@ config CPM2 ...@@ -265,7 +265,7 @@ config CPM2
bool "Enable support for the CPM2 (Communications Processor Module)" bool "Enable support for the CPM2 (Communications Processor Module)"
depends on (FSL_SOC_BOOKE && PPC32) || 8260 depends on (FSL_SOC_BOOKE && PPC32) || 8260
select CPM select CPM
select PPC_PCI_CHOICE select HAVE_PCI
select GPIOLIB select GPIOLIB
help help
The CPM2 (Communications Processor Module) is a coprocessor on The CPM2 (Communications Processor Module) is a coprocessor on
......
arch/powerpc/platforms/Kconfig.cputype
View file @ 19530313
...@@ -40,14 +40,14 @@ config 40x ...@@ -40,14 +40,14 @@ config 40x
select PPC_DCR_NATIVE select PPC_DCR_NATIVE
select PPC_UDBG_16550 select PPC_UDBG_16550
select 4xx_SOC select 4xx_SOC
select PPC_PCI_CHOICE select HAVE_PCI
config 44x config 44x
bool "AMCC 44x, 46x or 47x" bool "AMCC 44x, 46x or 47x"
select PPC_DCR_NATIVE select PPC_DCR_NATIVE
select PPC_UDBG_16550 select PPC_UDBG_16550
select 4xx_SOC select 4xx_SOC
select PPC_PCI_CHOICE select HAVE_PCI
select PHYS_64BIT select PHYS_64BIT
config E200 config E200
......
arch/powerpc/platforms/amigaone/Kconfig
View file @ 19530313
...@@ -5,7 +5,7 @@ config AMIGAONE ...@@ -5,7 +5,7 @@ config AMIGAONE
select PPC_I8259 select PPC_I8259
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
select PPC_UDBG_16550 select PPC_UDBG_16550
select PCI select FORCE_PCI
select NOT_COHERENT_CACHE select NOT_COHERENT_CACHE
select CHECK_CACHE_COHERENCY select CHECK_CACHE_COHERENCY
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
......
arch/powerpc/platforms/cell/Kconfig
View file @ 19530313
...@@ -27,7 +27,7 @@ config PPC_IBM_CELL_BLADE ...@@ -27,7 +27,7 @@ config PPC_IBM_CELL_BLADE
depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN
select PPC_CELL_NATIVE select PPC_CELL_NATIVE
select PPC_OF_PLATFORM_PCI select PPC_OF_PLATFORM_PCI
select PCI select FORCE_PCI
select MMIO_NVRAM select MMIO_NVRAM
select PPC_UDBG_16550 select PPC_UDBG_16550
select UDBG_RTAS_CONSOLE select UDBG_RTAS_CONSOLE
......
arch/powerpc/platforms/chrp/Kconfig
View file @ 19530313
...@@ -12,5 +12,5 @@ config PPC_CHRP ...@@ -12,5 +12,5 @@ config PPC_CHRP
select PPC_MPC106 select PPC_MPC106
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_NATIVE select PPC_NATIVE
select PCI select FORCE_PCI
default y default y
arch/powerpc/platforms/embedded6xx/Kconfig
View file @ 19530313
...@@ -52,7 +52,7 @@ config MVME5100 ...@@ -52,7 +52,7 @@ config MVME5100
bool "Motorola/Emerson MVME5100" bool "Motorola/Emerson MVME5100"
depends on EMBEDDED6xx depends on EMBEDDED6xx
select MPIC select MPIC
select PCI select FORCE_PCI
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
select PPC_I8259 select PPC_I8259
select PPC_NATIVE select PPC_NATIVE
...@@ -63,7 +63,7 @@ config MVME5100 ...@@ -63,7 +63,7 @@ config MVME5100
config TSI108_BRIDGE config TSI108_BRIDGE
bool bool
select PCI select FORCE_PCI
select MPIC select MPIC
select MPIC_WEIRD select MPIC_WEIRD
......
arch/powerpc/platforms/maple/Kconfig
View file @ 19530313
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
config PPC_MAPLE config PPC_MAPLE
depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN
bool "Maple 970FX Evaluation Board" bool "Maple 970FX Evaluation Board"
select PCI select FORCE_PCI
select MPIC select MPIC
select U3_DART select U3_DART
select MPIC_U3_HT_IRQS select MPIC_U3_HT_IRQS
......
arch/powerpc/platforms/pasemi/Kconfig
View file @ 19530313
...@@ -3,7 +3,7 @@ config PPC_PASEMI ...@@ -3,7 +3,7 @@ config PPC_PASEMI
depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN
bool "PA Semi SoC-based platforms" bool "PA Semi SoC-based platforms"
select MPIC select MPIC
select PCI select FORCE_PCI
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_NATIVE select PPC_NATIVE
select MPIC_BROKEN_REGREAD select MPIC_BROKEN_REGREAD
......
arch/powerpc/platforms/powermac/Kconfig
View file @ 19530313
...@@ -3,7 +3,7 @@ config PPC_PMAC ...@@ -3,7 +3,7 @@ config PPC_PMAC
bool "Apple PowerMac based machines" bool "Apple PowerMac based machines"
depends on PPC_BOOK3S && CPU_BIG_ENDIAN depends on PPC_BOOK3S && CPU_BIG_ENDIAN
select MPIC select MPIC
select PCI select FORCE_PCI
select PPC_INDIRECT_PCI if PPC32 select PPC_INDIRECT_PCI if PPC32
select PPC_MPC106 if PPC32 select PPC_MPC106 if PPC32
select PPC_NATIVE select PPC_NATIVE
......
arch/powerpc/platforms/powernv/Kconfig
View file @ 19530313
...@@ -7,7 +7,7 @@ config PPC_POWERNV ...@@ -7,7 +7,7 @@ config PPC_POWERNV
select PPC_ICP_NATIVE select PPC_ICP_NATIVE
select PPC_XIVE_NATIVE select PPC_XIVE_NATIVE
select PPC_P7_NAP select PPC_P7_NAP
select PCI select FORCE_PCI
select PCI_MSI select PCI_MSI
select EPAPR_BOOT select EPAPR_BOOT
select PPC_INDIRECT_PIO select PPC_INDIRECT_PIO
......
arch/powerpc/platforms/ps3/Kconfig
View file @ 19530313
...@@ -6,7 +6,7 @@ config PPC_PS3 ...@@ -6,7 +6,7 @@ config PPC_PS3
select USB_OHCI_LITTLE_ENDIAN select USB_OHCI_LITTLE_ENDIAN
select USB_OHCI_BIG_ENDIAN_MMIO select USB_OHCI_BIG_ENDIAN_MMIO
select USB_EHCI_BIG_ENDIAN_MMIO select USB_EHCI_BIG_ENDIAN_MMIO
select PPC_PCI_CHOICE select HAVE_PCI
help help
This option enables support for the Sony PS3 game console This option enables support for the Sony PS3 game console
and other platforms using the PS3 hypervisor. Enabling this and other platforms using the PS3 hypervisor. Enabling this
......
arch/powerpc/platforms/pseries/Kconfig
View file @ 19530313
...@@ -5,7 +5,7 @@ config PPC_PSERIES ...@@ -5,7 +5,7 @@ config PPC_PSERIES
select HAVE_PCSPKR_PLATFORM select HAVE_PCSPKR_PLATFORM
select MPIC select MPIC
select OF_DYNAMIC select OF_DYNAMIC
select PCI select FORCE_PCI
select PCI_MSI select PCI_MSI
select PPC_XICS select PPC_XICS
select PPC_XIVE_SPAPR select PPC_XIVE_SPAPR
......
arch/riscv/Kconfig
View file @ 19530313
...@@ -38,8 +38,11 @@ config RISCV ...@@ -38,8 +38,11 @@ config RISCV
select SPARSE_IRQ select SPARSE_IRQ
select SYSCTL_EXCEPTION_TRACE select SYSCTL_EXCEPTION_TRACE
select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRACEHOOK
select HAVE_PCI
select MODULES_USE_ELF_RELA if MODULES select MODULES_USE_ELF_RELA if MODULES
select THREAD_INFO_IN_TASK select THREAD_INFO_IN_TASK
select PCI_DOMAINS_GENERIC if PCI
select PCI_MSI if PCI
select RISCV_TIMER select RISCV_TIMER
select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_MULTI_HANDLER
select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_PTE_SPECIAL
...@@ -272,28 +275,6 @@ endchoice ...@@ -272,28 +275,6 @@ endchoice
endmenu endmenu
menu "Bus support"
config PCI
bool "PCI support"
select PCI_MSI
help
This feature enables support for PCI bus system. If you say Y
here, the kernel will include drivers and infrastructure code
to support PCI bus devices.
If you don't know what to do here, say Y.
config PCI_DOMAINS
def_bool PCI
config PCI_DOMAINS_GENERIC
def_bool PCI
source "drivers/pci/Kconfig"
endmenu
menu "Power management options" menu "Power management options"
source "kernel/power/Kconfig" source "kernel/power/Kconfig"
......
arch/s390/Kconfig
View file @ 19530313
...@@ -166,14 +166,21 @@ config S390 ...@@ -166,14 +166,21 @@ config S390
select HAVE_MOD_ARCH_SPECIFIC select HAVE_MOD_ARCH_SPECIFIC
select HAVE_NOP_MCOUNT select HAVE_NOP_MCOUNT
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_PCI
select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS
select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_REGS_AND_STACK_ACCESS_API
select HAVE_RSEQ select HAVE_RSEQ
select HAVE_SYSCALL_TRACEPOINTS select HAVE_SYSCALL_TRACEPOINTS
select HAVE_VIRT_CPU_ACCOUNTING select HAVE_VIRT_CPU_ACCOUNTING
select IOMMU_HELPER if PCI
select IOMMU_SUPPORT if PCI
select MODULES_USE_ELF_RELA select MODULES_USE_ELF_RELA
select NEED_DMA_MAP_STATE if PCI
select NEED_SG_DMA_LENGTH if PCI
select OLD_SIGACTION select OLD_SIGACTION
select OLD_SIGSUSPEND3 select OLD_SIGSUSPEND3
select PCI_DOMAINS if PCI
select PCI_MSI if PCI
select SPARSE_IRQ select SPARSE_IRQ
select SYSCTL_EXCEPTION_TRACE select SYSCTL_EXCEPTION_TRACE
select THREAD_INFO_IN_TASK select THREAD_INFO_IN_TASK
...@@ -704,17 +711,6 @@ config QDIO ...@@ -704,17 +711,6 @@ config QDIO
If unsure, say Y. If unsure, say Y.
menuconfig PCI
bool "PCI support"
select PCI_MSI
select IOMMU_HELPER
select IOMMU_SUPPORT
select NEED_DMA_MAP_STATE
select NEED_SG_DMA_LENGTH
help
Enable PCI support.
if PCI if PCI
config PCI_NR_FUNCTIONS config PCI_NR_FUNCTIONS
...@@ -725,13 +721,8 @@ config PCI_NR_FUNCTIONS ...@@ -725,13 +721,8 @@ config PCI_NR_FUNCTIONS
This allows you to specify the maximum number of PCI functions which This allows you to specify the maximum number of PCI functions which
this kernel will support. this kernel will support.
source "drivers/pci/Kconfig"
endif # PCI endif # PCI
config PCI_DOMAINS
def_bool PCI
config HAS_IOMEM config HAS_IOMEM
def_bool PCI def_bool PCI
...@@ -835,9 +826,6 @@ source "kernel/power/Kconfig" ...@@ -835,9 +826,6 @@ source "kernel/power/Kconfig"
endmenu endmenu
config PCMCIA
def_bool n
config CCW config CCW
def_bool y def_bool y
......
arch/sh/Kconfig
View file @ 19530313
...@@ -39,13 +39,16 @@ config SUPERH ...@@ -39,13 +39,16 @@ config SUPERH
select GENERIC_IDLE_POLL_SETUP select GENERIC_IDLE_POLL_SETUP
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
select GENERIC_PCI_IOMAP if PCI
select GENERIC_SCHED_CLOCK select GENERIC_SCHED_CLOCK
select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER select GENERIC_STRNLEN_USER
select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
select MODULES_USE_ELF_RELA select MODULES_USE_ELF_RELA
select NO_GENERIC_PCI_IOPORT_MAP if PCI
select OLD_SIGSUSPEND select OLD_SIGSUSPEND
select OLD_SIGACTION select OLD_SIGACTION
select PCI_DOMAINS if PCI
select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_AUDITSYSCALL
select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_FUTEX_CMPXCHG if FUTEX
select HAVE_NMI select HAVE_NMI
...@@ -129,9 +132,6 @@ config SYS_SUPPORTS_SMP ...@@ -129,9 +132,6 @@ config SYS_SUPPORTS_SMP
config SYS_SUPPORTS_NUMA config SYS_SUPPORTS_NUMA
bool bool
config SYS_SUPPORTS_PCI
bool
config STACKTRACE_SUPPORT config STACKTRACE_SUPPORT
def_bool y def_bool y
...@@ -854,24 +854,6 @@ config MAPLE ...@@ -854,24 +854,6 @@ config MAPLE
Dreamcast with a serial line terminal or a remote network Dreamcast with a serial line terminal or a remote network
connection. connection.
config PCI
bool "PCI support"
depends on SYS_SUPPORTS_PCI
select PCI_DOMAINS
select GENERIC_PCI_IOMAP
select NO_GENERIC_PCI_IOPORT_MAP
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
your box. If you have PCI, say Y, otherwise N.
config PCI_DOMAINS
bool
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
endmenu endmenu
menu "Power management options (EXPERIMENTAL)" menu "Power management options (EXPERIMENTAL)"
......
arch/sh/boards/Kconfig
View file @ 19530313
...@@ -101,7 +101,7 @@ config SH_7751_SOLUTION_ENGINE ...@@ -101,7 +101,7 @@ config SH_7751_SOLUTION_ENGINE
config SH_7780_SOLUTION_ENGINE config SH_7780_SOLUTION_ENGINE
bool "SolutionEngine7780" bool "SolutionEngine7780"
select SOLUTION_ENGINE select SOLUTION_ENGINE
select SYS_SUPPORTS_PCI select HAVE_PCI
depends on CPU_SUBTYPE_SH7780 depends on CPU_SUBTYPE_SH7780
help help
Select 7780 SolutionEngine if configuring for a Renesas SH7780 Select 7780 SolutionEngine if configuring for a Renesas SH7780
...@@ -129,7 +129,7 @@ config SH_HP6XX ...@@ -129,7 +129,7 @@ config SH_HP6XX
config SH_DREAMCAST config SH_DREAMCAST
bool "Dreamcast" bool "Dreamcast"
select SYS_SUPPORTS_PCI select HAVE_PCI
depends on CPU_SUBTYPE_SH7091 depends on CPU_SUBTYPE_SH7091
help help
Select Dreamcast if configuring for a SEGA Dreamcast. Select Dreamcast if configuring for a SEGA Dreamcast.
...@@ -139,7 +139,7 @@ config SH_SH03 ...@@ -139,7 +139,7 @@ config SH_SH03
bool "Interface CTP/PCI-SH03" bool "Interface CTP/PCI-SH03"
depends on CPU_SUBTYPE_SH7751 depends on CPU_SUBTYPE_SH7751
select CPU_HAS_IPR_IRQ select CPU_HAS_IPR_IRQ
select SYS_SUPPORTS_PCI select HAVE_PCI
help help
CTP/PCI-SH03 is a CPU module computer that is produced CTP/PCI-SH03 is a CPU module computer that is produced
by Interface Corporation. by Interface Corporation.
...@@ -149,7 +149,7 @@ config SH_SECUREEDGE5410 ...@@ -149,7 +149,7 @@ config SH_SECUREEDGE5410
bool "SecureEdge5410" bool "SecureEdge5410"
depends on CPU_SUBTYPE_SH7751R depends on CPU_SUBTYPE_SH7751R
select CPU_HAS_IPR_IRQ select CPU_HAS_IPR_IRQ
select SYS_SUPPORTS_PCI select HAVE_PCI
help help
Select SecureEdge5410 if configuring for a SnapGear SH board. Select SecureEdge5410 if configuring for a SnapGear SH board.
This includes both the OEM SecureEdge products as well as the This includes both the OEM SecureEdge products as well as the
...@@ -158,7 +158,7 @@ config SH_SECUREEDGE5410 ...@@ -158,7 +158,7 @@ config SH_SECUREEDGE5410
config SH_RTS7751R2D config SH_RTS7751R2D
bool "RTS7751R2D" bool "RTS7751R2D"
depends on CPU_SUBTYPE_SH7751R depends on CPU_SUBTYPE_SH7751R
select SYS_SUPPORTS_PCI select HAVE_PCI
select IO_TRAPPED if MMU select IO_TRAPPED if MMU
help help
Select RTS7751R2D if configuring for a Renesas Technology Select RTS7751R2D if configuring for a Renesas Technology
...@@ -176,7 +176,7 @@ config SH_RSK ...@@ -176,7 +176,7 @@ config SH_RSK
config SH_SDK7780 config SH_SDK7780
bool "SDK7780R3" bool "SDK7780R3"
depends on CPU_SUBTYPE_SH7780 depends on CPU_SUBTYPE_SH7780
select SYS_SUPPORTS_PCI select HAVE_PCI
help help
Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3 Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3
evaluation board. evaluation board.
...@@ -184,7 +184,7 @@ config SH_SDK7780 ...@@ -184,7 +184,7 @@ config SH_SDK7780
config SH_SDK7786 config SH_SDK7786
bool "SDK7786" bool "SDK7786"
depends on CPU_SUBTYPE_SH7786 depends on CPU_SUBTYPE_SH7786
select SYS_SUPPORTS_PCI select HAVE_PCI
select NO_IOPORT_MAP if !PCI select NO_IOPORT_MAP if !PCI
select HAVE_SRAM_POOL select HAVE_SRAM_POOL
select REGULATOR_FIXED_VOLTAGE if REGULATOR select REGULATOR_FIXED_VOLTAGE if REGULATOR
...@@ -195,7 +195,7 @@ config SH_SDK7786 ...@@ -195,7 +195,7 @@ config SH_SDK7786
config SH_HIGHLANDER config SH_HIGHLANDER
bool "Highlander" bool "Highlander"
depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
select SYS_SUPPORTS_PCI select HAVE_PCI
select IO_TRAPPED if MMU select IO_TRAPPED if MMU
config SH_SH7757LCR config SH_SH7757LCR
...@@ -207,7 +207,7 @@ config SH_SH7757LCR ...@@ -207,7 +207,7 @@ config SH_SH7757LCR
config SH_SH7785LCR config SH_SH7785LCR
bool "SH7785LCR" bool "SH7785LCR"
depends on CPU_SUBTYPE_SH7785 depends on CPU_SUBTYPE_SH7785
select SYS_SUPPORTS_PCI select HAVE_PCI
config SH_SH7785LCR_29BIT_PHYSMAPS config SH_SH7785LCR_29BIT_PHYSMAPS
bool "SH7785LCR 29bit physmaps" bool "SH7785LCR 29bit physmaps"
...@@ -229,7 +229,7 @@ config SH_URQUELL ...@@ -229,7 +229,7 @@ config SH_URQUELL
bool "Urquell" bool "Urquell"
depends on CPU_SUBTYPE_SH7786 depends on CPU_SUBTYPE_SH7786
select GPIOLIB select GPIOLIB
select SYS_SUPPORTS_PCI select HAVE_PCI
select NO_IOPORT_MAP if !PCI select NO_IOPORT_MAP if !PCI
config SH_MIGOR config SH_MIGOR
...@@ -302,7 +302,7 @@ config SH_SH4202_MICRODEV ...@@ -302,7 +302,7 @@ config SH_SH4202_MICRODEV
config SH_LANDISK config SH_LANDISK
bool "LANDISK" bool "LANDISK"
depends on CPU_SUBTYPE_SH7751R depends on CPU_SUBTYPE_SH7751R
select SYS_SUPPORTS_PCI select HAVE_PCI
help help
I-O DATA DEVICE, INC. "LANDISK Series" support. I-O DATA DEVICE, INC. "LANDISK Series" support.
...@@ -310,7 +310,7 @@ config SH_TITAN ...@@ -310,7 +310,7 @@ config SH_TITAN
bool "TITAN" bool "TITAN"
depends on CPU_SUBTYPE_SH7751R depends on CPU_SUBTYPE_SH7751R
select CPU_HAS_IPR_IRQ select CPU_HAS_IPR_IRQ
select SYS_SUPPORTS_PCI select HAVE_PCI
help help
Select Titan if you are configuring for a Nimble Microsystems Select Titan if you are configuring for a Nimble Microsystems
NetEngine NP51R. NetEngine NP51R.
...@@ -325,7 +325,7 @@ config SH_SHMIN ...@@ -325,7 +325,7 @@ config SH_SHMIN
config SH_LBOX_RE2 config SH_LBOX_RE2
bool "L-BOX RE2" bool "L-BOX RE2"
depends on CPU_SUBTYPE_SH7751R depends on CPU_SUBTYPE_SH7751R
select SYS_SUPPORTS_PCI select HAVE_PCI
help help
Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2. Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.
...@@ -346,7 +346,7 @@ config SH_MAGIC_PANEL_R2 ...@@ -346,7 +346,7 @@ config SH_MAGIC_PANEL_R2
config SH_CAYMAN config SH_CAYMAN
bool "Hitachi Cayman" bool "Hitachi Cayman"
depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103 depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
select SYS_SUPPORTS_PCI select HAVE_PCI
select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_MIGHT_HAVE_PC_SERIO
config SH_POLARIS config SH_POLARIS
...@@ -380,7 +380,7 @@ config SH_APSH4A3A ...@@ -380,7 +380,7 @@ config SH_APSH4A3A
config SH_APSH4AD0A config SH_APSH4AD0A
bool "AP-SH4AD-0A" bool "AP-SH4AD-0A"
select SH_ALPHA_BOARD select SH_ALPHA_BOARD
select SYS_SUPPORTS_PCI select HAVE_PCI
select REGULATOR_FIXED_VOLTAGE if REGULATOR select REGULATOR_FIXED_VOLTAGE if REGULATOR
depends on CPU_SUBTYPE_SH7786 depends on CPU_SUBTYPE_SH7786
help help
......
arch/sparc/Kconfig
View file @ 19530313
...@@ -21,6 +21,7 @@ config SPARC ...@@ -21,6 +21,7 @@ config SPARC
select HAVE_ARCH_KGDB if !SMP || SPARC64 select HAVE_ARCH_KGDB if !SMP || SPARC64
select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRACEHOOK
select HAVE_EXIT_THREAD select HAVE_EXIT_THREAD
select HAVE_PCI
select SYSCTL_EXCEPTION_TRACE select SYSCTL_EXCEPTION_TRACE
select RTC_CLASS select RTC_CLASS
select RTC_DRV_M48T59 select RTC_DRV_M48T59
...@@ -38,6 +39,7 @@ config SPARC ...@@ -38,6 +39,7 @@ config SPARC
select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER select GENERIC_STRNLEN_USER
select MODULES_USE_ELF_RELA select MODULES_USE_ELF_RELA
select PCI_SYSCALL if PCI
select ODD_RT_SIGACTION select ODD_RT_SIGACTION
select OLD_SIGSUSPEND select OLD_SIGSUSPEND
select CPU_NO_EFFICIENT_FFS select CPU_NO_EFFICIENT_FFS
...@@ -87,6 +89,7 @@ config SPARC64 ...@@ -87,6 +89,7 @@ config SPARC64
select GENERIC_TIME_VSYSCALL select GENERIC_TIME_VSYSCALL
select ARCH_CLOCKSOURCE_DATA select ARCH_CLOCKSOURCE_DATA
select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_PTE_SPECIAL
select PCI_DOMAINS if PCI
config ARCH_DEFCONFIG config ARCH_DEFCONFIG
string string
...@@ -470,24 +473,6 @@ config SUN_LDOMS ...@@ -470,24 +473,6 @@ config SUN_LDOMS
Say Y here is you want to support virtual devices via Say Y here is you want to support virtual devices via
Logical Domains. Logical Domains.
config PCI
bool "Support for PCI and PS/2 keyboard/mouse"
help
Find out whether your system includes a PCI bus. PCI is the name of
a bus system, i.e. the way the CPU talks to the other stuff inside
your box. If you say Y here, the kernel will include drivers and
infrastructure code to support PCI bus devices.
CONFIG_PCI is needed for all JavaStation's (including MrCoffee),
CP-1200, JavaEngine-1, Corona, Red October, and Serengeti SGSC.
All of these platforms are extremely obscure, so say N if unsure.
config PCI_DOMAINS
def_bool PCI if SPARC64
config PCI_SYSCALL
def_bool PCI
config PCIC_PCI config PCIC_PCI
bool bool
depends on PCI && SPARC32 && !SPARC_LEON depends on PCI && SPARC32 && !SPARC_LEON
...@@ -516,10 +501,6 @@ config SPARC_GRPCI2 ...@@ -516,10 +501,6 @@ config SPARC_GRPCI2
help help
Say Y here to include the GRPCI2 Host Bridge Driver. Say Y here to include the GRPCI2 Host Bridge Driver.
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
config SUN_OPENPROMFS config SUN_OPENPROMFS
tristate "Openprom tree appears in /proc/openprom" tristate "Openprom tree appears in /proc/openprom"
help help
......
arch/um/Kconfig
View file @ 19530313
...@@ -31,12 +31,6 @@ config ISA ...@@ -31,12 +31,6 @@ config ISA
config SBUS config SBUS
bool bool
config PCI
bool
config PCMCIA
bool
config TRACE_IRQFLAGS_SUPPORT config TRACE_IRQFLAGS_SUPPORT
bool bool
default y default y
......
arch/unicore32/Kconfig
View file @ 19530313
...@@ -10,6 +10,7 @@ config UNICORE32 ...@@ -10,6 +10,7 @@ config UNICORE32
select GENERIC_ATOMIC64 select GENERIC_ATOMIC64
select HAVE_KERNEL_LZO select HAVE_KERNEL_LZO
select HAVE_KERNEL_LZMA select HAVE_KERNEL_LZMA
select HAVE_PCI
select VIRT_TO_BUS select VIRT_TO_BUS
select ARCH_HAVE_CUSTOM_GPIO_H select ARCH_HAVE_CUSTOM_GPIO_H
select GENERIC_FIND_FIRST_BIT select GENERIC_FIND_FIRST_BIT
...@@ -115,22 +116,6 @@ config UNICORE_FPU_F64 ...@@ -115,22 +116,6 @@ config UNICORE_FPU_F64
endmenu endmenu
menu "Bus support"
config PCI
bool "PCI Support"
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
VESA. If you have PCI, say Y, otherwise N.
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
endmenu
menu "Kernel Features" menu "Kernel Features"
source "kernel/Kconfig.hz" source "kernel/Kconfig.hz"
......
arch/x86/Kconfig
View file @ 19530313
...@@ -145,6 +145,7 @@ config X86 ...@@ -145,6 +145,7 @@ config X86
select HAVE_DYNAMIC_FTRACE_WITH_REGS select HAVE_DYNAMIC_FTRACE_WITH_REGS
select HAVE_EBPF_JIT select HAVE_EBPF_JIT
select HAVE_EFFICIENT_UNALIGNED_ACCESS select HAVE_EFFICIENT_UNALIGNED_ACCESS
select HAVE_EISA
select HAVE_EXIT_THREAD select HAVE_EXIT_THREAD
select HAVE_FENTRY if X86_64 || DYNAMIC_FTRACE select HAVE_FENTRY if X86_64 || DYNAMIC_FTRACE
select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FTRACE_MCOUNT_RECORD
...@@ -178,6 +179,7 @@ config X86 ...@@ -178,6 +179,7 @@ config X86
select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS
select HAVE_PERF_EVENTS_NMI select HAVE_PERF_EVENTS_NMI
select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI
select HAVE_PCI
select HAVE_PERF_REGS select HAVE_PERF_REGS
select HAVE_PERF_USER_STACK_DUMP select HAVE_PERF_USER_STACK_DUMP
select HAVE_RCU_TABLE_FREE if PARAVIRT select HAVE_RCU_TABLE_FREE if PARAVIRT
...@@ -194,6 +196,7 @@ config X86 ...@@ -194,6 +196,7 @@ config X86
select HOTPLUG_SMT if SMP select HOTPLUG_SMT if SMP
select IRQ_FORCED_THREADING select IRQ_FORCED_THREADING
select NEED_SG_DMA_LENGTH select NEED_SG_DMA_LENGTH
select PCI_DOMAINS if PCI
select PCI_LOCKLESS_CONFIG select PCI_LOCKLESS_CONFIG
select PERF_EVENTS select PERF_EVENTS
select RTC_LIB select RTC_LIB
...@@ -2574,15 +2577,6 @@ endmenu ...@@ -2574,15 +2577,6 @@ endmenu
menu "Bus options (PCI etc.)" menu "Bus options (PCI etc.)"
config PCI
bool "PCI support"
default y
---help---
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
VESA. If you have PCI, say Y, otherwise N.
choice choice
prompt "PCI access mode" prompt "PCI access mode"
depends on X86_32 && PCI depends on X86_32 && PCI
...@@ -2644,10 +2638,6 @@ config PCI_XEN ...@@ -2644,10 +2638,6 @@ config PCI_XEN
depends on PCI && XEN depends on PCI && XEN
select SWIOTLB_XEN select SWIOTLB_XEN
config PCI_DOMAINS
def_bool y
depends on PCI
config MMCONF_FAM10H config MMCONF_FAM10H
def_bool y def_bool y
depends on X86_64 && PCI_MMCONFIG && ACPI depends on X86_64 && PCI_MMCONFIG && ACPI
...@@ -2665,8 +2655,6 @@ config PCI_CNB20LE_QUIRK ...@@ -2665,8 +2655,6 @@ config PCI_CNB20LE_QUIRK
You should say N unless you know you need this. You should say N unless you know you need this.
source "drivers/pci/Kconfig"
config ISA_BUS config ISA_BUS
bool "ISA bus support on modern systems" if EXPERT bool "ISA bus support on modern systems" if EXPERT
help help
...@@ -2697,24 +2685,6 @@ config ISA ...@@ -2697,24 +2685,6 @@ config ISA
(MCA) or VESA. ISA is an older system, now being displaced by PCI; (MCA) or VESA. ISA is an older system, now being displaced by PCI;
newer boards don't support it. If you have ISA, say Y, otherwise N. newer boards don't support it. If you have ISA, say Y, otherwise N.
config EISA
bool "EISA support"
depends on ISA
---help---
The Extended Industry Standard Architecture (EISA) bus was
developed as an open alternative to the IBM MicroChannel bus.
The EISA bus provided some of the features of the IBM MicroChannel
bus while maintaining backward compatibility with cards made for
the older ISA bus. The EISA bus saw limited use between 1988 and
1995 when it was made obsolete by the PCI bus.
Say Y here if you are building a kernel for an EISA-based machine.
Otherwise, say N.
source "drivers/eisa/Kconfig"
config SCx200 config SCx200
tristate "NatSemi SCx200 support" tristate "NatSemi SCx200 support"
---help--- ---help---
...@@ -2826,17 +2796,6 @@ config AMD_NB ...@@ -2826,17 +2796,6 @@ config AMD_NB
def_bool y def_bool y
depends on CPU_SUP_AMD && PCI depends on CPU_SUP_AMD && PCI
source "drivers/pcmcia/Kconfig"
config RAPIDIO
tristate "RapidIO support"
depends on PCI
help
If enabled this option will include drivers and the core
infrastructure code to support RapidIO interconnect devices.
source "drivers/rapidio/Kconfig"
config X86_SYSFB config X86_SYSFB
bool "Mark VGA/VBE/EFI FB as generic system framebuffer" bool "Mark VGA/VBE/EFI FB as generic system framebuffer"
help help
......
arch/x86/configs/i386_defconfig
View file @ 19530313
...@@ -69,6 +69,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y ...@@ -69,6 +69,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_PCI=y
CONFIG_PCIEPORTBUS=y CONFIG_PCIEPORTBUS=y
CONFIG_PCI_MSI=y CONFIG_PCI_MSI=y
CONFIG_PCCARD=y CONFIG_PCCARD=y
......
arch/x86/configs/x86_64_defconfig
View file @ 19530313
...@@ -67,6 +67,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y ...@@ -67,6 +67,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_PCI=y
CONFIG_PCI_MMCONFIG=y CONFIG_PCI_MMCONFIG=y
CONFIG_PCIEPORTBUS=y CONFIG_PCIEPORTBUS=y
CONFIG_PCCARD=y CONFIG_PCCARD=y
......
arch/xtensa/Kconfig
View file @ 19530313
...@@ -27,6 +27,7 @@ config XTENSA ...@@ -27,6 +27,7 @@ config XTENSA
select HAVE_HW_BREAKPOINT if PERF_EVENTS select HAVE_HW_BREAKPOINT if PERF_EVENTS
select HAVE_IRQ_TIME_ACCOUNTING select HAVE_IRQ_TIME_ACCOUNTING
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_PCI
select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS
select HAVE_STACKPROTECTOR select HAVE_STACKPROTECTOR
select HAVE_SYSCALL_TRACEPOINTS select HAVE_SYSCALL_TRACEPOINTS
...@@ -381,21 +382,6 @@ config XTENSA_CALIBRATE_CCOUNT ...@@ -381,21 +382,6 @@ config XTENSA_CALIBRATE_CCOUNT
config SERIAL_CONSOLE config SERIAL_CONSOLE
def_bool n def_bool n
menu "Bus options"
config PCI
bool "PCI support"
default y
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
VESA. If you have PCI, say Y, otherwise N.
source "drivers/pci/Kconfig"
endmenu
menu "Platform options" menu "Platform options"
choice choice
...@@ -528,8 +514,6 @@ config FORCE_MAX_ZONEORDER ...@@ -528,8 +514,6 @@ config FORCE_MAX_ZONEORDER
This config option is actually maximum order plus one. For example, This config option is actually maximum order plus one. For example,
a value of 11 means that the largest free memory block is 2^10 pages. a value of 11 means that the largest free memory block is 2^10 pages.
source "drivers/pcmcia/Kconfig"
config PLATFORM_WANT_DEFAULT_MEM config PLATFORM_WANT_DEFAULT_MEM
def_bool n def_bool n
......
arch/xtensa/configs/common_defconfig
View file @ 19530313
CONFIG_PCI=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
......
drivers/Kconfig
View file @ 19530313
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
menu "Device Drivers" menu "Device Drivers"
# Keep I/O buses first
source "drivers/amba/Kconfig" source "drivers/amba/Kconfig"
source "drivers/eisa/Kconfig"
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
source "drivers/rapidio/Kconfig"
source "drivers/base/Kconfig" source "drivers/base/Kconfig"
......
drivers/eisa/Kconfig
View file @ 19530313
# #
# EISA configuration # EISA configuration
# #
config HAVE_EISA
bool
menuconfig EISA
bool "EISA support"
depends on HAVE_EISA
---help---
The Extended Industry Standard Architecture (EISA) bus was
developed as an open alternative to the IBM MicroChannel bus.
The EISA bus provided some of the features of the IBM MicroChannel
bus while maintaining backward compatibility with cards made for
the older ISA bus. The EISA bus saw limited use between 1988 and
1995 when it was made obsolete by the PCI bus.
Say Y here if you are building a kernel for an EISA-based machine.
Otherwise, say N.
config EISA_VLB_PRIMING config EISA_VLB_PRIMING
bool "Vesa Local Bus priming" bool "Vesa Local Bus priming"
depends on X86 && EISA depends on X86 && EISA
...@@ -53,4 +73,3 @@ config EISA_NAMES ...@@ -53,4 +73,3 @@ config EISA_NAMES
names. names.
When in doubt, say Y. When in doubt, say Y.
drivers/parisc/Kconfig
View file @ 19530313
...@@ -2,6 +2,7 @@ menu "Bus options (PCI, PCMCIA, EISA, GSC, ISA)" ...@@ -2,6 +2,7 @@ menu "Bus options (PCI, PCMCIA, EISA, GSC, ISA)"
config GSC config GSC
bool "VSC/GSC/HSC bus support" bool "VSC/GSC/HSC bus support"
select HAVE_EISA
default y default y
help help
The VSC, GSC and HSC busses were used from the earliest 700-series The VSC, GSC and HSC busses were used from the earliest 700-series
...@@ -46,16 +47,6 @@ config GSC_WAX ...@@ -46,16 +47,6 @@ config GSC_WAX
used), a HIL interface chip and is also known to be used as the used), a HIL interface chip and is also known to be used as the
GSC bridge for an X.25 GSC card. GSC bridge for an X.25 GSC card.
config EISA
bool "EISA support"
depends on GSC
help
Say Y here if you have an EISA bus in your machine. This code
supports both the Mongoose & Wax EISA adapters. It is sadly
incomplete and lacks support for card-to-host DMA.
source "drivers/eisa/Kconfig"
config ISA config ISA
bool "ISA support" bool "ISA support"
depends on EISA depends on EISA
...@@ -63,17 +54,6 @@ config ISA ...@@ -63,17 +54,6 @@ config ISA
If you want to plug an ISA card into your EISA bus, say Y here. If you want to plug an ISA card into your EISA bus, say Y here.
Most people should say N. Most people should say N.
config PCI
bool "PCI support"
help
All recent HP machines have PCI slots, and you should say Y here
if you have a recent machine. If you are convinced you do not have
PCI slots in your machine (eg a 712), then you may say "N" here.
Beware that some GSC cards have a Dino onboard and PCI inside them,
so it may be safest to say "Y" anyway.
source "drivers/pci/Kconfig"
config GSC_DINO config GSC_DINO
bool "GSCtoPCI/Dino PCI support" bool "GSCtoPCI/Dino PCI support"
depends on PCI && GSC depends on PCI && GSC
...@@ -103,8 +83,6 @@ config IOMMU_SBA ...@@ -103,8 +83,6 @@ config IOMMU_SBA
depends on PCI_LBA depends on PCI_LBA
default PCI_LBA default PCI_LBA
source "drivers/pcmcia/Kconfig"
endmenu endmenu
menu "PA-RISC specific drivers" menu "PA-RISC specific drivers"
......
drivers/pci/Kconfig
View file @ 19530313
...@@ -3,6 +3,36 @@ ...@@ -3,6 +3,36 @@
# PCI configuration # PCI configuration
# #
# select this to offer the PCI prompt
config HAVE_PCI
bool
# select this to unconditionally force on PCI support
config FORCE_PCI
bool
select HAVE_PCI
select PCI
menuconfig PCI
bool "PCI support"
depends on HAVE_PCI
help
This option enables support for the PCI local bus, including
support for PCI-X and the foundations for PCI Express support.
Say 'Y' here unless you know what you are doing.
config PCI_DOMAINS
bool
depends on PCI
config PCI_DOMAINS_GENERIC
bool
depends on PCI
select PCI_DOMAINS
config PCI_SYSCALL
bool
source "drivers/pci/pcie/Kconfig" source "drivers/pci/pcie/Kconfig"
config PCI_MSI config PCI_MSI
......
drivers/pci/endpoint/Kconfig
View file @ 19530313
...@@ -7,7 +7,7 @@ menu "PCI Endpoint" ...@@ -7,7 +7,7 @@ menu "PCI Endpoint"
config PCI_ENDPOINT config PCI_ENDPOINT
bool "PCI Endpoint Support" bool "PCI Endpoint Support"
depends on HAS_DMA depends on HAVE_PCI
help help
Enable this configuration option to support configurable PCI Enable this configuration option to support configurable PCI
endpoint. This should be enabled if the platform has a PCI endpoint. This should be enabled if the platform has a PCI
......
drivers/pcmcia/Kconfig
View file @ 19530313
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
menuconfig PCCARD menuconfig PCCARD
tristate "PCCard (PCMCIA/CardBus) support" tristate "PCCard (PCMCIA/CardBus) support"
depends on !UML
---help--- ---help---
Say Y here if you want to attach PCMCIA- or PC-cards to your Linux Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
computer. These are credit-card size devices such as network cards, computer. These are credit-card size devices such as network cards,
......
drivers/rapidio/Kconfig
View file @ 19530313
# #
# RapidIO configuration # RapidIO configuration
# #
config HAVE_RAPIDIO
bool
menuconfig RAPIDIO
tristate "RapidIO support"
depends on HAVE_RAPIDIO || PCI
help
If you say Y here, the kernel will include drivers and
infrastructure code to support RapidIO interconnect devices.
source "drivers/rapidio/devices/Kconfig" source "drivers/rapidio/devices/Kconfig"
config RAPIDIO_DISC_TIMEOUT config RAPIDIO_DISC_TIMEOUT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7