Commit eb01d42a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Masahiro Yamada

PCI: consolidate PCI config entry in drivers/pci

There is no good reason to duplicate the PCI menu in every architecture.
Instead provide a selectable HAVE_PCI symbol that indicates availability
of PCI support, and a FORCE_PCI symbol to for PCI on and the handle the
rest in drivers/pci.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarPalmer Dabbelt <palmer@sifive.com>
Acked-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarPaul Burton <paul.burton@mips.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 437f2b8c
...@@ -6,6 +6,7 @@ config ALPHA ...@@ -6,6 +6,7 @@ config ALPHA
select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_MIGHT_HAVE_PC_SERIO
select ARCH_NO_PREEMPT select ARCH_NO_PREEMPT
select ARCH_USE_CMPXCHG_LOCKREF select ARCH_USE_CMPXCHG_LOCKREF
select FORCE_PCI if !ALPHA_JENSEN
select HAVE_AOUT select HAVE_AOUT
select HAVE_IDE select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
...@@ -15,6 +16,7 @@ config ALPHA ...@@ -15,6 +16,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
...@@ -319,17 +321,6 @@ config ISA_DMA_API ...@@ -319,17 +321,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 config PCI_DOMAINS
bool bool
default y default y
...@@ -681,7 +672,6 @@ config HZ ...@@ -681,7 +672,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/eisa/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
......
...@@ -51,9 +51,6 @@ config ARC ...@@ -51,9 +51,6 @@ config ARC
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
...@@ -553,24 +550,7 @@ config FORCE_MAX_ZONEORDER ...@@ -553,24 +550,7 @@ 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 config PCI_SYSCALL
def_bool PCI def_bool PCI
source "drivers/pci/Kconfig"
endmenu
source "kernel/power/Kconfig" source "kernel/power/Kconfig"
...@@ -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
......
...@@ -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
...@@ -147,9 +147,6 @@ config ARM_DMA_IOMMU_ALIGNMENT ...@@ -147,9 +147,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
...@@ -333,7 +330,7 @@ config ARCH_MULTIPLATFORM ...@@ -333,7 +330,7 @@ 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 if PCI
select SPARSE_IRQ select SPARSE_IRQ
select USE_OF select USE_OF
...@@ -407,7 +404,7 @@ config ARCH_IOP13XX ...@@ -407,7 +404,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 +418,7 @@ config ARCH_IOP32X ...@@ -421,7 +418,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 +431,7 @@ config ARCH_IOP33X ...@@ -434,7 +431,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 +446,7 @@ config ARCH_IXP4XX ...@@ -449,7 +446,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 +459,7 @@ config ARCH_DOVE ...@@ -462,7 +459,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,14 +1227,6 @@ config ISA_DMA ...@@ -1230,14 +1227,6 @@ 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 config PCI_DOMAINS
bool "Support for multiple PCI domains" bool "Support for multiple PCI domains"
depends on PCI depends on PCI
...@@ -1266,8 +1255,6 @@ config PCI_HOST_ITE8152 ...@@ -1266,8 +1255,6 @@ config PCI_HOST_ITE8152
default y default y
select DMABOUNCE select DMABOUNCE
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
endmenu endmenu
......
...@@ -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.
...@@ -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:
......
...@@ -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.
......
...@@ -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
......
...@@ -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:
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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.
......
...@@ -103,6 +103,7 @@ config ARM64 ...@@ -103,6 +103,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
...@@ -287,15 +288,6 @@ config ARCH_PROC_KCORE_TEXT ...@@ -287,15 +288,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 config PCI_DOMAINS
def_bool PCI def_bool PCI
...@@ -305,10 +297,6 @@ config PCI_DOMAINS_GENERIC ...@@ -305,10 +297,6 @@ config PCI_DOMAINS_GENERIC
config PCI_SYSCALL config PCI_SYSCALL
def_bool PCI 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"
......
...@@ -47,9 +47,6 @@ config FRAME_POINTER ...@@ -47,9 +47,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
......
...@@ -10,11 +10,11 @@ config IA64 ...@@ -10,11 +10,11 @@ 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 HAVE_UNSTABLE_SCHED_CLOCK select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_EXIT_THREAD select HAVE_EXIT_THREAD
select HAVE_IDE select HAVE_IDE
...@@ -544,20 +544,12 @@ if !IA64_HP_SIM ...@@ -544,20 +544,12 @@ if !IA64_HP_SIM
menu "Bus options (PCI, PCMCIA)" 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 config PCI_DOMAINS
def_bool PCI def_bool PCI
config PCI_SYSCALL config PCI_SYSCALL
def_bool PCI def_bool PCI
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
endmenu endmenu
......
...@@ -63,17 +63,6 @@ source "drivers/zorro/Kconfig" ...@@ -63,17 +63,6 @@ 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
......
...@@ -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
......
...@@ -30,6 +30,7 @@ config MICROBLAZE ...@@ -30,6 +30,7 @@ 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
...@@ -266,9 +267,6 @@ endmenu ...@@ -266,9 +267,6 @@ endmenu
menu "Bus Options" menu "Bus Options"
config PCI
bool "PCI support"
config PCI_DOMAINS config PCI_DOMAINS
def_bool PCI def_bool PCI
...@@ -282,6 +280,4 @@ config PCI_XILINX ...@@ -282,6 +280,4 @@ 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
...@@ -73,6 +73,7 @@ config MIPS ...@@ -73,6 +73,7 @@ config MIPS
select IRQ_FORCED_THREADING select IRQ_FORCED_THREADING
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 PCI_DOMAINS if PCI
select PERF_USE_VMALLOC select PERF_USE_VMALLOC
select RTC_LIB select RTC_LIB
select SYSCTL_EXCEPTION_TRACE select SYSCTL_EXCEPTION_TRACE
...@@ -95,7 +96,7 @@ config MIPS_GENERIC ...@@ -95,7 +96,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
...@@ -256,7 +257,7 @@ config BCM47XX ...@@ -256,7 +257,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
...@@ -299,13 +300,12 @@ config MIPS_COBALT ...@@ -299,13 +300,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
...@@ -422,7 +422,7 @@ config LASAT ...@@ -422,7 +422,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
...@@ -502,7 +502,7 @@ config MIPS_MALTA ...@@ -502,7 +502,7 @@ config MIPS_MALTA
select HAVE_PCSPKR_PLATFORM select HAVE_PCSPKR_PLATFORM
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select MIPS_GIC select MIPS_GIC
select HW_HAS_PCI select HAVE_PCI
select I8253 select I8253
select I8259 select I8259
select MIPS_BONITO64 select MIPS_BONITO64
...@@ -556,7 +556,7 @@ config MACH_PIC32 ...@@ -556,7 +556,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.
...@@ -673,7 +673,7 @@ config SGI_IP27 ...@@ -673,7 +673,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
...@@ -733,7 +733,7 @@ config SGI_IP32 ...@@ -733,7 +733,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
...@@ -843,7 +843,7 @@ config SNI_RM ...@@ -843,7 +843,7 @@ config SNI_RM
select GENERIC_ISA_DMA select GENERIC_ISA_DMA
select HAVE_PCSPKR_PLATFORM select HAVE_PCSPKR_PLATFORM
select HW_HAS_EISA select HW_HAS_EISA
select HW_HAS_PCI select HAVE_PCI
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select I8253 select I8253
select I8259 select I8259
...@@ -876,7 +876,7 @@ config MIKROTIK_RB532 ...@@ -876,7 +876,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
...@@ -903,7 +903,7 @@ config CAVIUM_OCTEON_SOC ...@@ -903,7 +903,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
...@@ -936,7 +936,7 @@ config NLM_XLR_BOARD ...@@ -936,7 +936,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
...@@ -962,7 +962,7 @@ config NLM_XLP_BOARD ...@@ -962,7 +962,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
...@@ -997,7 +997,7 @@ config MIPS_PARAVIRT ...@@ -997,7 +997,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 ????
...@@ -3027,18 +3027,6 @@ menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" ...@@ -3027,18 +3027,6 @@ menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
config HW_HAS_EISA config HW_HAS_EISA
bool 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 PCI_DOMAINS config PCI_DOMAINS
bool bool
...@@ -3054,8 +3042,6 @@ config PCI_DRIVERS_LEGACY ...@@ -3054,8 +3042,6 @@ 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
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
# or other ISA chip on the board that users don't know about so don't expect # or other ISA chip on the board that users don't know about so don't expect
......
...@@ -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
......
...@@ -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
...@@ -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
......
...@@ -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"
...@@ -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
......
...@@ -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 PCI
select I8259 select I8259
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select NR_CPUS_DEFAULT_4 select NR_CPUS_DEFAULT_4
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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
...@@ -17,6 +17,7 @@ config PARISC ...@@ -17,6 +17,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
......
...@@ -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
...@@ -930,23 +931,6 @@ config FSL_GTM ...@@ -930,23 +931,6 @@ 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 config PCI_DOMAINS
def_bool PCI def_bool PCI
...@@ -959,8 +943,6 @@ config PCI_8260 ...@@ -959,8 +943,6 @@ config PCI_8260
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
default y default y
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
config HAS_RAPIDIO config HAS_RAPIDIO
......
...@@ -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.
......
...@@ -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
......
...@@ -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
......
...@@ -3,7 +3,7 @@ config PPC_MPC52xx ...@@ -3,7 +3,7 @@ config PPC_MPC52xx
bool "52xx-based boards" bool "52xx-based boards"
depends on 6xx depends on 6xx
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"
......
...@@ -3,7 +3,7 @@ menuconfig PPC_83xx ...@@ -3,7 +3,7 @@ menuconfig PPC_83xx
bool "83xx-based boards" bool "83xx-based boards"
depends on 6xx depends on 6xx
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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -39,14 +39,14 @@ config 40x ...@@ -39,14 +39,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
......
...@@ -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
......
...@@ -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
......
...@@ -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
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -38,8 +38,10 @@ config RISCV ...@@ -38,8 +38,10 @@ 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_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
...@@ -263,28 +265,12 @@ config CMDLINE_FORCE ...@@ -263,28 +265,12 @@ config CMDLINE_FORCE
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 config PCI_DOMAINS
def_bool PCI def_bool PCI
config PCI_DOMAINS_GENERIC config PCI_DOMAINS_GENERIC
def_bool PCI def_bool PCI
source "drivers/pci/Kconfig"
endmenu
menu "Power management options" menu "Power management options"
source kernel/power/Kconfig source kernel/power/Kconfig
......
...@@ -168,14 +168,20 @@ config S390 ...@@ -168,14 +168,20 @@ 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_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
...@@ -706,17 +712,6 @@ config QDIO ...@@ -706,17 +712,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
...@@ -727,8 +722,6 @@ config PCI_NR_FUNCTIONS ...@@ -727,8 +722,6 @@ 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 config PCI_DOMAINS
......
...@@ -40,13 +40,16 @@ config SUPERH ...@@ -40,13 +40,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
...@@ -130,9 +133,6 @@ config SYS_SUPPORTS_SMP ...@@ -130,9 +133,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
...@@ -855,22 +855,9 @@ config MAPLE ...@@ -855,22 +855,9 @@ 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 config PCI_DOMAINS
bool bool
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
endmenu endmenu
......
...@@ -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
......
...@@ -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
...@@ -472,18 +473,6 @@ config SUN_LDOMS ...@@ -472,18 +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 config PCI_DOMAINS
def_bool PCI if SPARC64 def_bool PCI if SPARC64
...@@ -518,8 +507,6 @@ config SPARC_GRPCI2 ...@@ -518,8 +507,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" source "drivers/pcmcia/Kconfig"
config SUN_OPENPROMFS config SUN_OPENPROMFS
......
...@@ -31,9 +31,6 @@ config ISA ...@@ -31,9 +31,6 @@ config ISA
config SBUS config SBUS
bool bool
config PCI
bool
config PCMCIA config PCMCIA
bool bool
......
...@@ -11,6 +11,7 @@ config UNICORE32 ...@@ -11,6 +11,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
...@@ -118,16 +119,6 @@ endmenu ...@@ -118,16 +119,6 @@ endmenu
menu "Bus support" 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" source "drivers/pcmcia/Kconfig"
endmenu endmenu
......
...@@ -180,6 +180,7 @@ config X86 ...@@ -180,6 +180,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
...@@ -2572,15 +2573,6 @@ endmenu ...@@ -2572,15 +2573,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
...@@ -2663,8 +2655,6 @@ config PCI_CNB20LE_QUIRK ...@@ -2663,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
......
...@@ -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
......
...@@ -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
......
...@@ -26,6 +26,7 @@ config XTENSA ...@@ -26,6 +26,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 IRQ_DOMAIN select IRQ_DOMAIN
...@@ -379,21 +380,6 @@ config XTENSA_CALIBRATE_CCOUNT ...@@ -379,21 +380,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
......
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
......
# 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/pci/Kconfig"
source "drivers/base/Kconfig" source "drivers/base/Kconfig"
......
...@@ -63,17 +63,6 @@ config ISA ...@@ -63,17 +63,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
......
...@@ -3,6 +3,24 @@ ...@@ -3,6 +3,24 @@
# 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.
source "drivers/pci/pcie/Kconfig" source "drivers/pci/pcie/Kconfig"
config PCI_MSI config PCI_MSI
......
...@@ -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
......
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