Commit 19530313 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/alpha/Kconfig

+12 −28
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ config ALPHA 
	select ARCH_NO_PREEMPT

	select ARCH_NO_SG_CHAIN

	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_IDE

	select HAVE_OPROFILE
@@ -16,6 +19,7 @@ config ALPHA 
	select NEED_SG_DMA_LENGTH

	select VIRT_TO_BUS

	select GENERIC_IRQ_PROBE

	select GENERIC_PCI_IOMAP if PCI

	select AUTO_IRQ_AFFINITY if SMP

	select GENERIC_IRQ_SHOW

	select ARCH_WANT_IPC_PARSE_VERSION
@@ -126,11 +130,13 @@ choice 
config ALPHA_GENERIC

	bool "Generic"

	depends on TTY

	select HAVE_EISA

	help

	  A generic kernel will run on all supported Alpha hardware.



config ALPHA_ALCOR

	bool "Alcor/Alpha-XLT"

	select HAVE_EISA

	help

	  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
@@ -203,6 +209,7 @@ config ALPHA_EIGER 
config ALPHA_JENSEN

	bool "Jensen"

	depends on BROKEN

	select HAVE_EISA

	help

	  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
@@ -219,6 +226,7 @@ config ALPHA_LX164 


config ALPHA_LYNX

	bool "Lynx"

	select HAVE_EISA

	help

	  AlphaServer 2100A-based systems.
@@ -229,6 +237,7 @@ config ALPHA_MARVEL 


config ALPHA_MIATA

	bool "Miata"

	select HAVE_EISA

	help

	  The Digital PersonalWorkStation (PWS 433a, 433au, 500a, 500au, 600a,

	  or 600au).
@@ -248,6 +257,7 @@ config ALPHA_NONAME_CH 


config ALPHA_NORITAKE

	bool "Noritake"

	select HAVE_EISA

	help

	  AlphaServer 1000A, AlphaServer 600A, and AlphaServer 800-based

	  systems.
@@ -260,6 +270,7 @@ config ALPHA_P2K 


config ALPHA_RAWHIDE

	bool "Rawhide"

	select HAVE_EISA

	help

	  AlphaServer 1200, AlphaServer 4000 and AlphaServer 4100 machines.

	  See HOWTO at
@@ -279,6 +290,7 @@ config ALPHA_SX164 


config ALPHA_SABLE

	bool "Sable"

	select HAVE_EISA

	help

	  Digital AlphaServer 2000 and 2100-based systems.
@@ -319,24 +331,6 @@ config ISA_DMA_API 
	bool

	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

	bool

	depends on ALPHA_BOOK1 || ALPHA_NONAME_CH
@@ -526,11 +520,6 @@ config ALPHA_SRM 


	  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

	def_bool y
@@ -681,11 +670,6 @@ config HZ 
	default 1200 if HZ_1200

	default 1024



source "drivers/pci/Kconfig"

source "drivers/eisa/Kconfig"



source "drivers/pcmcia/Kconfig"



config SRM_ENV

	tristate "SRM environment through procfs"

	depends on PROC_FS

arch/arc/Kconfig

+1 −23
Original line number Diff line number Diff line
@@ -45,14 +45,12 @@ config ARC 
	select OF

	select OF_EARLY_FLATTREE

	select OF_RESERVED_MEM

	select PCI_SYSCALL if PCI

	select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING



config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y



config MIGHT_HAVE_PCI

	bool



config TRACE_IRQFLAGS_SUPPORT

	def_bool y
@@ -541,24 +539,4 @@ config FORCE_MAX_ZONEORDER 
	default "12" if ARC_HUGEPAGE_16M

	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"

arch/arc/plat-axs10x/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ menuconfig ARC_PLAT_AXS10X 
	select DW_APB_ICTL

	select GPIO_DWAPB

	select OF_GPIO

	select MIGHT_HAVE_PCI

	select HAVE_PCI

	select GENERIC_IRQ_CHIP

	select GPIOLIB

	select AXS101 if ISA_ARCOMPACT

arch/arc/plat-hsdk/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,4 @@ menuconfig ARC_SOC_HSDK 
	select ARC_HAS_ACCL_REGS

	select CLK_HSDK

	select RESET_HSDK

	select MIGHT_HAVE_PCI
 
	select HAVE_PCI

arch/arm/Kconfig

+8 −53
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ config ARM 
	select OF_RESERVED_MEM if OF

	select OLD_SIGACTION

	select OLD_SIGSUSPEND3

	select PCI_SYSCALL if PCI

	select PERF_USE_VMALLOC

	select REFCOUNT_FULL

	select RTC_LIB
@@ -147,9 +148,6 @@ config ARM_DMA_IOMMU_ALIGNMENT 


endif



config MIGHT_HAVE_PCI

	bool



config SYS_SUPPORTS_APM_EMULATION

	bool
@@ -163,21 +161,6 @@ config HAVE_PROC_CPU 
config NO_IOPORT_MAP

	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

	bool
@@ -333,8 +316,8 @@ config ARCH_MULTIPLATFORM 
	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_MULTI_HANDLER

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	select HAVE_PCI

	select PCI_DOMAINS_GENERIC if PCI

	select SPARSE_IRQ

	select USE_OF
@@ -407,7 +390,7 @@ config ARCH_IOP13XX 
	select CPU_XSC3

	select NEED_MACH_MEMORY_H

	select NEED_RET_TO_USER

	select PCI

	select FORCE_PCI

	select PLAT_IOP

	select VMSPLIT_1G

	select SPARSE_IRQ
@@ -421,7 +404,7 @@ config ARCH_IOP32X 
	select GPIO_IOP

	select GPIOLIB

	select NEED_RET_TO_USER

	select PCI

	select FORCE_PCI

	select PLAT_IOP

	help

	  Support for Intel's 80219 and IOP32X (XScale) family of
@@ -434,7 +417,7 @@ config ARCH_IOP33X 
	select GPIO_IOP

	select GPIOLIB

	select NEED_RET_TO_USER

	select PCI

	select FORCE_PCI

	select PLAT_IOP

	help

	  Support for Intel's IOP33X (XScale) family of processors.
@@ -449,7 +432,7 @@ config ARCH_IXP4XX 
	select DMABOUNCE if PCI

	select GENERIC_CLOCKEVENTS

	select GPIOLIB

	select MIGHT_HAVE_PCI

	select HAVE_PCI

	select NEED_MACH_IO_H

	select USB_EHCI_BIG_ENDIAN_DESC

	select USB_EHCI_BIG_ENDIAN_MMIO
@@ -462,7 +445,7 @@ config ARCH_DOVE 
	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_MULTI_HANDLER

	select GPIOLIB

	select MIGHT_HAVE_PCI

	select HAVE_PCI

	select MVEBU_MBUS

	select PINCTRL

	select PINCTRL_DOVE
@@ -1230,46 +1213,18 @@ config ISA_DMA 
config ISA_DMA_API

	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

	bool "BSE nanoEngine PCI support"

	depends on SA1100_NANOENGINE

	help

	  Enable PCI on the BSE nanoEngine board.



config PCI_SYSCALL

	def_bool PCI



config PCI_HOST_ITE8152

	bool

	depends on PCI && MACH_ARMCORE

	default y

	select DMABOUNCE



source "drivers/pci/Kconfig"



source "drivers/pcmcia/Kconfig"



endmenu



menu "Kernel Features"

CRA Git | Maintained and supported by SUSTech CRA and CCSE