mirror of https://github.com/hak5/openwrt-owl.git
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
|
From c1b98e41b356a1807d7083d958790da2027c0d9d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
||
|
|
Date: Tue, 24 Nov 2015 15:28:48 -0600
|
||
|
|
Subject: [PATCH] PCI: iproc: Hide CONFIG_PCIE_IPROC
|
||
|
|
|
||
|
|
PCIE_IPROC_BCMA does not require CONFIG_OF in Kconfig, but
|
||
|
|
CONFIG_PCIE_IPROC does, so we can get a warning when building for an ARM
|
||
|
|
platform without DT support:
|
||
|
|
|
||
|
|
warning: (PCIE_IPROC_PLATFORM && PCIE_IPROC_BCMA) selects PCIE_IPROC which has unmet direct dependencies (PCI && OF && (ARM || ARM64))
|
||
|
|
|
||
|
|
It turns out that CONFIG_PCIE_IPROC never needs to be enabled by a user
|
||
|
|
anyway, we can simply rely on it being selected implictly through either
|
||
|
|
PCIE_IPROC_PLATFORM or PCIE_IPROC_BCMA.
|
||
|
|
|
||
|
|
Fixes: 4785ffbdc9b5 ("PCI: iproc: Add BCMA PCIe driver")
|
||
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
||
|
|
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
|
||
|
|
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
---
|
||
|
|
drivers/pci/host/Kconfig | 8 +++-----
|
||
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/pci/host/Kconfig
|
||
|
|
+++ b/drivers/pci/host/Kconfig
|
||
|
|
@@ -119,13 +119,11 @@ config PCI_VERSATILE
|
||
|
|
depends on ARCH_VERSATILE
|
||
|
|
|
||
|
|
config PCIE_IPROC
|
||
|
|
- tristate "Broadcom iProc PCIe controller"
|
||
|
|
- depends on OF && (ARM || ARM64)
|
||
|
|
- default n
|
||
|
|
+ tristate
|
||
|
|
help
|
||
|
|
This enables the iProc PCIe core controller support for Broadcom's
|
||
|
|
- iProc family of SoCs. An appropriate bus interface driver also needs
|
||
|
|
- to be enabled
|
||
|
|
+ iProc family of SoCs. An appropriate bus interface driver needs
|
||
|
|
+ to be enabled to select this.
|
||
|
|
|
||
|
|
config PCIE_IPROC_PLATFORM
|
||
|
|
tristate "Broadcom iProc PCIe platform bus driver"
|