diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-16 18:45:03 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-16 18:46:44 +0300 |
| commit | 36f890f6b08274e426306ab39f57e61ea975f456 (patch) | |
| tree | c7242e4dbb686a72e17305b4a9bf725d4e1644a0 | |
| parent | 6674edaabfd271471608146806f5b6540bc76a1b (diff) | |
| download | u-boot-36f890f6b08274e426306ab39f57e61ea975f456.tar.xz | |
pci: Fix mismerge with v2021.10-rc4
With legacy PCI code removed and thus DM_PCI also removed, a few places
did not get correctly updated with the merge to next and thus broke.
Remove now extraneous dependencies on DM_PCI.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | drivers/ata/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/pci/Kconfig | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 96c7c30375..5639536811 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -36,7 +36,7 @@ menu "SATA/SCSI device support" config AHCI_PCI bool "Support for PCI-based AHCI controller" - depends on DM_PCI + depends on PCI depends on DM_SCSI help Enables support for the PCI-based AHCI controller. diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index e93518ebc1..cc139af6cb 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -21,7 +21,6 @@ config DM_PCI_COMPAT config PCI_AARDVARK bool "Enable Aardvark PCIe driver" - depends on DM_PCI depends on DM_GPIO depends on ARMADA_3700 help @@ -37,7 +36,6 @@ config PCI_PNP config PCI_REGION_MULTI_ENTRY bool "Enable Multiple entries of region type MEMORY in ranges for PCI" - depends on PCI || DM_PCI help Enable PCI memory regions to be of multiple entry. Multiple entry here refers to allow more than one count of address ranges for MEMORY @@ -57,7 +55,6 @@ config PCI_MAP_SYSTEM_MEMORY config PCI_SRIOV bool "Enable Single Root I/O Virtualization support for PCI" - depends on PCI || DM_PCI help Say Y here if you want to enable PCI Single Root I/O Virtualization capability support. This helps to enumerate Virtual Function devices @@ -66,7 +63,6 @@ config PCI_SRIOV config PCI_ARID bool "Enable Alternate Routing-ID support for PCI" - depends on PCI || DM_PCI help Say Y here if you want to enable Alternate Routing-ID capability support on PCI devices. This helps to skip some devices in BDF @@ -74,14 +70,12 @@ config PCI_ARID config PCIE_ECAM_GENERIC bool "Generic ECAM-based PCI host controller support" - depends on DM_PCI help Say Y here if you want to enable support for generic ECAM-based PCIe host controllers, such as the one emulated by QEMU. config PCIE_ECAM_SYNQUACER bool "SynQuacer ECAM-based PCI host controller support" - depends on DM_PCI select PCI_INIT_R select PCI_REGION_MULTI_ENTRY help |