Commit 84e93f1d authored by Alan Tull's avatar Alan Tull Committed by Greg Kroah-Hartman
Browse files

fpga: clean up fpga Kconfig 



The fpga menuconfig has gotten messy.  The bridges and managers are
mixed together.

* Separate the bridges and things dependent on CONFIG_FPGA_BRIDGE
  from the managers.
* Group the managers by vendor in order that they were added
  to the kernel.

The following is what the menuconfig ends up looking like more or less
(platform dependencies are hiding some of these on any given
platform).

    --- FPGA Configuration Framework
    <*>   Altera SOCFPGA FPGA Manager
    <*>   Altera SoCFPGA Arria10
    <*>   Altera Partial Reconfiguration IP Core
    <*>     Platform support of Altera Partial Reconfiguration IP Core
    <*>   Altera FPGA Passive Serial over SPI
    <*>   Altera Arria-V/Cyclone-V/Stratix-V CvP FPGA Manager
    <*>   Xilinx Zynq FPGA
    <*>   Xilinx Configuration over Slave Serial (SPI)
    <*>   Lattice iCE40 SPI
    <*>   Technologic Systems TS-73xx SBC FPGA Manager
    <*>   FPGA Bridge Framework
    <*>     Altera SoCFPGA FPGA Bridges
    <*>     Altera FPGA Freeze Bridge
    <*>     Xilinx LogiCORE PR Decoupler
    <*>     FPGA Region
    <*>       FPGA Region Device Tree Overlay Support

Signed-off-by: default avatarAlan Tull <atull@kernel.org>
Acked-by: default avatarMoritz Fischer <mdf@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8a541679

drivers/fpga/Kconfig

+54 −54
Original line number Diff line number Diff line
@@ -11,33 +11,30 @@ menuconfig FPGA 


if FPGA



config FPGA_REGION

	tristate "FPGA Region"

	depends on FPGA_BRIDGE

config FPGA_MGR_SOCFPGA

	tristate "Altera SOCFPGA FPGA Manager"

	depends on ARCH_SOCFPGA || COMPILE_TEST

	help

	  FPGA Region common code.  A FPGA Region controls a FPGA Manager

	  and the FPGA Bridges associated with either a reconfigurable

	  region of an FPGA or a whole FPGA.

	  FPGA manager driver support for Altera SOCFPGA.



config OF_FPGA_REGION

	tristate "FPGA Region Device Tree Overlay Support"

	depends on OF && FPGA_REGION

config FPGA_MGR_SOCFPGA_A10

	tristate "Altera SoCFPGA Arria10"

	depends on ARCH_SOCFPGA || COMPILE_TEST

	select REGMAP_MMIO

	help

	  Support for loading FPGA images by applying a Device Tree

	  overlay.

	  FPGA manager driver support for Altera Arria10 SoCFPGA.



config FPGA_MGR_ICE40_SPI

	tristate "Lattice iCE40 SPI"

	depends on OF && SPI

config ALTERA_PR_IP_CORE

        tristate "Altera Partial Reconfiguration IP Core"

        help

	  FPGA manager driver support for Lattice iCE40 FPGAs over SPI.

          Core driver support for Altera Partial Reconfiguration IP component



config FPGA_MGR_ALTERA_CVP

	tristate "Altera Arria-V/Cyclone-V/Stratix-V CvP FPGA Manager"

	depends on PCI

config ALTERA_PR_IP_CORE_PLAT

	tristate "Platform support of Altera Partial Reconfiguration IP Core"

	depends on ALTERA_PR_IP_CORE && OF && HAS_IOMEM

	help

	  FPGA manager driver support for Arria-V, Cyclone-V, Stratix-V

	  and Arria 10 Altera FPGAs using the CvP interface over PCIe.

	  Platform driver support for Altera Partial Reconfiguration IP

	  component



config FPGA_MGR_ALTERA_PS_SPI

	tristate "Altera FPGA Passive Serial over SPI"
@@ -46,25 +43,19 @@ config FPGA_MGR_ALTERA_PS_SPI 
	  FPGA manager driver support for Altera Arria/Cyclone/Stratix

	  using the passive serial interface over SPI.



config FPGA_MGR_SOCFPGA

	tristate "Altera SOCFPGA FPGA Manager"

	depends on ARCH_SOCFPGA || COMPILE_TEST

	help

	  FPGA manager driver support for Altera SOCFPGA.



config FPGA_MGR_SOCFPGA_A10

	tristate "Altera SoCFPGA Arria10"

	depends on ARCH_SOCFPGA || COMPILE_TEST

	select REGMAP_MMIO

config FPGA_MGR_ALTERA_CVP

	tristate "Altera Arria-V/Cyclone-V/Stratix-V CvP FPGA Manager"

	depends on PCI

	help

	  FPGA manager driver support for Altera Arria10 SoCFPGA.

	  FPGA manager driver support for Arria-V, Cyclone-V, Stratix-V

	  and Arria 10 Altera FPGAs using the CvP interface over PCIe.



config FPGA_MGR_TS73XX

	tristate "Technologic Systems TS-73xx SBC FPGA Manager"

	depends on ARCH_EP93XX && MACH_TS72XX

config FPGA_MGR_ZYNQ_FPGA

	tristate "Xilinx Zynq FPGA"

	depends on ARCH_ZYNQ || COMPILE_TEST

	depends on HAS_DMA

	help

	  FPGA manager driver support for the Altera Cyclone II FPGA

	  present on the TS-73xx SBC boards.

	  FPGA manager driver support for Xilinx Zynq FPGAs.



config FPGA_MGR_XILINX_SPI

	tristate "Xilinx Configuration over Slave Serial (SPI)"
@@ -73,12 +64,18 @@ config FPGA_MGR_XILINX_SPI 
	  FPGA manager driver support for Xilinx FPGA configuration

	  over slave serial interface.



config FPGA_MGR_ZYNQ_FPGA

	tristate "Xilinx Zynq FPGA"

	depends on ARCH_ZYNQ || COMPILE_TEST

	depends on HAS_DMA

config FPGA_MGR_ICE40_SPI

	tristate "Lattice iCE40 SPI"

	depends on OF && SPI

	help

	  FPGA manager driver support for Xilinx Zynq FPGAs.

	  FPGA manager driver support for Lattice iCE40 FPGAs over SPI.



config FPGA_MGR_TS73XX

	tristate "Technologic Systems TS-73xx SBC FPGA Manager"

	depends on ARCH_EP93XX && MACH_TS72XX

	help

	  FPGA manager driver support for the Altera Cyclone II FPGA

	  present on the TS-73xx SBC boards.



config FPGA_BRIDGE

	tristate "FPGA Bridge Framework"
@@ -102,18 +99,6 @@ config ALTERA_FREEZE_BRIDGE 
	  isolate one region of the FPGA from the busses while that

	  region is being reprogrammed.



config ALTERA_PR_IP_CORE

        tristate "Altera Partial Reconfiguration IP Core"

        help

          Core driver support for Altera Partial Reconfiguration IP component



config ALTERA_PR_IP_CORE_PLAT

	tristate "Platform support of Altera Partial Reconfiguration IP Core"

	depends on ALTERA_PR_IP_CORE && OF && HAS_IOMEM

	help

	  Platform driver support for Altera Partial Reconfiguration IP

	  component



config XILINX_PR_DECOUPLER

	tristate "Xilinx LogiCORE PR Decoupler"

	depends on FPGA_BRIDGE
@@ -124,4 +109,19 @@ config XILINX_PR_DECOUPLER 
	  region of the FPGA from the busses while that region is

	  being reprogrammed during partial reconfig.



config FPGA_REGION

	tristate "FPGA Region"

	depends on FPGA_BRIDGE

	help

	  FPGA Region common code.  A FPGA Region controls a FPGA Manager

	  and the FPGA Bridges associated with either a reconfigurable

	  region of an FPGA or a whole FPGA.



config OF_FPGA_REGION

	tristate "FPGA Region Device Tree Overlay Support"

	depends on OF && FPGA_REGION

	help

	  Support for loading FPGA images by applying a Device Tree

	  overlay.



endif # FPGA

CRA Git | Maintained and supported by SUSTech CRA and CCSE