vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename NET to NET_LEGACY

Browse Source 
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:
Quentin Schulz
2026-04-27 11:26:40 -06:00
committed by Tom Rini
parent 8080ab6c28
commit b8cd444225
57 changed files with 104 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -2
View File
@@ -1081,7 +1081,7 @@ libs-$(CONFIG_OF_EMBED) += dts/
libs-y += env/
libs-y += lib/
libs-y += fs/
libs-$(filter y,$(CONFIG_NET) $(CONFIG_NET_LWIP)) += net/
libs-$(filter y,$(CONFIG_NET_LEGACY) $(CONFIG_NET_LWIP)) += net/
libs-y += disk/
libs-y += drivers/
libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/
@@ -1373,7 +1373,7 @@ expect = $(foreach cfg,$(1),y)
# 1: List of options to migrate to (e.g. "CONFIG_DM_MMC CONFIG_BLK")
# 2: Name of component (e.g . "Ethernet drivers")
# 3: Release deadline (e.g. "v202.07")
# 4: Condition to require before checking (e.g. "$(CONFIG_NET)")
# 4: Condition to require before checking (e.g. "$(CONFIG_NET_LEGACY)")
# Note: Script avoids bash construct, hence the strange double 'if'
# (patches welcome!)
define deprecated
arch/arm/mach-stm32mp/soc.c
+1 -1
View File
@@ -64,7 +64,7 @@ __weak int setup_mac_address(void)
struct udevice *dev;
int nb_eth, nb_otp, index;
if (!IS_ENABLED(CONFIG_NET))
if (!IS_ENABLED(CONFIG_NET_LEGACY))
return 0;
nb_eth = get_eth_nb();
board/beacon/imx8mp/imx8mp_beacon.c
+1 -1
View File
@@ -14,7 +14,7 @@ static void setup_fec(void)
setbits_le32(&gpr->gpr[1], BIT(22));
}
#if IS_ENABLED(CONFIG_NET)
#if IS_ENABLED(CONFIG_NET_LEGACY)
int board_phy_config(struct phy_device *phydev)
{
if (phydev->drv->config)
board/engicam/imx8mp/icore_mx8mp.c
+1 -1
View File
@@ -30,7 +30,7 @@ static void setup_fec(void)
setbits_le32(&gpr->gpr[1], BIT(22));
}
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
int board_phy_config(struct phy_device *phydev)
{
if (phydev->drv->config)
board/gateworks/venice/venice.c
+2 -2
View File
@@ -47,7 +47,7 @@ int board_fit_config_name_match(const char *path)
return -1;
}
#if (IS_ENABLED(CONFIG_NET))
#if (IS_ENABLED(CONFIG_NET_LEGACY))
int board_phy_config(struct phy_device *phydev)
{
unsigned short val;
@@ -71,7 +71,7 @@ int board_phy_config(struct phy_device *phydev)
return 0;
}
#endif // IS_ENABLED(CONFIG_NET)
#endif // IS_ENABLED(CONFIG_NET_LEGACY)
int board_init(void)
{
board/nxp/ls1043ardb/Makefile
+1 -1
View File
@@ -5,6 +5,6 @@
obj-y += ddr.o
obj-y += ls1043ardb.o
ifndef CONFIG_XPL_BUILD
obj-$(CONFIG_NET) += eth.o
obj-$(CONFIG_NET_LEGACY) += eth.o
obj-y += cpld.o
endif
board/nxp/ls1046afrwy/Makefile
+1 -1
View File
@@ -4,4 +4,4 @@
obj-y += ddr.o
obj-y += ls1046afrwy.o
obj-$(CONFIG_NET) += eth.o
obj-$(CONFIG_NET_LEGACY) += eth.o
board/nxp/ls1046ardb/Makefile
+1 -1
View File
@@ -5,6 +5,6 @@
obj-y += ddr.o
obj-y += ls1046ardb.o
ifndef CONFIG_XPL_BUILD
obj-$(CONFIG_NET) += eth.o
obj-$(CONFIG_NET_LEGACY) += eth.o
obj-y += cpld.o
endif
board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c
+1 -1
View File
@@ -26,7 +26,7 @@ static void setup_fec(void)
setbits_le32(&gpr->gpr[1], BIT(22));
}
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
int board_phy_config(struct phy_device *phydev)
{
if (phydev->drv->config)
board/siemens/iot2050/board.c
+1 -1
View File
@@ -232,7 +232,7 @@ void set_board_info_env(void)
env_set("seboot_version", buf);
env_set("fw_version", PLAIN_VERSION);
if (IS_ENABLED(CONFIG_NET)) {
if (IS_ENABLED(CONFIG_NET_LEGACY)) {
int mac_cnt;
mac_cnt = sysinfo_get_item_count(sysinfo, SYSID_BOARD_MAC_ADDR);
board/sophgo/milkv_duo/Makefile
+1 -1
View File
@@ -3,4 +3,4 @@
# Copyright (c) 2024, Kongyang Liu <seashell11234455@gmail.com>
obj-y += board.o
obj-$(CONFIG_NET) += ethernet.o
obj-$(CONFIG_NET_LEGACY) += ethernet.o
board/sophgo/milkv_duo/board.c
+1 -1
View File
@@ -12,7 +12,7 @@ int board_init(void)
if (IS_ENABLED(CONFIG_SYSRESET_CV1800B))
device_bind_driver(gd->dm_root, "cv1800b_sysreset", "sysreset", NULL);
if (IS_ENABLED(CONFIG_NET))
if (IS_ENABLED(CONFIG_NET_LEGACY))
cv1800b_ephy_init();
return 0;
board/theadorable/theadorable.c
+2 -2
View File
@@ -20,7 +20,7 @@
#include <asm/arch/soc.h>
#include <linux/delay.h>
#include <linux/mbus.h>
#ifdef CONFIG_NET
#ifdef CONFIG_NET_LEGACY
#include <netdev.h>
#endif
#include <u-boot/crc.h>
@@ -244,7 +244,7 @@ int checkboard(void)
return 0;
}
#ifdef CONFIG_NET
#ifdef CONFIG_NET_LEGACY
int board_eth_init(struct bd_info *bis)
{
cpu_eth_init(bis); /* Built in controller(s) come first */
board/ti/am335x/board.c
+1 -1
View File
@@ -911,7 +911,7 @@ int board_late_init(void)
#endif
/* CPSW plat */
#if (CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)) && \
#if (CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)) && \
!CONFIG_IS_ENABLED(OF_CONTROL)
struct cpsw_slave_data slave_data[] = {
{
board/toradex/verdin-imx8mp/verdin-imx8mp.c
+1 -1
View File
@@ -46,7 +46,7 @@ static void setup_fec(void)
setbits_le32(&gpr->gpr[1], BIT(22));
}
#if IS_ENABLED(CONFIG_NET)
#if IS_ENABLED(CONFIG_NET_LEGACY)
int board_phy_config(struct phy_device *phydev)
{
if (phydev->drv->config)
board/xilinx/common/board.c
+1 -1
View File
@@ -508,7 +508,7 @@ int board_late_init_xilinx(void)
ret |= env_set_by_index("uuid", id, uuid);
}
if (!(CONFIG_IS_ENABLED(NET) ||
if (!(CONFIG_IS_ENABLED(NET_LEGACY) ||
CONFIG_IS_ENABLED(NET_LWIP)))
continue;
cmd/Kconfig
+6 -6
View File
@@ -1946,7 +1946,7 @@ config CMD_XXD
endmenu
if NET || NET_LWIP
if NET_LEGACY || NET_LWIP
menuconfig CMD_NET
bool "Network commands"
@@ -1954,7 +1954,7 @@ menuconfig CMD_NET
if CMD_NET
if NET
if NET_LEGACY
config CMD_BOOTP
bool "bootp"
@@ -2198,12 +2198,12 @@ config CMD_WOL
help
Wait for wake-on-lan Magic Packet
endif # if NET
endif # if NET_LEGACY
config CMD_DHCP
bool "dhcp"
select PROT_DHCP_LWIP if NET_LWIP
select CMD_BOOTP if NET
select CMD_BOOTP if NET_LEGACY
help
Boot image via network using DHCP/TFTP protocol
@@ -2259,7 +2259,7 @@ config CMD_PING
config CMD_SNTP
bool "sntp"
select PROT_UDP if NET
select PROT_UDP if NET_LEGACY
select PROT_UDP_LWIP if NET_LWIP
help
Synchronize RTC via network
@@ -2329,7 +2329,7 @@ config CMD_PXE
endif # if CMD_NET
endif # NET || NET_LWIP
endif # NET_LEGACY || NET_LWIP
menu "Misc commands"
cmd/Makefile
+1 -1
View File
@@ -131,7 +131,7 @@ obj-y += legacy-mtd-utils.o
endif
obj-$(CONFIG_CMD_MUX) += mux.o
obj-$(CONFIG_CMD_NAND) += nand.o
ifdef CONFIG_NET
ifdef CONFIG_NET_LEGACY
obj-$(CONFIG_CMD_NET) += net.o net-common.o
else ifdef CONFIG_NET_LWIP
obj-$(CONFIG_CMD_NET) += net-common.o
cmd/bdinfo.c
+3 -3
View File
@@ -152,7 +152,7 @@ static int bdinfo_print_all(struct bd_info *bd)
bdinfo_print_num_l("relocaddr", gd->relocaddr);
bdinfo_print_num_l("reloc off", gd->reloc_off);
printf("%-12s= %u-bit\n", "Build", (uint)sizeof(void *) * 8);
if (IS_ENABLED(CONFIG_NET) || IS_ENABLED(CONFIG_NET_LWIP))
if (IS_ENABLED(CONFIG_NET_LEGACY) || IS_ENABLED(CONFIG_NET_LWIP))
print_eth();
bdinfo_print_num_l("fdt_blob", (ulong)map_to_sysmem(gd->fdt_blob));
if (IS_ENABLED(CONFIG_VIDEO))
@@ -194,7 +194,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
case 'a':
return bdinfo_print_all(bd);
case 'e':
if (!IS_ENABLED(CONFIG_NET) &&
if (!IS_ENABLED(CONFIG_NET_LEGACY) &&
!IS_ENABLED(CONFIG_NET_LWIP))
return CMD_RET_USAGE;
print_eth();
@@ -221,7 +221,7 @@ U_BOOT_CMD(
" - print all Board Info structure"
#if CONFIG_IS_ENABLED(GETOPT)
"\n"
#if IS_ENABLED(CONFIG_NET) || IS_ENABLED(CONFIG_NET_LWIP)
#if IS_ENABLED(CONFIG_NET_LEGACY) || IS_ENABLED(CONFIG_NET_LWIP)
"bdinfo -e\n"
" - print Board Info related to network\n"
#endif
cmd/fastboot.c
+2 -2
View File
@@ -16,7 +16,7 @@
#include <linux/printk.h>
#include <linux/stringify.h>
#if CONFIG_IS_ENABLED(NET)
#if CONFIG_IS_ENABLED(NET_LEGACY)
static int do_fastboot_udp(int argc, char *const argv[],
uintptr_t buf_addr, size_t buf_size)
{
@@ -162,7 +162,7 @@ NXTARG:
fastboot_init((void *)buf_addr, buf_size);
#if CONFIG_IS_ENABLED(NET)
#if CONFIG_IS_ENABLED(NET_LEGACY)
if (!strcmp(argv[1], "udp"))
return do_fastboot_udp(argc, argv, buf_addr, buf_size);
if (!strcmp(argv[1], "tcp"))
cmd/ufetch.c
+1 -1
View File
@@ -159,7 +159,7 @@ static int do_ufetch(struct cmd_tbl *cmdtp, int flag, int argc,
break;
case FEATURES:
printf("Features:" RESET " ");
if (IS_ENABLED(CONFIG_NET))
if (IS_ENABLED(CONFIG_NET_LEGACY))
printf("Net");
if (IS_ENABLED(CONFIG_EFI_LOADER))
printf(", EFI");
common/Kconfig
+1 -1
View File
@@ -425,7 +425,7 @@ config LOGF_FUNC_PAD
config LOG_SYSLOG
bool "Log output to syslog server"
depends on NET || NET_LWIP
depends on NET_LEGACY || NET_LWIP
help
Enables a log driver which broadcasts log records via UDP port 514
to syslog servers.
common/board_r.c
+2 -2
View File
@@ -495,7 +495,7 @@ static int initr_boot_led_on(void)
return 0;
}
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
static int initr_net(void)
{
puts("Net: ");
@@ -756,7 +756,7 @@ static void initcall_run_r(void)
#if CONFIG_IS_ENABLED(PCI_ENDPOINT)
INITCALL(pci_ep_init);
#endif
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
WATCHDOG_RESET();
INITCALL(initr_net);
#endif
common/spl/Kconfig
+4 -1
View File
@@ -1151,7 +1151,7 @@ config SPL_DM_SPI_FLASH
config SPL_NET
bool "Support networking"
depends on NET
depends on NET_LEGACY
select SPL_USE_TINY_PRINTF_POINTER_SUPPORT if SPL_USE_TINY_PRINTF
help
Enable support for network devices (such as Ethernet) in SPL.
@@ -1160,6 +1160,9 @@ config SPL_NET
the network stack uses a number of environment variables. See also
SPL_ETH.
config SPL_NET_LEGACY
def_bool y if SPL_NET
config SPL_NET_VCI_STRING
string "BOOTP Vendor Class Identifier string sent by SPL"
depends on SPL_NET
configs/am62px_evm_r5_ethboot_defconfig
+1 -1
View File
@@ -5,7 +5,7 @@ CONFIG_ARCH_K3=y
CONFIG_SOC_K3_AM62P5=y
CONFIG_TARGET_AM62P5_R5_EVM=y
CONFIG_DEFAULT_DEVICE_TREE="k3-am62p5-r5-sk"
CONFIG_NET=y
CONFIG_NET_LEGACY=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_DMA=y
CONFIG_SPL_ENV_SUPPORT=y
configs/j722s_evm_r5_ethboot_defconfig
+1 -1
View File
@@ -5,7 +5,7 @@ CONFIG_ARCH_K3=y
CONFIG_SOC_K3_J722S=y
CONFIG_TARGET_J722S_R5_EVM=y
CONFIG_DEFAULT_DEVICE_TREE="k3-j722s-r5-evm"
CONFIG_NET=y
CONFIG_NET_LEGACY=y
CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_DMA=y
doc/develop/bootstd/overview.rst
+1 -1
View File
@@ -422,7 +422,7 @@ includes the full set of commands, more error messages when things go wrong and
bootmeth ordering with the bootmeths environment variable.
You should probably also enable `CONFIG_BOOTSTD_DEFAULTS`, which provides
several filesystem and network features (if `CONFIG_NET` is enabled) so that
several filesystem and network features (if `CONFIG_NET_LEGACY` is enabled) so that
a good selection of boot options is available.
Some devicetree properties are supported in the bootstd node when
doc/develop/pytest/usage.rst
+2 -2
View File
@@ -546,11 +546,11 @@ following annotation for a test requires ``CONFIG_EFI_LOADER=y``:
Sometimes multiple configuration option supply the same functionality. If
multiple arguments are passed to ``buildconfigspec()``, only one of the
configuration options needs to be set. The following annotation requires that
either of ``CONFIG_NET`` or ``CONFIG_NET_LWIP`` is set:
either of ``CONFIG_NET_LEGACY`` or ``CONFIG_NET_LWIP`` is set:
.. code-block:: python
@pytest.mark.buildconfigspec('net', 'net_lwip')
@pytest.mark.buildconfigspec('net_legacy', 'net_lwip')
The ``notbuildconfigspec()`` annotation can be used to require a configuration
option not to be set. The following annotation requires ``CONFIG_RISCV=n``:
doc/usage/cmd/bdinfo.rst
+3 -3
View File
@@ -124,12 +124,12 @@ Build
current eth
name of the active network device
Only shown if CONFIG_NET=y or CONFIG_NET_LWIP=y.
Only shown if CONFIG_NET_LEGACY=y or CONFIG_NET_LWIP=y.
IP addr
network address, value of the environment variable *ipaddr*
Only shown if CONFIG_NET=y or CONFIG_NET_LWIP=y.
Only shown if CONFIG_NET_LEGACY=y or CONFIG_NET_LWIP=y.
fdt_blob
address of U-Boot's own device tree, NULL if none
@@ -173,5 +173,5 @@ The bdinfo command is available if CONFIG_CMD_BDI=y.
The options to bdinfo are only available if CONFIG_GETOPT=y.
The ``-e`` option is additionally only available if CONFIG_NET=y or
The ``-e`` option is additionally only available if CONFIG_NET_LEGACY=y or
CONFIG_NET_LWIP=y.
doc/usage/cmd/sntp.rst
+1 -1
View File
@@ -24,7 +24,7 @@ the server's IP address to be given on the command line or via the
`ntpserverip` environment variable.
The address of the NTP server does not need to be given if the DHCP server
provides one. The legacy network stack (`CONFIG_NET=y`) can only use the
provides one. The legacy network stack (`CONFIG_NET_LEGACY=y`) can only use the
first NTP server provided in the `ntp-servers` DHCP option.
When the network stack is lwIP (`CONFIG_NET_LWIP=y`) and DNS resolution
doc/usage/cmd/wget.rst
+1 -1
View File
@@ -26,7 +26,7 @@ In order to use HTTPS you will need to compile wget with lwIP support.
Legacy syntax
~~~~~~~~~~~~~
The legacy syntax is supported by the legacy network stack (CONFIG_NET=y)
The legacy syntax is supported by the legacy network stack (CONFIG_NET_LEGACY=y)
as well as by the lwIP base network stack (CONFIG_NET_LWIP=y). It supports HTTP
only.
drivers/dfu/Kconfig
+1 -1
View File
@@ -11,7 +11,7 @@ config DFU_OVER_USB
config DFU_OVER_TFTP
bool
depends on NET
depends on NET_LEGACY
config DFU_WRITE_ALT
bool
drivers/fastboot/Kconfig
+2 -2
View File
@@ -27,7 +27,7 @@ config USB_FUNCTION_FASTBOOT
This enables the USB part of the fastboot gadget.
config UDP_FUNCTION_FASTBOOT
depends on NET
depends on NET_LEGACY
select FASTBOOT
bool "Enable fastboot protocol over UDP"
help
@@ -41,7 +41,7 @@ config UDP_FUNCTION_FASTBOOT_PORT
The fastboot protocol requires a UDP port number.
config TCP_FUNCTION_FASTBOOT
depends on NET
depends on NET_LEGACY
select FASTBOOT
bool "Enable fastboot protocol over TCP"
help
drivers/fastboot/fb_common.c
+2 -2
View File
@@ -191,13 +191,13 @@ void fastboot_handle_boot(int command, bool success)
switch (command) {
case FASTBOOT_COMMAND_BOOT:
fastboot_boot();
#if CONFIG_IS_ENABLED(NET)
#if CONFIG_IS_ENABLED(NET_LEGACY)
net_set_state(NETLOOP_SUCCESS);
#endif
break;
case FASTBOOT_COMMAND_CONTINUE:
#if CONFIG_IS_ENABLED(NET)
#if CONFIG_IS_ENABLED(NET_LEGACY)
net_set_state(NETLOOP_SUCCESS);
#endif
break;
drivers/net/Kconfig
+3 -3
View File
@@ -339,7 +339,7 @@ config ESSEDMA
config ETH_SANDBOX
depends on SANDBOX
depends on NET || NET_LWIP
depends on NET_LEGACY || NET_LWIP
default y
bool "Sandbox: Mocked Ethernet driver"
help
@@ -350,7 +350,7 @@ config ETH_SANDBOX
config ETH_SANDBOX_RAW
depends on SANDBOX
depends on NET
depends on NET_LEGACY
default y
bool "Sandbox: Bridge to Linux Raw Sockets"
help
@@ -476,7 +476,7 @@ config FTMAC100
config FTGMAC100
bool "Ftgmac100 Ethernet Support"
select PHYLIB
depends on NET
depends on NET_LEGACY
help
This driver supports the Faraday's FTGMAC100 Gigabit SoC
Ethernet controller that can be found on Aspeed SoCs (which
drivers/net/phy/Kconfig
+2 -2
View File
@@ -7,7 +7,7 @@ config MV88E6352_SWITCH
menuconfig PHYLIB
bool "Ethernet PHY (physical media interface) support"
depends on NET || NET_LWIP
depends on NET_LEGACY || NET_LWIP
help
Enable Ethernet PHY (physical media interface) support.
@@ -381,7 +381,7 @@ config PHY_FIXED
config PHY_NCSI
bool "NC-SI based PHY"
depends on NET
depends on NET_LEGACY
endif #PHYLIB
drivers/net/sandbox.c
+1 -1
View File
@@ -15,7 +15,7 @@
/*
* Structure definitions for network protocols. Since this file is used for
* both NET and NET_LWIP, and given that the two network stacks do have
* both NET_LEGACY and NET_LWIP, and given that the two network stacks do have
* conflicting types (for instance struct icmp_hdr), it is on purpose that the
* structures are defined locally with minimal dependencies -- <asm/types.h> is
* included for the bit types and that's it.
drivers/usb/gadget/Kconfig
+1 -1
View File
@@ -232,7 +232,7 @@ endif # USB_GADGET_DOWNLOAD
config USB_ETHER
bool "USB Ethernet Gadget"
depends on NET || NET_LWIP
depends on NET_LEGACY || NET_LWIP
default y if ARCH_SUNXI && USB_MUSB_GADGET
help
Creates an Ethernet network device through a USB peripheral
env/flags.c
Vendored
+5 -5
View File
@@ -22,7 +22,7 @@
#include <env_internal.h>
#endif
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
#define ENV_FLAGS_NET_VARTYPE_REPS "im"
#else
#define ENV_FLAGS_NET_VARTYPE_REPS ""
@@ -57,7 +57,7 @@ static const char * const env_flags_vartype_names[] = {
"decimal",
"hexadecimal",
"boolean",
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
"IP address",
"MAC address",
#endif
@@ -211,7 +211,7 @@ static void skip_num(int hex, const char *value, const char **end,
*end = value;
}
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
int eth_validate_ethaddr_str(const char *addr)
{
const char *end;
@@ -244,7 +244,7 @@ static int _env_flags_validate_type(const char *value,
enum env_flags_vartype type)
{
const char *end;
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
const char *cur;
int i;
#endif
@@ -273,7 +273,7 @@ static int _env_flags_validate_type(const char *value,
if (value[1] != '\0')
return -1;
break;
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
case env_flags_vartype_ipaddr:
cur = value;
for (i = 0; i < 4; i++) {
include/configs/stm32mp15_common.h
+1 -1
View File
@@ -41,7 +41,7 @@
#define BOOT_TARGET_MMC2(func)
#endif
#ifdef CONFIG_NET
#ifdef CONFIG_NET_LEGACY
#define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
#else
#define BOOT_TARGET_PXE(func)
include/configs/stm32mp23_common.h
+1 -1
View File
@@ -29,7 +29,7 @@
#ifdef CONFIG_DISTRO_DEFAULTS
/*****************************************************************************/
#ifdef CONFIG_NET
#ifdef CONFIG_NET_LEGACY
#define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
#else
#define BOOT_TARGET_PXE(func)
include/configs/stm32mp25_common.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifdef CONFIG_DISTRO_DEFAULTS
/*****************************************************************************/
#ifdef CONFIG_NET
#ifdef CONFIG_NET_LEGACY
#define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
#else
#define BOOT_TARGET_PXE(func)
include/env_callback.h
+1 -1
View File
@@ -32,7 +32,7 @@
#define DNS_CALLBACK
#endif
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
#define NET_CALLBACKS \
"bootfile:bootfile," \
"ipaddr:ipaddr," \
include/env_flags.h
+3 -3
View File
@@ -14,7 +14,7 @@ enum env_flags_vartype {
env_flags_vartype_decimal,
env_flags_vartype_hex,
env_flags_vartype_bool,
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
env_flags_vartype_ipaddr,
env_flags_vartype_macaddr,
#endif
@@ -41,7 +41,7 @@ enum env_flags_varaccess {
#define CFG_ENV_FLAGS_LIST_STATIC ""
#endif
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
#ifdef CONFIG_REGEX
#define ETHADDR_WILDCARD "\\d*"
#else
@@ -123,7 +123,7 @@ enum env_flags_varaccess env_flags_parse_varaccess(const char *flags);
*/
enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags);
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
/*
* Check if a string has the format of an Ethernet MAC address
*/
include/net-common.h
+2 -2
View File
@@ -235,7 +235,7 @@ int eth_rx(void); /* Check for received packets */
*/
void reset_phy(void);
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)
/**
* eth_set_enable_bootdevs() - Enable or disable binding of Ethernet bootdevs
*
@@ -485,7 +485,7 @@ int net_init(void);
/* Called when a network operation fails to know if it should be re-tried */
int net_start_again(void);
/* NET compatibility */
/* NET_LEGACY compatibility */
enum proto_t;
int net_loop(enum proto_t protocol);
include/net-legacy.h
+1 -1
View File
@@ -281,7 +281,7 @@ extern struct in_addr net_dns_server2;
#endif
extern char net_nis_domain[32]; /* Our IS domain */
extern char net_hostname[32]; /* Our hostname */
#ifdef CONFIG_NET
#ifdef CONFIG_NET_LEGACY
extern char net_root_path[CONFIG_BOOTP_MAX_ROOT_PATH_LEN]; /* Our root path */
#endif
/** END OF BOOTP EXTENTIONS **/
lib/Kconfig
+1 -1
View File
@@ -285,7 +285,7 @@ config PANIC_HANG
config REGEX
bool "Enable regular expression support"
default y if NET
default y if NET_LEGACY
help
If this variable is defined, U-Boot is linked against the
SLRE (Super Light Regular Expression) library, which adds
lib/efi_loader/Kconfig
+2 -2
View File
@@ -517,7 +517,7 @@ config EFI_RISCV_BOOT_PROTOCOL
config EFI_IP4_CONFIG2_PROTOCOL
bool "EFI_IP4_CONFIG2_PROTOCOL support"
default y if ARCH_QEMU || SANDBOX
depends on NET || NET_LWIP
depends on NET_LEGACY || NET_LWIP
help
Provides an implementation of the EFI_IP4_CONFIG2_PROTOCOL, this
protocol can be used to set and get the current ip address and
@@ -599,7 +599,7 @@ config EFI_BOOTMGR
config EFI_HTTP_BOOT
bool "EFI HTTP Boot support"
depends on NET || NET_LWIP
depends on NET_LEGACY || NET_LWIP
select CMD_NET
select CMD_DHCP
select CMD_DNS
net/Kconfig
+10 -10
View File
@@ -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"
net/Makefile
+3 -3
View File
@@ -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
test/cmd/Makefile
+1 -1
View File
@@ -39,7 +39,7 @@ obj-$(CONFIG_CMD_PWM) += pwm.o
obj-$(CONFIG_CMD_READ) += rw.o
obj-$(CONFIG_CMD_SETEXPR) += setexpr.o
obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o
ifdef CONFIG_NET
ifdef CONFIG_NET_LEGACY
obj-$(CONFIG_CMD_WGET) += wget.o
endif
obj-$(CONFIG_ARM_FFA_TRANSPORT) += armffa.o
test/cmd/bdinfo.c
+3 -3
View File
@@ -172,7 +172,7 @@ static int bdinfo_test_all(struct unit_test_state *uts)
ut_assertok(test_num_l(uts, "reloc off", gd->reloc_off));
ut_assert_nextline("%-12s= %u-bit", "Build", (uint)sizeof(void *) * 8);
if (IS_ENABLED(CONFIG_NET) || IS_ENABLED(CONFIG_NET_LWIP))
if (IS_ENABLED(CONFIG_NET_LEGACY) || IS_ENABLED(CONFIG_NET_LWIP))
ut_assertok(test_eth(uts));
/*
@@ -314,7 +314,7 @@ static int bdinfo_test_help(struct unit_test_state *uts)
ut_assert_nextlinen("bdinfo -a");
ut_assert_nextlinen(" - print all Board Info structure");
if (CONFIG_IS_ENABLED(GETOPT)) {
if (IS_ENABLED(CONFIG_NET) || IS_ENABLED(CONFIG_NET_LWIP)) {
if (IS_ENABLED(CONFIG_NET_LEGACY) || IS_ENABLED(CONFIG_NET_LWIP)) {
ut_assert_nextlinen("bdinfo -e");
ut_assert_nextlinen(" - print Board Info related to network");
}
@@ -348,7 +348,7 @@ static int bdinfo_test_eth(struct unit_test_state *uts)
ut_assertok(run_commandf("bdinfo -e"));
if (!CONFIG_IS_ENABLED(GETOPT))
ut_assertok(bdinfo_test_all(uts));
else if (IS_ENABLED(CONFIG_NET) || IS_ENABLED(CONFIG_NET_LWIP))
else if (IS_ENABLED(CONFIG_NET_LEGACY) || IS_ENABLED(CONFIG_NET_LWIP))
ut_assertok(test_eth(uts));
ut_assert_console_end();
test/dm/eth.c
+3 -3
View File
@@ -449,7 +449,7 @@ static int dm_test_net_retry(struct unit_test_state *uts)
}
DM_TEST(dm_test_net_retry, UTF_SCAN_FDT);
#if CONFIG_IS_ENABLED(NET)
#if CONFIG_IS_ENABLED(NET_LEGACY)
static int sb_check_arp_reply(struct udevice *dev, void *packet,
unsigned int len)
{
@@ -517,7 +517,7 @@ static int sb_with_async_arp_handler(struct udevice *dev, void *packet,
}
#endif
#if CONFIG_IS_ENABLED(NET)
#if CONFIG_IS_ENABLED(NET_LEGACY)
static int dm_test_eth_async_arp_reply(struct unit_test_state *uts)
{
net_ping_ip = string_to_ip("1.1.2.2");
@@ -537,7 +537,7 @@ static int dm_test_eth_async_arp_reply(struct unit_test_state *uts)
DM_TEST(dm_test_eth_async_arp_reply, UTF_SCAN_FDT);
#endif
#if CONFIG_IS_ENABLED(NET)
#if CONFIG_IS_ENABLED(NET_LEGACY)
static int sb_check_ping_reply(struct udevice *dev, void *packet,
unsigned int len)
{
test/py/tests/test_efi_fit.py
+1 -1
View File
@@ -225,7 +225,7 @@ def test_efi_fit_launch(ubman):
has_dhcp = ubman.config.buildconfig.get('config_cmd_dhcp', 'n') == 'y'
if not has_dhcp:
ubman.log.warning('CONFIG_NET != y: Skipping static network setup')
ubman.log.warning('CONFIG_NET_LEGACY != y: Skipping static network setup')
return False
env_vars = ubman.config.env.get('env__net_static_env_vars', None)
test/py/tests/test_efi_loader.py
+1 -1
View File
@@ -98,7 +98,7 @@ def test_efi_setup_dhcp(ubman):
global net_set_up
net_set_up = True
@pytest.mark.buildconfigspec('net', 'net_lwip')
@pytest.mark.buildconfigspec('net_legacy', 'net_lwip')
def test_efi_setup_static(ubman):
"""Set up the network using a static IP configuration.
test/py/tests/test_fpga.py
+2 -2
View File
@@ -506,7 +506,7 @@ def test_fpga_loadfs(ubman):
@pytest.mark.buildconfigspec('cmd_fpga_load_secure')
@pytest.mark.buildconfigspec('cmd_net')
@pytest.mark.buildconfigspec('cmd_dhcp')
@pytest.mark.buildconfigspec('net', 'net_lwip')
@pytest.mark.buildconfigspec('net_legacy', 'net_lwip')
def test_fpga_secure_bit_auth(ubman):
test_net.test_net_dhcp(ubman)
@@ -534,7 +534,7 @@ def test_fpga_secure_bit_auth(ubman):
@pytest.mark.buildconfigspec('cmd_fpga_load_secure')
@pytest.mark.buildconfigspec('cmd_net')
@pytest.mark.buildconfigspec('cmd_dhcp')
@pytest.mark.buildconfigspec('net', 'net_lwip')
@pytest.mark.buildconfigspec('net_legacy', 'net_lwip')
def test_fpga_secure_bit_img_auth_kup(ubman):
test_net.test_net_dhcp(ubman)
test/py/tests/test_net.py
+1 -1
View File
@@ -201,7 +201,7 @@ def test_net_dhcp6(ubman):
global net6_set_up
net6_set_up = True
@pytest.mark.buildconfigspec('net', 'net_lwip')
@pytest.mark.buildconfigspec('net_legacy', 'net_lwip')
def test_net_setup_static(ubman):
"""Set up a static IP configuration.