| Message ID | 20180307154243.3205-8-robh@kernel.org |
|---|---|
| State | Superseded |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | PCI DT header refactoring and compile test improvements | expand |
Hi Rob, Change to PCIE_IPROC_BCMA to be made. On 18-03-07 07:42 AM, Rob Herring wrote: > Add COMPILE_TEST on driver config options with it. Some ARM drivers > still have arch dependencies, so we have to keep those dependent on ARM. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > drivers/pci/dwc/Kconfig | 24 ++++++++++++------------ > drivers/pci/host/Kconfig | 33 +++++++++++++++------------------ > 2 files changed, 27 insertions(+), 30 deletions(-) > > diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig > index 2f3f5c50aa48..6f2b653146bb 100644 > --- a/drivers/pci/dwc/Kconfig > +++ b/drivers/pci/dwc/Kconfig > @@ -66,7 +66,7 @@ config PCIE_DW_PLAT > config PCI_EXYNOS > bool "Samsung Exynos PCIe controller" > depends on PCI > - depends on SOC_EXYNOS5440 > + depends on SOC_EXYNOS5440 || COMPILE_TEST > depends on PCI_MSI_IRQ_DOMAIN > select PCIEPORTBUS > select PCIE_DW_HOST > @@ -74,7 +74,7 @@ config PCI_EXYNOS > config PCI_IMX6 > bool "Freescale i.MX6 PCIe controller" > depends on PCI > - depends on SOC_IMX6Q > + depends on SOC_IMX6Q || (ARM && COMPILE_TEST) > depends on PCI_MSI_IRQ_DOMAIN > select PCIEPORTBUS > select PCIE_DW_HOST > @@ -82,7 +82,7 @@ config PCI_IMX6 > config PCIE_SPEAR13XX > bool "STMicroelectronics SPEAr PCIe controller" > depends on PCI > - depends on ARCH_SPEAR13XX > + depends on ARCH_SPEAR13XX || COMPILE_TEST > depends on PCI_MSI_IRQ_DOMAIN > select PCIEPORTBUS > select PCIE_DW_HOST > @@ -92,7 +92,7 @@ config PCIE_SPEAR13XX > config PCI_KEYSTONE > bool "TI Keystone PCIe controller" > depends on PCI > - depends on ARCH_KEYSTONE > + depends on ARCH_KEYSTONE || (ARM && COMPILE_TEST) > depends on PCI_MSI_IRQ_DOMAIN > select PCIEPORTBUS > select PCIE_DW_HOST > @@ -105,7 +105,7 @@ config PCI_KEYSTONE > config PCI_LAYERSCAPE > bool "Freescale Layerscape PCIe controller" > depends on PCI > - depends on OF && (ARM || ARCH_LAYERSCAPE) > + depends on OF && (ARM || ARCH_LAYERSCAPE || COMPILE_TEST) > depends on PCI_MSI_IRQ_DOMAIN > select MFD_SYSCON > select PCIE_DW_HOST > @@ -113,7 +113,7 @@ config PCI_LAYERSCAPE > Say Y here if you want PCIe controller support on Layerscape SoCs. > > config PCI_HISI > - depends on OF && ARM64 > + depends on OF && (ARM64 || COMPILE_TEST) > bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers" > depends on PCI > depends on PCI_MSI_IRQ_DOMAIN > @@ -127,7 +127,7 @@ config PCI_HISI > config PCIE_QCOM > bool "Qualcomm PCIe controller" > depends on PCI > - depends on ARCH_QCOM && OF > + depends on OF && (ARCH_QCOM || COMPILE_TEST) > depends on PCI_MSI_IRQ_DOMAIN > select PCIEPORTBUS > select PCIE_DW_HOST > @@ -139,7 +139,7 @@ config PCIE_QCOM > config PCIE_ARMADA_8K > bool "Marvell Armada-8K PCIe controller" > depends on PCI > - depends on ARCH_MVEBU > + depends on ARCH_MVEBU || COMPILE_TEST > depends on PCI_MSI_IRQ_DOMAIN > select PCIEPORTBUS > select PCIE_DW_HOST > @@ -154,7 +154,7 @@ config PCIE_ARTPEC6 > > config PCIE_ARTPEC6_HOST > bool "Axis ARTPEC-6 PCIe controller Host Mode" > - depends on MACH_ARTPEC6 > + depends on MACH_ARTPEC6 || COMPILE_TEST > depends on PCI && PCI_MSI_IRQ_DOMAIN > select PCIEPORTBUS > select PCIE_DW_HOST > @@ -165,7 +165,7 @@ config PCIE_ARTPEC6_HOST > > config PCIE_ARTPEC6_EP > bool "Axis ARTPEC-6 PCIe controller Endpoint Mode" > - depends on MACH_ARTPEC6 > + depends on MACH_ARTPEC6 || COMPILE_TEST > depends on PCI_ENDPOINT > select PCIE_DW_EP > select PCIE_ARTPEC6 > @@ -174,7 +174,7 @@ config PCIE_ARTPEC6_EP > endpoint mode. This uses the DesignWare core. > > config PCIE_KIRIN > - depends on OF && ARM64 > + depends on OF && (ARM64 || COMPILE_TEST) > bool "HiSilicon Kirin series SoCs PCIe controllers" > depends on PCI_MSI_IRQ_DOMAIN > depends on PCI > @@ -186,7 +186,7 @@ config PCIE_KIRIN > > config PCIE_HISI_STB > bool "HiSilicon STB SoCs PCIe controllers" > - depends on ARCH_HISI > + depends on ARCH_HISI || COMPILE_TEST > depends on PCI > depends on PCI_MSI_IRQ_DOMAIN > select PCIEPORTBUS > diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig > index a4ed7484d127..752d93ce904e 100644 > --- a/drivers/pci/host/Kconfig > +++ b/drivers/pci/host/Kconfig > @@ -5,13 +5,13 @@ menu "PCI host controller drivers" > > config PCI_MVEBU > bool "Marvell EBU PCIe controller" > - depends on ARCH_MVEBU || ARCH_DOVE > + depends on ARCH_MVEBU || ARCH_DOVE || COMPILE_TEST > depends on ARM > depends on OF > > config PCI_AARDVARK > bool "Aardvark PCIe controller" > - depends on ARCH_MVEBU && ARM64 > + depends on (ARCH_MVEBU && ARM64) || COMPILE_TEST > depends on OF > depends on PCI_MSI_IRQ_DOMAIN > help > @@ -21,7 +21,7 @@ config PCI_AARDVARK > > config PCIE_XILINX_NWL > bool "NWL PCIe Core" > - depends on ARCH_ZYNQMP > + depends on ARCH_ZYNQMP || COMPILE_TEST > depends on PCI_MSI_IRQ_DOMAIN > help > Say 'Y' here if you want kernel support for Xilinx > @@ -32,20 +32,19 @@ config PCIE_XILINX_NWL > config PCI_FTPCI100 > bool "Faraday Technology FTPCI100 PCI controller" > depends on OF > - depends on ARM > default ARCH_GEMINI > > config PCI_TEGRA > bool "NVIDIA Tegra PCIe controller" > - depends on ARCH_TEGRA > + depends on ARCH_TEGRA || COMPILE_TEST > help > Say Y here if you want support for the PCIe host controller found > on NVIDIA Tegra SoCs. > > config PCI_RCAR_GEN2 > bool "Renesas R-Car Gen2 Internal PCI controller" > - depends on ARM > depends on ARCH_RENESAS || COMPILE_TEST > + depends on ARM > help > Say Y here if you want internal PCI support on R-Car Gen2 SoC. > There are 3 internal PCI controllers available with a single > @@ -53,7 +52,7 @@ config PCI_RCAR_GEN2 > > config PCIE_RCAR > bool "Renesas R-Car PCIe controller" > - depends on ARCH_RENESAS || (ARM && COMPILE_TEST) > + depends on ARCH_RENESAS || COMPILE_TEST > depends on PCI_MSI_IRQ_DOMAIN > help > Say Y here if you want PCIe controller support on R-Car SoCs. > @@ -64,7 +63,7 @@ config PCI_HOST_COMMON > > config PCI_HOST_GENERIC > bool "Generic PCI host controller" > - depends on (ARM || ARM64) && OF > + depends on OF > select PCI_HOST_COMMON > select IRQ_DOMAIN > help > @@ -73,14 +72,14 @@ config PCI_HOST_GENERIC > > config PCIE_XILINX > bool "Xilinx AXI PCIe host bridge support" > - depends on ARCH_ZYNQ || MICROBLAZE || (MIPS && PCI_DRIVERS_GENERIC) > + depends on ARCH_ZYNQ || MICROBLAZE || (MIPS && PCI_DRIVERS_GENERIC) || COMPILE_TEST > help > Say 'Y' here if you want kernel to support the Xilinx AXI PCIe > Host Bridge driver. > > config PCI_XGENE > bool "X-Gene PCIe controller" > - depends on ARM64 > + depends on ARM64 || COMPILE_TEST > depends on OF || (ACPI && PCI_QUIRKS) > select PCIEPORTBUS > help > @@ -100,7 +99,7 @@ config PCI_XGENE_MSI > config PCI_V3_SEMI > bool "V3 Semiconductor PCI controller" > depends on OF > - depends on ARM > + depends on ARM || COMPILE_TEST > default ARCH_INTEGRATOR_AP > > config PCI_VERSATILE > @@ -127,7 +126,7 @@ config PCIE_IPROC_PLATFORM > > config PCIE_IPROC_BCMA > tristate "Broadcom iProc PCIe BCMA bus driver" > - depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST) > + depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST) > select PCIE_IPROC > select BCMA > default ARCH_BCM_5301X The was intentionally depending on ARM (as it does not apply to ARM64 which ARCH_BCM__IPROC also applies to). Please keep that in place. depends on (ARM && ARCH_BCM_IPROC) || COMPILE_TEST > @@ -146,8 +145,7 @@ config PCIE_IPROC_MSI > > config PCIE_ALTERA > bool "Altera PCIe controller" > - depends on ARM || NIOS2 > - depends on OF_PCI > + depends on ARM || NIOS2 || COMPILE_TEST > select PCI_DOMAINS > help > Say Y here if you want to enable PCIe controller support on Altera > @@ -163,7 +161,7 @@ config PCIE_ALTERA_MSI > > config PCI_HOST_THUNDER_PEM > bool "Cavium Thunder PCIe controller to off-chip devices" > - depends on ARM64 > + depends on ARM64 || COMPILE_TEST > depends on OF || (ACPI && PCI_QUIRKS) > select PCI_HOST_COMMON > help > @@ -171,7 +169,7 @@ config PCI_HOST_THUNDER_PEM > > config PCI_HOST_THUNDER_ECAM > bool "Cavium Thunder ECAM controller to on-chip devices on pass-1.x silicon" > - depends on ARM64 > + depends on ARM64 || COMPILE_TEST > depends on OF || (ACPI && PCI_QUIRKS) > select PCI_HOST_COMMON > help > @@ -190,9 +188,8 @@ config PCIE_ROCKCHIP > > config PCIE_MEDIATEK > bool "MediaTek PCIe controller" > - depends on (ARM || ARM64) && (ARCH_MEDIATEK || COMPILE_TEST) > + depends on ARCH_MEDIATEK || COMPILE_TEST > depends on OF > - depends on PCI > select PCIEPORTBUS > help > Say Y here if you want to enable PCIe controller support on
On Wed, Mar 7, 2018 at 11:57 AM, Scott Branden <scott.branden@broadcom.com> wrote: > Hi Rob, > > Change to PCIE_IPROC_BCMA to be made. > > > On 18-03-07 07:42 AM, Rob Herring wrote: >> >> Add COMPILE_TEST on driver config options with it. Some ARM drivers >> still have arch dependencies, so we have to keep those dependent on ARM. >> >> Signed-off-by: Rob Herring <robh@kernel.org> >> --- >> drivers/pci/dwc/Kconfig | 24 ++++++++++++------------ >> drivers/pci/host/Kconfig | 33 +++++++++++++++------------------ >> 2 files changed, 27 insertions(+), 30 deletions(-) [...] >> @@ -127,7 +126,7 @@ config PCIE_IPROC_PLATFORM >> config PCIE_IPROC_BCMA >> tristate "Broadcom iProc PCIe BCMA bus driver" >> - depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST) >> + depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST) >> select PCIE_IPROC >> select BCMA >> default ARCH_BCM_5301X > > The was intentionally depending on ARM (as it does not apply to ARM64 which > ARCH_BCM__IPROC also applies to). Please keep that in place. > depends on (ARM && ARCH_BCM_IPROC) || COMPILE_TEST Indeed. Lorenzo, can you fix up or want me to send a new version? Rob
On Fri, Mar 16, 2018 at 02:53:16PM -0500, Rob Herring wrote: > On Wed, Mar 7, 2018 at 11:57 AM, Scott Branden > <scott.branden@broadcom.com> wrote: > > Hi Rob, > > > > Change to PCIE_IPROC_BCMA to be made. > > > > > > On 18-03-07 07:42 AM, Rob Herring wrote: > >> > >> Add COMPILE_TEST on driver config options with it. Some ARM drivers > >> still have arch dependencies, so we have to keep those dependent on ARM. > >> > >> Signed-off-by: Rob Herring <robh@kernel.org> > >> --- > >> drivers/pci/dwc/Kconfig | 24 ++++++++++++------------ > >> drivers/pci/host/Kconfig | 33 +++++++++++++++------------------ > >> 2 files changed, 27 insertions(+), 30 deletions(-) > > [...] > > >> @@ -127,7 +126,7 @@ config PCIE_IPROC_PLATFORM > >> config PCIE_IPROC_BCMA > >> tristate "Broadcom iProc PCIe BCMA bus driver" > >> - depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST) > >> + depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST) > >> select PCIE_IPROC > >> select BCMA > >> default ARCH_BCM_5301X > > > > The was intentionally depending on ARM (as it does not apply to ARM64 which > > ARCH_BCM__IPROC also applies to). Please keep that in place. > > depends on (ARM && ARCH_BCM_IPROC) || COMPILE_TEST > > Indeed. > > Lorenzo, can you fix up or want me to send a new version? Hi Rob, I can fix it up, I am not sure where the dependency on ARM is though, isn't patch 2 supposed to remove it ? I am certainly missing something here so please chime in. Thanks, Lorenzo
Hi Lorenzo, On 18-03-19 11:05 AM, Lorenzo Pieralisi wrote: > On Fri, Mar 16, 2018 at 02:53:16PM -0500, Rob Herring wrote: >> On Wed, Mar 7, 2018 at 11:57 AM, Scott Branden >> <scott.branden@broadcom.com> wrote: >>> Hi Rob, >>> >>> Change to PCIE_IPROC_BCMA to be made. >>> >>> >>> On 18-03-07 07:42 AM, Rob Herring wrote: >>>> Add COMPILE_TEST on driver config options with it. Some ARM drivers >>>> still have arch dependencies, so we have to keep those dependent on ARM. >>>> >>>> Signed-off-by: Rob Herring <robh@kernel.org> >>>> --- >>>> drivers/pci/dwc/Kconfig | 24 ++++++++++++------------ >>>> drivers/pci/host/Kconfig | 33 +++++++++++++++------------------ >>>> 2 files changed, 27 insertions(+), 30 deletions(-) >> [...] >> >>>> @@ -127,7 +126,7 @@ config PCIE_IPROC_PLATFORM >>>> config PCIE_IPROC_BCMA >>>> tristate "Broadcom iProc PCIe BCMA bus driver" >>>> - depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST) >>>> + depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST) >>>> select PCIE_IPROC >>>> select BCMA >>>> default ARCH_BCM_5301X >>> The was intentionally depending on ARM (as it does not apply to ARM64 which >>> ARCH_BCM__IPROC also applies to). Please keep that in place. >>> depends on (ARM && ARCH_BCM_IPROC) || COMPILE_TEST >> Indeed. >> >> Lorenzo, can you fix up or want me to send a new version? > Hi Rob, > > I can fix it up, I am not sure where the dependency on ARM is though, > isn't patch 2 supposed to remove it ? I am certainly missing something > here so please chime in. > > Thanks, > Lorenzo You patch wanted to remove the dependency on ARM during COMPILE_TEST. But, during normal use, it should not remove such dependency. As such, the following is the correct change to make: depends on (ARM && ARCH_BCM_IPROC) || COMPILE_TEST Thanks, Scott
diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig index 2f3f5c50aa48..6f2b653146bb 100644 --- a/drivers/pci/dwc/Kconfig +++ b/drivers/pci/dwc/Kconfig @@ -66,7 +66,7 @@ config PCIE_DW_PLAT config PCI_EXYNOS bool "Samsung Exynos PCIe controller" depends on PCI - depends on SOC_EXYNOS5440 + depends on SOC_EXYNOS5440 || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@ -74,7 +74,7 @@ config PCI_EXYNOS config PCI_IMX6 bool "Freescale i.MX6 PCIe controller" depends on PCI - depends on SOC_IMX6Q + depends on SOC_IMX6Q || (ARM && COMPILE_TEST) depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@ -82,7 +82,7 @@ config PCI_IMX6 config PCIE_SPEAR13XX bool "STMicroelectronics SPEAr PCIe controller" depends on PCI - depends on ARCH_SPEAR13XX + depends on ARCH_SPEAR13XX || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@ -92,7 +92,7 @@ config PCIE_SPEAR13XX config PCI_KEYSTONE bool "TI Keystone PCIe controller" depends on PCI - depends on ARCH_KEYSTONE + depends on ARCH_KEYSTONE || (ARM && COMPILE_TEST) depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@ -105,7 +105,7 @@ config PCI_KEYSTONE config PCI_LAYERSCAPE bool "Freescale Layerscape PCIe controller" depends on PCI - depends on OF && (ARM || ARCH_LAYERSCAPE) + depends on OF && (ARM || ARCH_LAYERSCAPE || COMPILE_TEST) depends on PCI_MSI_IRQ_DOMAIN select MFD_SYSCON select PCIE_DW_HOST @@ -113,7 +113,7 @@ config PCI_LAYERSCAPE Say Y here if you want PCIe controller support on Layerscape SoCs. config PCI_HISI - depends on OF && ARM64 + depends on OF && (ARM64 || COMPILE_TEST) bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers" depends on PCI depends on PCI_MSI_IRQ_DOMAIN @@ -127,7 +127,7 @@ config PCI_HISI config PCIE_QCOM bool "Qualcomm PCIe controller" depends on PCI - depends on ARCH_QCOM && OF + depends on OF && (ARCH_QCOM || COMPILE_TEST) depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@ -139,7 +139,7 @@ config PCIE_QCOM config PCIE_ARMADA_8K bool "Marvell Armada-8K PCIe controller" depends on PCI - depends on ARCH_MVEBU + depends on ARCH_MVEBU || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@ -154,7 +154,7 @@ config PCIE_ARTPEC6 config PCIE_ARTPEC6_HOST bool "Axis ARTPEC-6 PCIe controller Host Mode" - depends on MACH_ARTPEC6 + depends on MACH_ARTPEC6 || COMPILE_TEST depends on PCI && PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@ -165,7 +165,7 @@ config PCIE_ARTPEC6_HOST config PCIE_ARTPEC6_EP bool "Axis ARTPEC-6 PCIe controller Endpoint Mode" - depends on MACH_ARTPEC6 + depends on MACH_ARTPEC6 || COMPILE_TEST depends on PCI_ENDPOINT select PCIE_DW_EP select PCIE_ARTPEC6 @@ -174,7 +174,7 @@ config PCIE_ARTPEC6_EP endpoint mode. This uses the DesignWare core. config PCIE_KIRIN - depends on OF && ARM64 + depends on OF && (ARM64 || COMPILE_TEST) bool "HiSilicon Kirin series SoCs PCIe controllers" depends on PCI_MSI_IRQ_DOMAIN depends on PCI @@ -186,7 +186,7 @@ config PCIE_KIRIN config PCIE_HISI_STB bool "HiSilicon STB SoCs PCIe controllers" - depends on ARCH_HISI + depends on ARCH_HISI || COMPILE_TEST depends on PCI depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig index a4ed7484d127..752d93ce904e 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@ -5,13 +5,13 @@ menu "PCI host controller drivers" config PCI_MVEBU bool "Marvell EBU PCIe controller" - depends on ARCH_MVEBU || ARCH_DOVE + depends on ARCH_MVEBU || ARCH_DOVE || COMPILE_TEST depends on ARM depends on OF config PCI_AARDVARK bool "Aardvark PCIe controller" - depends on ARCH_MVEBU && ARM64 + depends on (ARCH_MVEBU && ARM64) || COMPILE_TEST depends on OF depends on PCI_MSI_IRQ_DOMAIN help @@ -21,7 +21,7 @@ config PCI_AARDVARK config PCIE_XILINX_NWL bool "NWL PCIe Core" - depends on ARCH_ZYNQMP + depends on ARCH_ZYNQMP || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN help Say 'Y' here if you want kernel support for Xilinx @@ -32,20 +32,19 @@ config PCIE_XILINX_NWL config PCI_FTPCI100 bool "Faraday Technology FTPCI100 PCI controller" depends on OF - depends on ARM default ARCH_GEMINI config PCI_TEGRA bool "NVIDIA Tegra PCIe controller" - depends on ARCH_TEGRA + depends on ARCH_TEGRA || COMPILE_TEST help Say Y here if you want support for the PCIe host controller found on NVIDIA Tegra SoCs. config PCI_RCAR_GEN2 bool "Renesas R-Car Gen2 Internal PCI controller" - depends on ARM depends on ARCH_RENESAS || COMPILE_TEST + depends on ARM help Say Y here if you want internal PCI support on R-Car Gen2 SoC. There are 3 internal PCI controllers available with a single @@ -53,7 +52,7 @@ config PCI_RCAR_GEN2 config PCIE_RCAR bool "Renesas R-Car PCIe controller" - depends on ARCH_RENESAS || (ARM && COMPILE_TEST) + depends on ARCH_RENESAS || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN help Say Y here if you want PCIe controller support on R-Car SoCs. @@ -64,7 +63,7 @@ config PCI_HOST_COMMON config PCI_HOST_GENERIC bool "Generic PCI host controller" - depends on (ARM || ARM64) && OF + depends on OF select PCI_HOST_COMMON select IRQ_DOMAIN help @@ -73,14 +72,14 @@ config PCI_HOST_GENERIC config PCIE_XILINX bool "Xilinx AXI PCIe host bridge support" - depends on ARCH_ZYNQ || MICROBLAZE || (MIPS && PCI_DRIVERS_GENERIC) + depends on ARCH_ZYNQ || MICROBLAZE || (MIPS && PCI_DRIVERS_GENERIC) || COMPILE_TEST help Say 'Y' here if you want kernel to support the Xilinx AXI PCIe Host Bridge driver. config PCI_XGENE bool "X-Gene PCIe controller" - depends on ARM64 + depends on ARM64 || COMPILE_TEST depends on OF || (ACPI && PCI_QUIRKS) select PCIEPORTBUS help @@ -100,7 +99,7 @@ config PCI_XGENE_MSI config PCI_V3_SEMI bool "V3 Semiconductor PCI controller" depends on OF - depends on ARM + depends on ARM || COMPILE_TEST default ARCH_INTEGRATOR_AP config PCI_VERSATILE @@ -127,7 +126,7 @@ config PCIE_IPROC_PLATFORM config PCIE_IPROC_BCMA tristate "Broadcom iProc PCIe BCMA bus driver" - depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST) + depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST) select PCIE_IPROC select BCMA default ARCH_BCM_5301X @@ -146,8 +145,7 @@ config PCIE_IPROC_MSI config PCIE_ALTERA bool "Altera PCIe controller" - depends on ARM || NIOS2 - depends on OF_PCI + depends on ARM || NIOS2 || COMPILE_TEST select PCI_DOMAINS help Say Y here if you want to enable PCIe controller support on Altera @@ -163,7 +161,7 @@ config PCIE_ALTERA_MSI config PCI_HOST_THUNDER_PEM bool "Cavium Thunder PCIe controller to off-chip devices" - depends on ARM64 + depends on ARM64 || COMPILE_TEST depends on OF || (ACPI && PCI_QUIRKS) select PCI_HOST_COMMON help @@ -171,7 +169,7 @@ config PCI_HOST_THUNDER_PEM config PCI_HOST_THUNDER_ECAM bool "Cavium Thunder ECAM controller to on-chip devices on pass-1.x silicon" - depends on ARM64 + depends on ARM64 || COMPILE_TEST depends on OF || (ACPI && PCI_QUIRKS) select PCI_HOST_COMMON help @@ -190,9 +188,8 @@ config PCIE_ROCKCHIP config PCIE_MEDIATEK bool "MediaTek PCIe controller" - depends on (ARM || ARM64) && (ARCH_MEDIATEK || COMPILE_TEST) + depends on ARCH_MEDIATEK || COMPILE_TEST depends on OF - depends on PCI select PCIEPORTBUS help Say Y here if you want to enable PCIe controller support on
Add COMPILE_TEST on driver config options with it. Some ARM drivers still have arch dependencies, so we have to keep those dependent on ARM. Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/pci/dwc/Kconfig | 24 ++++++++++++------------ drivers/pci/host/Kconfig | 33 +++++++++++++++------------------ 2 files changed, 27 insertions(+), 30 deletions(-)