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>

diff --git a/Makefile b/Makefile
index dfc95d314ddd9d48eb5835d4270b94dfbb51deca..285a9e2beed261284a17264909b53a641c5b6fc1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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

diff --git a/arch/arm/mach-stm32mp/soc.c b/arch/arm/mach-stm32mp/soc.c
index fa56b0d2e0f190a0b7f3e1b9a4536ffafd0d6f99..67be55e3381fd301d81e973f8c87c20a33262f04 100644 (file)
--- a/arch/arm/mach-stm32mp/soc.c
+++ b/arch/arm/mach-stm32mp/soc.c
@@ -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();

diff --git a/board/beacon/imx8mp/imx8mp_beacon.c b/board/beacon/imx8mp/imx8mp_beacon.c
index dd74e7c0f7559f78fe0e589d689aefdb804042be..541a4b00ebaeae917fc9d9f1d6430eb7243f310a 100644 (file)
--- a/board/beacon/imx8mp/imx8mp_beacon.c
+++ b/board/beacon/imx8mp/imx8mp_beacon.c
@@ -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)

diff --git a/board/engicam/imx8mp/icore_mx8mp.c b/board/engicam/imx8mp/icore_mx8mp.c
index 864afa92aee0afbd994b35ec01e9f13598a4b572..f01da9612351784f30f20dc73521456af023231d 100644 (file)
--- a/board/engicam/imx8mp/icore_mx8mp.c
+++ b/board/engicam/imx8mp/icore_mx8mp.c
@@ -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)

diff --git a/board/gateworks/venice/venice.c b/board/gateworks/venice/venice.c
index 6a24f618ae2df28e2a18e0e61155f48a72839cbc..aeb401b12104cc2487796662c7c1bb19123b5dc1 100644 (file)
--- a/board/gateworks/venice/venice.c
+++ b/board/gateworks/venice/venice.c
@@ -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)
 {

diff --git a/board/nxp/ls1043ardb/Makefile b/board/nxp/ls1043ardb/Makefile
index 95745bf3a9ca6f0029cab75528a83a8afbac47f9..3f651b416066ccbedd2e3798c0b5331aa5aad422 100644 (file)
--- a/board/nxp/ls1043ardb/Makefile
+++ b/board/nxp/ls1043ardb/Makefile
@@ -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

diff --git a/board/nxp/ls1046afrwy/Makefile b/board/nxp/ls1046afrwy/Makefile
index c70f5cda797342074a25b013a3e625e5c92e7831..8594658d2fb22174a28930a5485d2e35a3914e35 100644 (file)
--- a/board/nxp/ls1046afrwy/Makefile
+++ b/board/nxp/ls1046afrwy/Makefile
@@ -4,4 +4,4 @@
 
 obj-y += ddr.o
 obj-y += ls1046afrwy.o
-obj-$(CONFIG_NET) += eth.o
+obj-$(CONFIG_NET_LEGACY) += eth.o

diff --git a/board/nxp/ls1046ardb/Makefile b/board/nxp/ls1046ardb/Makefile
index 9e5d24f53c88a30de1ce5b86558738f747d80548..355ccf59257184aa18cd62a0afd1d947f899ca4f 100644 (file)
--- a/board/nxp/ls1046ardb/Makefile
+++ b/board/nxp/ls1046ardb/Makefile
@@ -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

diff --git a/board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c b/board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c
index 7f0925074fabfdbe5ac0bf8f58cd93707fd31a12..cff9383bad4f8ce0c06fce3b306c0331d0ee7532 100644 (file)
--- a/board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c
+++ b/board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c
@@ -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)

diff --git a/board/siemens/iot2050/board.c b/board/siemens/iot2050/board.c
index c75f4a0d084d1af86b8834369ad3b57f2fe59bb0..79cf34b40eb5a45ca7853cd7b32e48c7cd5962d2 100644 (file)
--- a/board/siemens/iot2050/board.c
+++ b/board/siemens/iot2050/board.c
@@ -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);

diff --git a/board/sophgo/milkv_duo/Makefile b/board/sophgo/milkv_duo/Makefile
index d0525eba853ed7110ba4a4d37b1715c7689f0650..18ada7d72ffb81d44e538149d9ea8943764451f8 100644 (file)
--- a/board/sophgo/milkv_duo/Makefile
+++ b/board/sophgo/milkv_duo/Makefile
@@ -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

diff --git a/board/sophgo/milkv_duo/board.c b/board/sophgo/milkv_duo/board.c
index 9adbb08f5cece87751e56e6897583f2f3912a938..f0944859b587f25f4be6008e993566f3be662816 100644 (file)
--- a/board/sophgo/milkv_duo/board.c
+++ b/board/sophgo/milkv_duo/board.c
@@ -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;

diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 2f5ad769b9b14562445b986316494f0670328bc1..e5c78e9c064bbc3eae66fb30ade4ed42710c67b8 100644 (file)
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -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 */

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 90e37a8d91330365bb5f27c371be7b9749de9fde..4b7aa5c85860f0dc69fcd581eb8956bf4891d42c 100644 (file)
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -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[] = {
        {

diff --git a/board/toradex/verdin-imx8mp/verdin-imx8mp.c b/board/toradex/verdin-imx8mp/verdin-imx8mp.c
index 59b4607f065142d22aae963457e85419380eb378..69c3408fbba026173051438acba8cedc8129afba 100644 (file)
--- a/board/toradex/verdin-imx8mp/verdin-imx8mp.c
+++ b/board/toradex/verdin-imx8mp/verdin-imx8mp.c
@@ -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)

diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index d022308f943e810deadc0dcd38d9672d2f37054e..b21a136113781377e4b1944d1e8e52e864364677 100644 (file)
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -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;
 

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 9b8a13c34469af698bef5675da5751e8fd1fd2aa..f19a656146aff672666b706dc0a32172a8ee0310 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -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"
 

diff --git a/cmd/Makefile b/cmd/Makefile
index 6b69da1f2b046751727ce3b0e491387a66e27c95..bbbdfcc4ded71164bd3a2793e480a75abf6cc40c 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -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

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index dc7c2c3c853c3f247427b4737c2702b4a57518bb..39e7bec3885ec4e018dcd100c81b545948f534cb 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -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

diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index be84a482b810d022c91126a04fc564b7d387cc8e..e71f873527bcea384dc0ea3e1a9494d3aefb48b4 100644 (file)
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -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"))

diff --git a/cmd/ufetch.c b/cmd/ufetch.c
index bc5db08eee1bb9448d42eb4037ed4785aa4c331a..f8dc904bdd05a96ba415ae36c03162cfe56b0673 100644 (file)
--- a/cmd/ufetch.c
+++ b/cmd/ufetch.c
@@ -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");

diff --git a/common/Kconfig b/common/Kconfig
index 2a167ec3ad3b92552a128c4fc4d7db596031addd..3c3af0e364758e94b065becc8cc178812aefb150 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -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.

diff --git a/common/board_r.c b/common/board_r.c
index 8cf0e14679c05c03d38c482aefe552bcdeedfc45..37e6f51c7a7a5b86159ed6617d39043a2e5a3f5d 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -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

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index a21b71ad5d196acbd124b58f6156a836ca4ac959..5fa94098e49802949eb17cc44fa1ef9604ce82da 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -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

diff --git a/configs/am62px_evm_r5_ethboot_defconfig b/configs/am62px_evm_r5_ethboot_defconfig
index dfd944ad7c0c08ced398d177042331614e146d0e..8baec9d43ffcdd1c0c899267e8a6e73cec965457 100644 (file)
--- a/configs/am62px_evm_r5_ethboot_defconfig
+++ b/configs/am62px_evm_r5_ethboot_defconfig
@@ -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

diff --git a/configs/j722s_evm_r5_ethboot_defconfig b/configs/j722s_evm_r5_ethboot_defconfig
index 68237f7d8c3b630322ab85e3202f2a65ac8d0da9..e4682edb45544e6cb2795d4aa91293e2e5214b8d 100644 (file)
--- a/configs/j722s_evm_r5_ethboot_defconfig
+++ b/configs/j722s_evm_r5_ethboot_defconfig
@@ -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

diff --git a/doc/develop/bootstd/overview.rst b/doc/develop/bootstd/overview.rst
index 397f6db18b4b7ecf549f5f3a574d8a7c1352252d..99ff7d6192dc457c6163d0f9c4ddd29515c60334 100644 (file)
--- a/doc/develop/bootstd/overview.rst
+++ b/doc/develop/bootstd/overview.rst
@@ -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

diff --git a/doc/develop/pytest/usage.rst b/doc/develop/pytest/usage.rst
index e9296fd1f44c46d3599990e98f0b40dcd87d498e..6002244d6085711bdea50f878936781dc1f25215 100644 (file)
--- a/doc/develop/pytest/usage.rst
+++ b/doc/develop/pytest/usage.rst
@@ -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``:

diff --git a/doc/usage/cmd/bdinfo.rst b/doc/usage/cmd/bdinfo.rst
index 46046e55e06449c07b54c5f58fe901b3f8bb4a92..09db9101bd166373fe048e4e93b9cf5598a7cf75 100644 (file)
--- a/doc/usage/cmd/bdinfo.rst
+++ b/doc/usage/cmd/bdinfo.rst
@@ -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.

diff --git a/doc/usage/cmd/sntp.rst b/doc/usage/cmd/sntp.rst
index 2046828130da63ffca1108d31f7ecc297d9eb4a7..433884f18b2e5ae0d0e174ca828f10bab22d5948 100644 (file)
--- a/doc/usage/cmd/sntp.rst
+++ b/doc/usage/cmd/sntp.rst
@@ -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

diff --git a/doc/usage/cmd/wget.rst b/doc/usage/cmd/wget.rst
index e6c42f967b9b31e9801ab437f93dae4dc3b33437..f661d739a19cd24b04028e7d46b11b6f46df28a8 100644 (file)
--- a/doc/usage/cmd/wget.rst
+++ b/doc/usage/cmd/wget.rst
@@ -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.
 

diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
index 962bda40ad2d72787edb2a8619ba044b91649cf6..eeae2fd65ad2bca69935a6870a5720a0aa90eb36 100644 (file)
--- a/drivers/dfu/Kconfig
+++ b/drivers/dfu/Kconfig
@@ -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

diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig
index 576c3ef8a45bedd1541a72e4882b45d8c5ef7bbb..90212fcf9efd43187e1bee10a1d8769495e9904f 100644 (file)
--- a/drivers/fastboot/Kconfig
+++ b/drivers/fastboot/Kconfig
@@ -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

diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index dac5528f80908bf5b1224284c9ecd492394e4f0e..9c52e0045881ca2ece3b4ae12c0c637d9197b27c 100644 (file)
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -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;

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ed07e286676cf81cae6a776fc48cc3c6cd89d33d..f0288387aedf11dc56e774ebe5c743cc68506f7a 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 5d2277a4602e540d52a0fd1744eb22c23df78e40..93f32aea59504b0a3c1b7b01156f417201e86eca 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -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
 

diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 0ea50c484c05967aac335a9d321da68dd67328bf..e1daeb6c1e6f9ea877a0f9739ef3924c177d0512 100644 (file)
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -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.

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index baa2eb61ea333502c231d0c7360dac33d47dca2f..d4ffc24c0636e01151e00103d8ce0564e6a1514b 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -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

diff --git a/env/flags.c b/env/flags.c
index f734fda50c27f5ff467da945717cc52034d70d23..45eb9820d9f5a6137739b6093396d6ee2631e714 100644 (file)
--- a/env/flags.c
+++ b/env/flags.c
@@ -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++) {

diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index 9cac31bcf472eec3f9f2d50fcb24ecc953ce5bf8..9a87b47917604f9ea60a025412dd0da58d731fde 100644 (file)
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -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)

diff --git a/include/configs/stm32mp23_common.h b/include/configs/stm32mp23_common.h
index 7285886b8227dcc00e615d2e12b721931ef2b688..392d779ec16e9641f774ea1fe15b4b363cd0da98 100644 (file)
--- a/include/configs/stm32mp23_common.h
+++ b/include/configs/stm32mp23_common.h
@@ -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)

diff --git a/include/configs/stm32mp25_common.h b/include/configs/stm32mp25_common.h
index b42316fd8aca721ad860bfd45039d8ac37a4aa25..a334b47b555bd860718e171ef7be4d5ccee71d58 100644 (file)
--- a/include/configs/stm32mp25_common.h
+++ b/include/configs/stm32mp25_common.h
@@ -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)

diff --git a/include/env_callback.h b/include/env_callback.h
index 918ccb3b14f42a578b9ed46c5db7b80b5af53eba..f7bb23df56992bf89757e775e08201debb73560f 100644 (file)
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -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," \

diff --git a/include/env_flags.h b/include/env_flags.h
index 0c48874690f25b90d671610595075025b64dbb50..85721a89cfbdd4abd3d0ecbde6e9fdcf7f700730 100644 (file)
--- a/include/env_flags.h
+++ b/include/env_flags.h
@@ -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
  */

diff --git a/include/net-common.h b/include/net-common.h
index f293b21bc0bb3c8e1a04ffd8f5188e5ce67d1d12..0cbdf344664d1bd0689f1a43038a2b6288296640 100644 (file)
--- a/include/net-common.h
+++ b/include/net-common.h
@@ -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);
 

diff --git a/include/net-legacy.h b/include/net-legacy.h
index d489c2480cd89adec6026b4fcb0b1165f8a28081..d3b122c90624bcb87dea62ea1060b793091cc9ce 100644 (file)
--- a/include/net-legacy.h
+++ b/include/net-legacy.h
@@ -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 **/

diff --git a/lib/Kconfig b/lib/Kconfig
index 4e6a0c6a1b63ef7235838bcc7857db545a855b1a..b2ffa2c4ef2e11809312a44fb1e183229c5c02ff 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -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

diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index b5f81e0ff530ee3299415a56428a9146af1550a6..495a85fa86930af7ad26ad256ccd7976ea0e5920 100644 (file)
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -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

diff --git a/net/Kconfig b/net/Kconfig
index 249c27c115d699664fe3165f250df2caf10362d3..89d949b5f2c8d72cb6eaf99dfedd1bd1f906c151 100644 (file)
--- a/net/Kconfig
+++ b/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"

diff --git a/net/Makefile b/net/Makefile
index 3a32bc8b0e78404c3db2196ed802010988145bc8..a9323ceb40b98ef1410d09d22c433bdf68170fb8 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -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

diff --git a/test/cmd/Makefile b/test/cmd/Makefile
index 8c9f112782d0ba9839adf5c3618abd8a01aa586a..5f2815b1bb656b839c75f554b2fba074c5ebe103 100644 (file)
--- a/test/cmd/Makefile
+++ b/test/cmd/Makefile
@@ -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

diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c
index c3a3519d16d4197a15984778329bad7b33252335..3233a0a6a5110ec70274bd9d62dda8368315b0bd 100644 (file)
--- a/test/cmd/bdinfo.c
+++ b/test/cmd/bdinfo.c
@@ -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();
 

diff --git a/test/dm/eth.c b/test/dm/eth.c
index 1087ae9572da21c6a3a01b546f7b254956eb9f23..ed0b57d88614d5fec615e649820ee474fef7ae7b 100644 (file)
--- a/test/dm/eth.c
+++ b/test/dm/eth.c
@@ -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)
 {

diff --git a/test/py/tests/test_efi_fit.py b/test/py/tests/test_efi_fit.py
index 63ee8e6cef2f5c9904cdfd698c6b4baff6ad7fcc..409cfdfd56ff9b09fb63bbf745f9ab68de5fbd9c 100644 (file)
--- a/test/py/tests/test_efi_fit.py
+++ b/test/py/tests/test_efi_fit.py
@@ -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)

diff --git a/test/py/tests/test_efi_loader.py b/test/py/tests/test_efi_loader.py
index dc58c0d4dbdabdd022d6957b708c381d1d3c30fe..fc45209a581d073f58ab4e48d4e5d0009440b5be 100644 (file)
--- a/test/py/tests/test_efi_loader.py
+++ b/test/py/tests/test_efi_loader.py
@@ -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.
 

diff --git a/test/py/tests/test_fpga.py b/test/py/tests/test_fpga.py
index 299a8653f7414e1c9b74b5e6373c7ca12b22ecfd..0ab47c0bde5306a6dfb554dbca109b2a7496852b 100644 (file)
--- a/test/py/tests/test_fpga.py
+++ b/test/py/tests/test_fpga.py
@@ -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)

diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py
index 6ef02e533893a1d64a2e90664c82b472e972cccc..4f8995300607b2cb9d6b561c8229f12ed5a8fbfb 100644 (file)
--- a/test/py/tests/test_net.py
+++ b/test/py/tests/test_net.py
@@ -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.