[PATCH 07/41] net: Remove extraneous dependencies

Tom Rini
2022-11-27T15:26:57Z

With DM_ETH being required now for all drivers, we don't need this
listed on individual drivers as well.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
drivers/net/Kconfig | 4 ++--
drivers/net/bnxt/Kconfig | 1 -
drivers/net/mscc_eswitch/Kconfig | 10 +++++-----
drivers/net/phy/Kconfig | 3 ---
drivers/net/qe/Kconfig | 1 -
5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 32404972bb37..38699ad2beb4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1,7 +1,6 @@
source "drivers/net/phy/Kconfig"
source "drivers/net/pfe_eth/Kconfig"
source "drivers/net/fsl-mc/Kconfig"
-source "drivers/net/bnxt/Kconfig"

config ETH
def_bool y
@@ -175,6 +174,8 @@ config BCMGENET
help
This driver supports the BCMGENET Ethernet MAC.

+source "drivers/net/bnxt/Kconfig"
+
config CORTINA_NI_ENET
bool "Cortina-Access Ethernet driver"
depends on CORTINA_PLATFORM
@@ -716,7 +717,6 @@ config RENESAS_RAVB
config MPC8XX_FEC
bool "Fast Ethernet Controller on MPC8XX"
depends on MPC8xx
- depends on DM_ETH
select MII
select SYS_DISCOVER_PHY
help
diff --git a/drivers/net/bnxt/Kconfig b/drivers/net/bnxt/Kconfig
index 412ecd430335..6ff3ffa137be 100644
--- a/drivers/net/bnxt/Kconfig
+++ b/drivers/net/bnxt/Kconfig
@@ -1,6 +1,5 @@
config BNXT_ETH
bool "BNXT PCI support"
- depends on DM_ETH
select PCI_INIT_R
help
This driver implements support for bnxt pci controller
diff --git a/drivers/net/mscc_eswitch/Kconfig b/drivers/net/mscc_eswitch/Kconfig
index 930d2ef11301..f9780661c80f 100644
--- a/drivers/net/mscc_eswitch/Kconfig
+++ b/drivers/net/mscc_eswitch/Kconfig
@@ -4,35 +4,35 @@

config MSCC_OCELOT_SWITCH
bool "Ocelot switch driver"
- depends on DM_ETH && ARCH_MSCC
+ depends on ARCH_MSCC
select PHYLIB
help
This driver supports the Ocelot network switch device.

config MSCC_LUTON_SWITCH
bool "Luton switch driver"
- depends on DM_ETH && ARCH_MSCC
+ depends on ARCH_MSCC
select PHYLIB
help
This driver supports the Luton network switch device.

config MSCC_JR2_SWITCH
bool "Jaguar2 switch driver"
- depends on DM_ETH && ARCH_MSCC
+ depends on ARCH_MSCC
select PHYLIB
help
This driver supports the Jaguar2 network switch device.

config MSCC_SERVALT_SWITCH
bool "Servalt switch driver"
- depends on DM_ETH && ARCH_MSCC
+ depends on ARCH_MSCC
select PHYLIB
help
This driver supports the Servalt network switch device.

config MSCC_SERVAL_SWITCH
bool "Serval switch driver"
- depends on DM_ETH && ARCH_MSCC
+ depends on ARCH_MSCC
select PHYLIB
help
This driver supports the Serval network switch device.
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 52ce08b3b384..a1f90a44671a 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -315,7 +315,6 @@ config PHY_XILINX

config PHY_XILINX_GMII2RGMII
bool "Xilinx GMII to RGMII Ethernet PHYs support"
- depends on DM_ETH
help
This adds support for Xilinx GMII to RGMII IP core. This IP acts
as bridge between MAC connected over GMII and external phy that
@@ -331,7 +330,6 @@ config PHY_ETHERNET_ID

config PHY_FIXED
bool "Fixed-Link PHY"
- depends on DM_ETH
help
Fixed PHY is used for having a 'fixed-link' to another MAC with a direct
connection (MII, RGMII, ...).
@@ -341,7 +339,6 @@ config PHY_FIXED

config PHY_NCSI
bool "NC-SI based PHY"
- depends on DM_ETH

endif #PHYLIB

diff --git a/drivers/net/qe/Kconfig b/drivers/net/qe/Kconfig
index dec88dea2a3f..e795e913d42d 100644
--- a/drivers/net/qe/Kconfig
+++ b/drivers/net/qe/Kconfig
@@ -4,6 +4,5 @@

config QE_UEC
bool "NXP QE UEC Ethernet controller"
- depends on DM_ETH
help
This driver supports the NXP QE UEC ethernet controller
--
2.25.1