mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-02 09:46:37 +03:00
rename NET to NET_LEGACY
Highlight that NET really is the legacy networking stack by renaming the option to NET_LEGACY. This requires us to add an SPL_NET_LEGACY alias to SPL_NET as otherwise CONFIG_IS_ENABLED(NET_LEGACY) will not work for SPL. The "depends on !NET_LWIP" for SPL_NET clearly highlights that it is using the legacy networking app so this seems fine to do. This also has the benefit of removing potential confusion on NET being a specific networking stack instead of "any" network stack. Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Reviewed-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
20
net/Kconfig
20
net/Kconfig
@@ -6,14 +6,14 @@ menu "Networking"
|
||||
|
||||
choice
|
||||
prompt "Networking stack"
|
||||
default NET
|
||||
default NET_LEGACY
|
||||
|
||||
config NO_NET
|
||||
bool "No networking support"
|
||||
help
|
||||
Do not include networking support
|
||||
|
||||
config NET
|
||||
config NET_LEGACY
|
||||
bool "Legacy U-Boot networking stack"
|
||||
select NETDEVICES
|
||||
help
|
||||
@@ -27,14 +27,14 @@ config NET_LWIP
|
||||
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
|
||||
and enabled via CONFIG_NET_LEGACY as well as other pieces of code that
|
||||
depend on CONFIG_NET_LEGACY (such as cmd/net.c enabled via CONFIG_CMD_NET).
|
||||
Therefore the two symbols CONFIG_NET_LEGACY and CONFIG_NET_LWIP are mutually
|
||||
exclusive.
|
||||
|
||||
endchoice
|
||||
|
||||
if NET
|
||||
if NET_LEGACY
|
||||
|
||||
config ARP_TIMEOUT
|
||||
int "Milliseconds before trying ARP again"
|
||||
@@ -227,11 +227,11 @@ config IPV6
|
||||
ip6addr, serverip6. If a u-boot command is capable to parse an IPv6
|
||||
address and find it, it will force using IPv6 in the network stack.
|
||||
|
||||
endif # if NET
|
||||
endif # if NET_LEGACY
|
||||
|
||||
source "net/lwip/Kconfig"
|
||||
|
||||
if NET || NET_LWIP
|
||||
if NET_LEGACY || NET_LWIP
|
||||
|
||||
config BOOTDEV_ETH
|
||||
bool "Enable bootdev for ethernet"
|
||||
@@ -260,7 +260,7 @@ config DNS
|
||||
|
||||
config WGET
|
||||
bool "Enable wget"
|
||||
select PROT_TCP if NET
|
||||
select PROT_TCP if NET_LEGACY
|
||||
select PROT_TCP_LWIP if NET_LWIP
|
||||
help
|
||||
Selecting this will enable wget, an interface to send HTTP requests
|
||||
@@ -276,7 +276,7 @@ config TFTP_BLOCKSIZE
|
||||
almost-MTU block sizes.
|
||||
You can also activate CONFIG_IP_DEFRAG to set a larger block.
|
||||
|
||||
endif # if NET || NET_LWIP
|
||||
endif # if NET_LEGACY || NET_LWIP
|
||||
|
||||
config SYS_RX_ETH_BUFFER
|
||||
int "Number of receive packet buffers"
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
|
||||
#ccflags-y += -DDEBUG
|
||||
|
||||
ifeq ($(CONFIG_NET),y)
|
||||
ifeq ($(CONFIG_NET_LEGACY),y)
|
||||
|
||||
obj-$(CONFIG_NET) += arp.o
|
||||
obj-$(CONFIG_NET_LEGACY) += arp.o
|
||||
obj-$(CONFIG_CMD_BOOTP) += bootp.o
|
||||
obj-$(CONFIG_CMD_CDP) += cdp.o
|
||||
obj-$(CONFIG_DNS) += dns.o
|
||||
@@ -37,7 +37,7 @@ CFLAGS_eth_common.o += -Wno-format-extra-args
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(filter y,$(CONFIG_NET) $(CONFIG_NET_LWIP)),y)
|
||||
ifeq ($(filter y,$(CONFIG_NET_LEGACY) $(CONFIG_NET_LWIP)),y)
|
||||
obj-$(CONFIG_DM_DSA) += dsa-uclass.o
|
||||
obj-$(CONFIG_$(PHASE_)DM_ETH) += eth-uclass.o
|
||||
obj-$(CONFIG_$(PHASE_)BOOTDEV_ETH) += eth_bootdev.o
|
||||
|
||||
Reference in New Issue
Block a user