Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

[platform/kernel/u-boot.git] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 9a7c187..8af2470 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -1,7 +1,15 @@
-menu "PCI"
+menuconfig PCI
+       bool "PCI support"
+       default y if PPC
+       help
+         Enable support for PCI (Peripheral Interconnect Bus), a type of bus
+         used on some devices to allow the CPU to communicate with its
+         peripherals.
+
+if PCI
 
 config DM_PCI
-       bool "Enable driver mode for PCI"
+       bool "Enable driver model for PCI"
        depends on DM
        help
          Use driver model for PCI. Driver model is the new method for
@@ -18,6 +26,22 @@ config DM_PCI_COMPAT
          measure when porting a board to use driver model for PCI. Once the
          board is fully supported, this option should be disabled.
 
+config PCI_PNP
+       bool "Enable Plug & Play support for PCI"
+       depends on PCI || DM_PCI
+       default y
+       help
+         Enable PCI memory and I/O space resource allocation and assignment.
+
+config PCIE_DW_MVEBU
+       bool "Enable Armada-8K PCIe driver (DesignWare core)"
+       depends on DM_PCI
+       depends on ARMADA_8K
+       help
+         Say Y here if you want to enable PCIe controller support on
+         Armada-8K SoCs. The PCIe controller on Armada-8K is based on
+         DesignWare hardware.
+
 config PCI_SANDBOX
        bool "Sandbox PCI support"
        depends on SANDBOX && DM_PCI
@@ -46,4 +70,12 @@ config PCI_XILINX
          Enable support for the Xilinx AXI bridge for PCI express, an IP block
          which can be used on some generations of Xilinx FPGAs.
 
-endmenu
+config PCIE_LAYERSCAPE
+       bool "Layerscape PCIe support"
+       depends on DM_PCI
+       help
+         Support Layerscape PCIe. The Layerscape SoC may have one or several
+         PCIe controllers. The PCIe may works in RC or EP mode according to
+         RCW[HOST_AGT_PEX] setting.
+
+endif