public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Remove depends on HAS_DMA in case of platform dependency

Browse source 
Remove dependencies on HAS_DMA where a Kconfig symbol depends on another
symbol that implies HAS_DMA, and, optionally, on "|| COMPILE_TEST".
In most cases this other symbol is an architecture or platform specific
symbol, or PCI.

Generic symbols and drivers without platform dependencies keep their
dependencies on HAS_DMA, to prevent compiling subsystems or drivers that
cannot work anyway.

This simplifies the dependencies, and allows to improve compile-testing.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Geert Uytterhoeven 2018-06-22 13:08:43 +02:00 • committed by David S. Miller
parent 935c5e3eaf
commit e020797b7d
12 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ethernet/amd/Kconfig
View file

@ -173,7 +173,7 @@ config SUNLANCE
config AMD_XGBE config AMD_XGBE
tristate "AMD 10GbE Ethernet driver" tristate "AMD 10GbE Ethernet driver"
depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM && HAS_DMA depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM
depends on X86 || ARM64 || COMPILE_TEST depends on X86 || ARM64 || COMPILE_TEST
select BITREVERSE select BITREVERSE
select CRC32 select CRC32

1
drivers/net/ethernet/apm/xgene-v2/Kconfig
View file

@ -1,6 +1,5 @@
config NET_XGENE_V2 config NET_XGENE_V2
tristate "APM X-Gene SoC Ethernet-v2 Driver" tristate "APM X-Gene SoC Ethernet-v2 Driver"
depends on HAS_DMA
depends on ARCH_XGENE || COMPILE_TEST depends on ARCH_XGENE || COMPILE_TEST
help help
This is the Ethernet driver for the on-chip ethernet interface This is the Ethernet driver for the on-chip ethernet interface

1
drivers/net/ethernet/apm/xgene/Kconfig
View file

@ -1,6 +1,5 @@
config NET_XGENE config NET_XGENE
tristate "APM X-Gene SoC Ethernet Driver" tristate "APM X-Gene SoC Ethernet Driver"
depends on HAS_DMA
depends on ARCH_XGENE || COMPILE_TEST depends on ARCH_XGENE || COMPILE_TEST
select PHYLIB select PHYLIB
select MDIO_XGENE select MDIO_XGENE

6
drivers/net/ethernet/arc/Kconfig
View file

@ -24,7 +24,8 @@ config ARC_EMAC_CORE
config ARC_EMAC config ARC_EMAC
tristate "ARC EMAC support" tristate "ARC EMAC support"
select ARC_EMAC_CORE select ARC_EMAC_CORE
depends on OF_IRQ && OF_NET && HAS_DMA && (ARC || COMPILE_TEST) depends on OF_IRQ && OF_NET
depends on ARC || COMPILE_TEST
---help--- ---help---
On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x
non-standard on-chip ethernet device ARC EMAC 10/100 is used. non-standard on-chip ethernet device ARC EMAC 10/100 is used.
@ -33,7 +34,8 @@ config ARC_EMAC
config EMAC_ROCKCHIP config EMAC_ROCKCHIP
tristate "Rockchip EMAC support" tristate "Rockchip EMAC support"
select ARC_EMAC_CORE select ARC_EMAC_CORE
depends on OF_IRQ && OF_NET && REGULATOR && HAS_DMA && (ARCH_ROCKCHIP || COMPILE_TEST) depends on OF_IRQ && OF_NET && REGULATOR
depends on ARCH_ROCKCHIP || COMPILE_TEST
---help--- ---help---
Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers. Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers.
This selects Rockchip SoC glue layer support for the This selects Rockchip SoC glue layer support for the

2
drivers/net/ethernet/broadcom/Kconfig
View file

@ -157,7 +157,6 @@ config BGMAC
config BGMAC_BCMA config BGMAC_BCMA
tristate "Broadcom iProc GBit BCMA support" tristate "Broadcom iProc GBit BCMA support"
depends on BCMA && BCMA_HOST_SOC depends on BCMA && BCMA_HOST_SOC
depends on HAS_DMA
depends on BCM47XX || ARCH_BCM_5301X || COMPILE_TEST depends on BCM47XX || ARCH_BCM_5301X || COMPILE_TEST
select BGMAC select BGMAC
select PHYLIB select PHYLIB
@ -170,7 +169,6 @@ config BGMAC_BCMA
config BGMAC_PLATFORM config BGMAC_PLATFORM
tristate "Broadcom iProc GBit platform support" tristate "Broadcom iProc GBit platform support"
depends on HAS_DMA
depends on ARCH_BCM_IPROC || COMPILE_TEST depends on ARCH_BCM_IPROC || COMPILE_TEST
depends on OF depends on OF
select BGMAC select BGMAC

2
drivers/net/ethernet/calxeda/Kconfig
View file

@ -1,6 +1,6 @@
config NET_CALXEDA_XGMAC config NET_CALXEDA_XGMAC
tristate "Calxeda 1G/10G XGMAC Ethernet driver" tristate "Calxeda 1G/10G XGMAC Ethernet driver"
depends on HAS_IOMEM && HAS_DMA depends on HAS_IOMEM
depends on ARCH_HIGHBANK || COMPILE_TEST depends on ARCH_HIGHBANK || COMPILE_TEST
select CRC32 select CRC32
help help

2
drivers/net/ethernet/hisilicon/Kconfig
View file

@ -5,7 +5,7 @@
config NET_VENDOR_HISILICON config NET_VENDOR_HISILICON
bool "Hisilicon devices" bool "Hisilicon devices"
default y default y
depends on (OF || ACPI) && HAS_DMA depends on OF || ACPI
depends on ARM || ARM64 || COMPILE_TEST depends on ARM || ARM64 || COMPILE_TEST
---help--- ---help---
If you have a network (Ethernet) card belonging to this class, say Y. If you have a network (Ethernet) card belonging to this class, say Y.

8
drivers/net/ethernet/marvell/Kconfig
View file

@ -18,8 +18,8 @@ if NET_VENDOR_MARVELL
config MV643XX_ETH config MV643XX_ETH
tristate "Marvell Discovery (643XX) and Orion ethernet support" tristate "Marvell Discovery (643XX) and Orion ethernet support"
depends on (MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST) && INET depends on MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST
depends on HAS_DMA depends on INET
select PHYLIB select PHYLIB
select MVMDIO select MVMDIO
---help--- ---help---
@ -58,7 +58,6 @@ config MVNETA_BM_ENABLE
config MVNETA config MVNETA
tristate "Marvell Armada 370/38x/XP/37xx network interface support" tristate "Marvell Armada 370/38x/XP/37xx network interface support"
depends on ARCH_MVEBU || COMPILE_TEST depends on ARCH_MVEBU || COMPILE_TEST
depends on HAS_DMA
select MVMDIO select MVMDIO
select PHYLINK select PHYLINK
---help--- ---help---
@ -84,7 +83,6 @@ config MVNETA_BM
config MVPP2 config MVPP2
tristate "Marvell Armada 375/7K/8K network interface support" tristate "Marvell Armada 375/7K/8K network interface support"
depends on ARCH_MVEBU || COMPILE_TEST depends on ARCH_MVEBU || COMPILE_TEST
depends on HAS_DMA
select MVMDIO select MVMDIO
select PHYLINK select PHYLINK
---help--- ---help---
@ -93,7 +91,7 @@ config MVPP2
config PXA168_ETH config PXA168_ETH
tristate "Marvell pxa168 ethernet support" tristate "Marvell pxa168 ethernet support"
depends on HAS_IOMEM && HAS_DMA depends on HAS_IOMEM
depends on CPU_PXA168 || ARCH_BERLIN || COMPILE_TEST depends on CPU_PXA168 || ARCH_BERLIN || COMPILE_TEST
select PHYLIB select PHYLIB
---help--- ---help---

2
drivers/net/ethernet/mellanox/mlxsw/Kconfig
View file

@ -30,7 +30,7 @@ config MLXSW_CORE_THERMAL
config MLXSW_PCI config MLXSW_PCI
tristate "PCI bus implementation for Mellanox Technologies Switch ASICs" tristate "PCI bus implementation for Mellanox Technologies Switch ASICs"
depends on PCI && HAS_DMA && HAS_IOMEM && MLXSW_CORE depends on PCI && HAS_IOMEM && MLXSW_CORE
default m default m
---help--- ---help---
This is PCI bus implementation for Mellanox Technologies Switch ASICs. This is PCI bus implementation for Mellanox Technologies Switch ASICs.

2
drivers/net/ethernet/renesas/Kconfig
View file

@ -17,7 +17,6 @@ if NET_VENDOR_RENESAS
config SH_ETH config SH_ETH
tristate "Renesas SuperH Ethernet support" tristate "Renesas SuperH Ethernet support"
depends on HAS_DMA
depends on ARCH_RENESAS || SUPERH || COMPILE_TEST depends on ARCH_RENESAS || SUPERH || COMPILE_TEST
select CRC32 select CRC32
select MII select MII
@ -31,7 +30,6 @@ config SH_ETH
config RAVB config RAVB
tristate "Renesas Ethernet AVB support" tristate "Renesas Ethernet AVB support"
depends on HAS_DMA
depends on ARCH_RENESAS || COMPILE_TEST depends on ARCH_RENESAS || COMPILE_TEST
select CRC32 select CRC32
select MII select MII

1
drivers/net/wireless/broadcom/brcm80211/Kconfig
View file

@ -60,7 +60,6 @@ config BRCMFMAC_PCIE
bool "PCIE bus interface support for FullMAC driver" bool "PCIE bus interface support for FullMAC driver"
depends on BRCMFMAC depends on BRCMFMAC
depends on PCI depends on PCI
depends on HAS_DMA
select BRCMFMAC_PROTO_MSGBUF select BRCMFMAC_PROTO_MSGBUF
select FW_LOADER select FW_LOADER
---help--- ---help---

2
drivers/net/wireless/quantenna/qtnfmac/Kconfig
View file

@ -7,7 +7,7 @@ config QTNFMAC
config QTNFMAC_PEARL_PCIE config QTNFMAC_PEARL_PCIE
tristate "Quantenna QSR10g PCIe support" tristate "Quantenna QSR10g PCIe support"
default n default n
depends on HAS_DMA && PCI && CFG80211 depends on PCI && CFG80211
select QTNFMAC select QTNFMAC
select FW_LOADER select FW_LOADER
select CRC32 select CRC32