net: Rework dependencies around NET/NET_LWIP and NETDEVICES

Functionally, both networking stacks require DM_ETH. This is because
they both also require some networking devices to be enabled. Express
this more correctly by having both NET and NET_LWIP select NETDEVICES.
In turn NETDEVICES no longer depends on NET or NET_LWIP as it's not
prompted anymore.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jerome Forissier <jerome.forissier@arm.com>

diff --git a/Kconfig b/Kconfig
index 1679bba5d7500baaf202d22bbff96bd859678928..24d238f96dffe8050e656109d386618e5e76e670 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -804,14 +804,14 @@ config NO_NET
 
 config NET
        bool "Legacy U-Boot networking stack"
-       imply NETDEVICES
+       select NETDEVICES
        help
          Include networking support with U-Boot's internal implementation of
          the TCP/IP protocol stack.
 
 config NET_LWIP
        bool "Use lwIP for networking stack"
-       imply NETDEVICES
+       select NETDEVICES
        help
          Include networking support based on the lwIP (lightweight IP)
          TCP/IP stack (https://nongnu.org/lwip). This is a replacement for

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 02063ce3aa91b8b4db2e4dfc81834b67de0c2854..9d4e9f069701d4ae5e206f530a396a283e679ed4 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -90,9 +90,10 @@ config DSA_SANDBOX
          Ethernet device used as DSA master, to test DSA class code, including
          exported DSA API and datapath processing of Ethernet traffic.
 
-menuconfig NETDEVICES
-       bool "Network device support"
-       depends on NET || NET_LWIP
+menu "Network device support"
+
+config NETDEVICES
+       bool
        select DM_ETH
        help
          You must select Y to enable any network device support
@@ -1106,3 +1107,5 @@ source "drivers/net/pfe_eth/Kconfig"
 source "drivers/net/fsl-mc/Kconfig"
 
 endif # NETDEVICES
+
+endmenu