Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1753d50c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Masahiro Yamada
Browse files

rapidio: consolidate RAPIDIO config entry in drivers/rapidio 



There is no good reason to duplicate the RAPIDIO menu in various
architectures.  Instead provide a selectable HAVE_RAPIDIO symbol
that indicates native availability of RAPIDIO support and the handle
the rest in drivers/pci.  This also means we now provide support
for PCI(e) to Rapidio bridges for every architecture instead of a
limited subset.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPaul Burton <paul.burton@mips.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 8fb71ef9

arch/mips/Kconfig

+1 −14
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ config CAVIUM_OCTEON_SOC 
	bool "Cavium Networks Octeon SoC based boards"

	select CEVT_R4K

	select ARCH_HAS_PHYS_TO_DMA

	select HAS_RAPIDIO

	select HAVE_RAPIDIO

	select PHYS_ADDR_T_64BIT

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN
@@ -3107,19 +3107,6 @@ config ZONE_DMA 
config ZONE_DMA32

	bool



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



config TRAD_SIGNALS

arch/powerpc/Kconfig

+1 −13
Original line number Diff line number Diff line
@@ -939,26 +939,14 @@ config PCI_8260 
	select PPC_INDIRECT_PCI

	default y



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

	bool "Freescale Embedded SRIO Controller support"

	depends on RAPIDIO = y && HAS_RAPIDIO

	depends on RAPIDIO = y && HAVE_RAPIDIO

	default "n"

	---help---

	  Include support for RapidIO controller on Freescale embedded

	  processors (MPC8548, MPC8641, etc).



source "drivers/rapidio/Kconfig"



endmenu



config NONSTATIC_KERNEL

arch/powerpc/platforms/85xx/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ config MPC85xx_CDS 
	bool "Freescale MPC85xx CDS"

	select DEFAULT_UIMAGE

	select PPC_I8259

	select HAS_RAPIDIO

	select HAVE_RAPIDIO

	help

	  This option enables support for the MPC85xx CDS board
@@ -74,7 +74,7 @@ config MPC85xx_MDS 
	bool "Freescale MPC85xx MDS"

	select DEFAULT_UIMAGE

	select PHYLIB if NETDEVICES

	select HAS_RAPIDIO

	select HAVE_RAPIDIO

	select SWIOTLB

	help

	  This option enables support for the MPC85xx MDS board
@@ -219,7 +219,7 @@ config PPA8548 
	help

	  This option enables support for the Prodrive PPA8548 board.

	select DEFAULT_UIMAGE

	select HAS_RAPIDIO

	select HAVE_RAPIDIO



config GE_IMP3A

	bool "GE Intelligent Platforms IMP3A"
@@ -277,7 +277,7 @@ config CORENET_GENERIC 
	select SWIOTLB

	select GPIOLIB

	select GPIO_MPC8XXX

	select HAS_RAPIDIO

	select HAVE_RAPIDIO

	select PPC_EPAPR_HV_PIC

	help

	  This option enables support for the FSL CoreNet based boards.

arch/powerpc/platforms/86xx/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ config MPC8641_HPCN 
	select PPC_I8259

	select DEFAULT_UIMAGE

	select FSL_ULI1575 if PCI

	select HAS_RAPIDIO

	select HAVE_RAPIDIO

	select SWIOTLB

	help

	  This option enables support for the MPC8641 HPCN board.
@@ -57,7 +57,7 @@ config GEF_SBC610 
	select MMIO_NVRAM

	select GPIOLIB

	select GE_FPGA

	select HAS_RAPIDIO

	select HAVE_RAPIDIO

	help

	  This option enables support for the GE SBC610.

arch/x86/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -2811,15 +2811,6 @@ config AMD_NB 
	def_bool y

	depends on CPU_SUP_AMD && PCI



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

	bool "Mark VGA/VBE/EFI FB as generic system framebuffer"

	help