move networking menu in net/Kconfig

In the main Kconfig, there are only two more menus, General Setup and
Expert, in addition to the net menu. Since the part in the main Kconfig
is mostly about selecting the network stack (legacy or lwIP), and that
we already have a net/Kconfig, let's move those to net/Kconfig to have
everything in the same place.

No intended change in behavior.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/Kconfig b/Kconfig
index 7f00e76ba78641b0eaac1e10884292535e2825f7..1fa31a4f5a88a3ee8ead5ff4025bcd6ea6df839e 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -791,42 +791,8 @@ source "dts/Kconfig"
 
 source "env/Kconfig"
 
-menu "Networking"
-
-choice
-       prompt "Networking stack"
-       default NET
-
-config NO_NET
-       bool "No networking support"
-       help
-         Do not include networking support
-
-config NET
-       bool "Legacy U-Boot networking stack"
-       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"
-       select NETDEVICES
-       help
-         Include networking support based on the lwIP (lightweight IP)
-         TCP/IP stack (https://nongnu.org/lwip). This is a replacement for
-         the default U-Boot network stack and applications located in net/
-         and enabled via CONFIG_NET as well as other pieces of code that
-         depend on CONFIG_NET (such as cmd/net.c enabled via CONFIG_CMD_NET).
-         Therefore the two symbols CONFIG_NET and CONFIG_NET_LWIP are mutually
-         exclusive.
-
-endchoice
-
 source "net/Kconfig"
 
-endmenu
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/net/Kconfig b/net/Kconfig
index e45ceb251066f384f97d2068dedba0af4b45ba63..249c27c115d699664fe3165f250df2caf10362d3 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -2,6 +2,38 @@
 # Network configuration
 #
 
+menu "Networking"
+
+choice
+       prompt "Networking stack"
+       default NET
+
+config NO_NET
+       bool "No networking support"
+       help
+         Do not include networking support
+
+config NET
+       bool "Legacy U-Boot networking stack"
+       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"
+       select NETDEVICES
+       help
+         Include networking support based on the lwIP (lightweight IP)
+         TCP/IP stack (https://nongnu.org/lwip). This is a replacement for
+         the default U-Boot network stack and applications located in net/
+         and enabled via CONFIG_NET as well as other pieces of code that
+         depend on CONFIG_NET (such as cmd/net.c enabled via CONFIG_CMD_NET).
+         Therefore the two symbols CONFIG_NET and CONFIG_NET_LWIP are mutually
+         exclusive.
+
+endchoice
+
 if NET
 
 config ARP_TIMEOUT
@@ -254,3 +286,5 @@ config SYS_RX_ETH_BUFFER
           controllers it is recommended to set this value to 8 or even higher,
           since all buffers can be full shortly after enabling the interface on
           high Ethernet traffic.
+
+endmenu