{"id":2225160,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2225160/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260420-net-kconfig-v1-4-9900002d8e72@cherry.de/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.1/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260420-net-kconfig-v1-4-9900002d8e72@cherry.de>","date":"2026-04-20T11:36:10","name":"[4/6] simplify NET_LEGACY || NET_LWIP condition with NET condition","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"07228be976304cf47db85d70cd2074df193a9836","submitter":{"id":84425,"url":"http://patchwork.ozlabs.org/api/1.1/people/84425/?format=json","name":"Quentin Schulz","email":"foss+uboot@0leil.net"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260420-net-kconfig-v1-4-9900002d8e72@cherry.de/mbox/","series":[{"id":500605,"url":"http://patchwork.ozlabs.org/api/1.1/series/500605/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=500605","date":"2026-04-20T11:36:06","name":"net: migrate NO_NET out of the networking stack choice","version":1,"mbox":"http://patchwork.ozlabs.org/series/500605/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225160/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225160/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=0leil.net header.i=@0leil.net header.a=rsa-sha256\n header.s=20231125 header.b=UpIdc1Bx;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=pass (p=reject dis=none) header.from=0leil.net","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=0leil.net header.i=@0leil.net header.b=\"UpIdc1Bx\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=reject dis=none) header.from=0leil.net","phobos.denx.de;\n spf=pass smtp.mailfrom=foss+uboot@0leil.net"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fzlnb6J80z1yGs\n\tfor ; Mon, 20 Apr 2026 22:54:59 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id DCD6484399;\n\tMon, 20 Apr 2026 14:54:21 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 4D5EE84312; Mon, 20 Apr 2026 13:37:03 +0200 (CEST)","from smtp-bc09.mail.infomaniak.ch (smtp-bc09.mail.infomaniak.ch\n [45.157.188.9])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 21A5483E16\n for ; Mon, 20 Apr 2026 13:36:59 +0200 (CEST)","from smtp-4-0000.mail.infomaniak.ch (smtp-4-0000.mail.infomaniak.ch\n [10.7.10.107])\n by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4fzk3Z5tZLz1BmM;\n Mon, 20 Apr 2026 13:36:58 +0200 (CEST)","from unknown by smtp-4-0000.mail.infomaniak.ch (Postfix) with ESMTPA\n id 4fzk3Q2sGMzWJp; Mon, 20 Apr 2026 13:36:50 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-3.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,\n RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS\n autolearn=ham autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=0leil.net;\n s=20231125; t=1776685017;\n bh=ABLTuTBF2D9ZidAsQVVgSuxfrLeOdnfMDSQEaf4pHYs=;\n h=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n b=UpIdc1Bxz0vkQzXdck9bLsscdd810ofda1ZLj6cfTWX7ZY6QlfAL3vC3eksczmbuy\n ORgoWx9i3EhQK34W7iy5mXIDClmHOHW8igOlnqqLZmp19jkUcts9SzTWfGonq+LnFz\n g6jqKX++TE5SNkInI27Tji+riCtX+7pYP5nRg1rXueZUsEATmlgmJ/dizd4d0Zga4C\n AVLW80r0MKCTbvq6XIHx3+DpH+pC6mWuw4pv5hxjq9qGeWw0/5EjG6mE/GTrnMjxIV\n tF3+/kr+j6oM3cEHWP34dLPBoiAiH77lrrGyl3KBr2WKMAFOXcA3iT9g4f5/KD89Ij\n TNbSkT9vKp0vw==","From":"Quentin Schulz ","Date":"Mon, 20 Apr 2026 13:36:10 +0200","Subject":"[PATCH 4/6] simplify NET_LEGACY || NET_LWIP condition with NET\n condition","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20260420-net-kconfig-v1-4-9900002d8e72@cherry.de>","References":"<20260420-net-kconfig-v1-0-9900002d8e72@cherry.de>","In-Reply-To":"<20260420-net-kconfig-v1-0-9900002d8e72@cherry.de>","To":"u-boot@lists.denx.de, uboot-stm32@st-md-mailman.stormreply.com,\n Paul Barker ","Cc":"Tom Rini ,\n Jerome Forissier ,\n Heinrich Schuchardt ,\n Marek Vasut ,\n Ilias Apalodimas , Peng Fan ,\n Udit Kumar ,\n =?utf-8?q?Alvin_=C5=A0ipraga?= ,\n Patrick Delaunay ,\n Patrice Chotard ,\n Adam Ford ,\n Manoj Sai ,\n Matteo Lisi , Tim Harvey ,\n Mingkai Hu , Pramod Kumar ,\n Gilles Talis , Le Jin ,\n Jan Kiszka ,\n Kongyang Liu , Stefan Roese ,\n Francesco Dolcini ,\n Michal Simek ,\n Mattijs Korpershoek ,\n Casey Connolly ,\n Vignesh Raghavendra , Bryan Brattlof ,\n Vaishnav Achath , Jayesh Choudhary ,\n Simon Glass , Lukasz Majewski ,\n Marek Vasut , Sughosh Ganu ,\n Yao Zi , Fabio Estevam ,\n Alice Guo , Sam Protsenko ,\n Martyn Welch ,\n Maarten Brock ,\n Kory Maincent ,\n \"Markus Schneider-Pargmann (TI.com)\" ,\n Padmarao Begari ,\n Matthias Brugger ,\n Mikhail Kshevetskiy ,\n Heiko Schocher ,\n Andrew Goodbody ,\n Peter Robinson , Brian Sune ,\n Julien Stephan ,\n Dinesh Maniyam ,\n Ben Dooks ,\n Tien Fong Chee ,\n Leo Yu-Chi Liang ,\n Weijie Gao , Anshul Dalal ,\n Neil Armstrong ,\n Andre Przywara , Andrew Davis ,\n Hrushikesh Salunke , Alexey Charkov ,\n Dario Binacchi , Ye Li ,\n Andreas Dannenberg , Chintan Vankar ,\n Martin Schwan , Benjamin Hahn ,\n David Lechner ,\n Ariel D'Alessandro ,\n Dmitrii Merkurev ,\n Christian Marangi ,\n Robert Marko , Beiyan Yun ,\n \"Lucien.Jheng\" ,\n Romain Gantois ,\n Siddharth Vadapalli ,\n Kever Yang , Jonas Karlman ,\n George Chan ,\n Balaji Selvanathan ,\n Benjamin ROBIN ,\n Max Merchel ,\n Sean Edmond ,\n Christoph Niedermaier ,\n Shantur Rathore ,\n \"Ying-Chun Liu (PaulLiu)\" ,\n Adriano Cordova ,\n Sky Huang ,\n Quentin Schulz ","X-Mailer":"b4 0.15-dev-47773","X-Infomaniak-Routing":"alpha","X-Mailman-Approved-At":"Mon, 20 Apr 2026 14:54:20 +0200","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"From: Quentin Schulz \n\nSince the move to make NET a menuconfig and NO_NET a synonym of NET=n,\nwhen NET is enabled, NET_LEGACY || NET_LWIP is necessarily true, so\nlet's simplify the various checks across the codebase.\n\nSPL_NET_LWIP doesn't exist but SPL_NET_LEGACY is an alias for SPL_NET so\nthe proper symbol is still defined in SPL whenever needed.\n\nSigned-off-by: Quentin Schulz \n---\n Makefile | 2 +-\n board/engicam/imx8mp/icore_mx8mp.c | 2 +-\n board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c | 2 +-\n board/ti/am335x/board.c | 2 +-\n board/xilinx/common/board.c | 3 +--\n cmd/Kconfig | 4 ++--\n cmd/bdinfo.c | 7 +++----\n common/Kconfig | 2 +-\n common/board_r.c | 4 ++--\n doc/usage/cmd/bdinfo.rst | 7 +++----\n drivers/net/Kconfig | 2 +-\n drivers/net/phy/Kconfig | 2 +-\n drivers/usb/gadget/Kconfig | 2 +-\n env/flags.c | 10 +++++-----\n include/env_callback.h | 2 +-\n include/env_flags.h | 6 +++---\n include/net-common.h | 2 +-\n lib/efi_loader/Kconfig | 4 ++--\n net/Makefile | 2 +-\n test/cmd/bdinfo.c | 6 +++---\n test/py/tests/test_efi_loader.py | 2 +-\n test/py/tests/test_fpga.py | 4 ++--\n test/py/tests/test_net.py | 2 +-\n 23 files changed, 39 insertions(+), 42 deletions(-)","diff":"diff --git a/Makefile b/Makefile\nindex 285a9e2beed..32d82c0697a 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1081,7 +1081,7 @@ libs-$(CONFIG_OF_EMBED) += dts/\n libs-y += env/\n libs-y += lib/\n libs-y += fs/\n-libs-$(filter y,$(CONFIG_NET_LEGACY) $(CONFIG_NET_LWIP)) += net/\n+libs-$(CONFIG_NET) += net/\n libs-y += disk/\n libs-y += drivers/\n libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/\ndiff --git a/board/engicam/imx8mp/icore_mx8mp.c b/board/engicam/imx8mp/icore_mx8mp.c\nindex f01da961235..547cfa3a35f 100644\n--- a/board/engicam/imx8mp/icore_mx8mp.c\n+++ b/board/engicam/imx8mp/icore_mx8mp.c\n@@ -30,7 +30,7 @@ static void setup_fec(void)\n \tsetbits_le32(&gpr->gpr[1], BIT(22));\n }\n \n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n int board_phy_config(struct phy_device *phydev)\n {\n \tif (phydev->drv->config)\ndiff --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\nindex cff9383bad4..23d24140ca7 100644\n--- a/board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c\n+++ b/board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c\n@@ -26,7 +26,7 @@ static void setup_fec(void)\n \tsetbits_le32(&gpr->gpr[1], BIT(22));\n }\n \n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n int board_phy_config(struct phy_device *phydev)\n {\n \tif (phydev->drv->config)\ndiff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c\nindex 4b7aa5c8586..b5f69a45a7c 100644\n--- a/board/ti/am335x/board.c\n+++ b/board/ti/am335x/board.c\n@@ -911,7 +911,7 @@ int board_late_init(void)\n #endif\n \n /* CPSW plat */\n-#if (CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)) && \\\n+#if CONFIG_IS_ENABLED(NET) && \\\n !CONFIG_IS_ENABLED(OF_CONTROL)\n struct cpsw_slave_data slave_data[] = {\n \t{\ndiff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c\nindex b21a1361137..89562ef77fc 100644\n--- a/board/xilinx/common/board.c\n+++ b/board/xilinx/common/board.c\n@@ -508,8 +508,7 @@ int board_late_init_xilinx(void)\n \t\t\t\tret |= env_set_by_index(\"uuid\", id, uuid);\n \t\t\t}\n \n-\t\t\tif (!(CONFIG_IS_ENABLED(NET_LEGACY) ||\n-\t\t\t CONFIG_IS_ENABLED(NET_LWIP)))\n+\t\t\tif (!CONFIG_IS_ENABLED(NET))\n \t\t\t\tcontinue;\n \n \t\t\tfor (i = 0; i < EEPROM_HDR_NO_OF_MAC_ADDR; i++) {\ndiff --git a/cmd/Kconfig b/cmd/Kconfig\nindex f19a656146a..64f70b22e26 100644\n--- a/cmd/Kconfig\n+++ b/cmd/Kconfig\n@@ -1946,7 +1946,7 @@ config CMD_XXD\n \n endmenu\n \n-if NET_LEGACY || NET_LWIP\n+if NET\n \n menuconfig CMD_NET\n \tbool \"Network commands\"\n@@ -2329,7 +2329,7 @@ config CMD_PXE\n \n endif # if CMD_NET\n \n-endif # NET_LEGACY || NET_LWIP\n+endif # NET\n \n menu \"Misc commands\"\n \ndiff --git a/cmd/bdinfo.c b/cmd/bdinfo.c\nindex 39e7bec3885..ddf77303735 100644\n--- a/cmd/bdinfo.c\n+++ b/cmd/bdinfo.c\n@@ -152,7 +152,7 @@ static int bdinfo_print_all(struct bd_info *bd)\n \tbdinfo_print_num_l(\"relocaddr\", gd->relocaddr);\n \tbdinfo_print_num_l(\"reloc off\", gd->reloc_off);\n \tprintf(\"%-12s= %u-bit\\n\", \"Build\", (uint)sizeof(void *) * 8);\n-\tif (IS_ENABLED(CONFIG_NET_LEGACY) || IS_ENABLED(CONFIG_NET_LWIP))\n+\tif (IS_ENABLED(CONFIG_NET))\n \t\tprint_eth();\n \tbdinfo_print_num_l(\"fdt_blob\", (ulong)map_to_sysmem(gd->fdt_blob));\n \tif (IS_ENABLED(CONFIG_VIDEO))\n@@ -194,8 +194,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])\n \t\tcase 'a':\n \t\t\treturn bdinfo_print_all(bd);\n \t\tcase 'e':\n-\t\t\tif (!IS_ENABLED(CONFIG_NET_LEGACY) &&\n-\t\t\t !IS_ENABLED(CONFIG_NET_LWIP))\n+\t\t\tif (!IS_ENABLED(CONFIG_NET))\n \t\t\t\treturn CMD_RET_USAGE;\n \t\t\tprint_eth();\n \t\t\treturn CMD_RET_SUCCESS;\n@@ -221,7 +220,7 @@ U_BOOT_CMD(\n \t\" - print all Board Info structure\"\n #if CONFIG_IS_ENABLED(GETOPT)\n \t\"\\n\"\n-#if IS_ENABLED(CONFIG_NET_LEGACY) || IS_ENABLED(CONFIG_NET_LWIP)\n+#if IS_ENABLED(CONFIG_NET)\n \t\"bdinfo -e\\n\"\n \t\" - print Board Info related to network\\n\"\n #endif\ndiff --git a/common/Kconfig b/common/Kconfig\nindex 3c3af0e3647..8e8c733aa29 100644\n--- a/common/Kconfig\n+++ b/common/Kconfig\n@@ -425,7 +425,7 @@ config LOGF_FUNC_PAD\n \n config LOG_SYSLOG\n \tbool \"Log output to syslog server\"\n-\tdepends on NET_LEGACY || NET_LWIP\n+\tdepends on NET\n \thelp\n \t Enables a log driver which broadcasts log records via UDP port 514\n \t to syslog servers.\ndiff --git a/common/board_r.c b/common/board_r.c\nindex 37e6f51c7a7..45942910829 100644\n--- a/common/board_r.c\n+++ b/common/board_r.c\n@@ -495,7 +495,7 @@ static int initr_boot_led_on(void)\n \treturn 0;\n }\n \n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n static int initr_net(void)\n {\n \tputs(\"Net: \");\n@@ -756,7 +756,7 @@ static void initcall_run_r(void)\n #if CONFIG_IS_ENABLED(PCI_ENDPOINT)\n \tINITCALL(pci_ep_init);\n #endif\n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n \tWATCHDOG_RESET();\n \tINITCALL(initr_net);\n #endif\ndiff --git a/doc/usage/cmd/bdinfo.rst b/doc/usage/cmd/bdinfo.rst\nindex 09db9101bd1..6226d14bd66 100644\n--- a/doc/usage/cmd/bdinfo.rst\n+++ b/doc/usage/cmd/bdinfo.rst\n@@ -124,12 +124,12 @@ Build\n current eth\n name of the active network device\n \n- Only shown if CONFIG_NET_LEGACY=y or CONFIG_NET_LWIP=y.\n+ Only shown if CONFIG_NET=y.\n \n IP addr\n network address, value of the environment variable *ipaddr*\n \n- Only shown if CONFIG_NET_LEGACY=y or CONFIG_NET_LWIP=y.\n+ Only shown if CONFIG_NET=y.\n \n fdt_blob\n address of U-Boot's own device tree, NULL if none\n@@ -173,5 +173,4 @@ The bdinfo command is available if CONFIG_CMD_BDI=y.\n \n The options to bdinfo are only available if CONFIG_GETOPT=y.\n \n-The ``-e`` option is additionally only available if CONFIG_NET_LEGACY=y or\n-CONFIG_NET_LWIP=y.\n+The ``-e`` option is additionally only available if CONFIG_NET=y.\ndiff --git a/drivers/net/Kconfig b/drivers/net/Kconfig\nindex f0288387aed..666618681df 100644\n--- a/drivers/net/Kconfig\n+++ b/drivers/net/Kconfig\n@@ -339,7 +339,7 @@ config ESSEDMA\n \n config ETH_SANDBOX\n \tdepends on SANDBOX\n-\tdepends on NET_LEGACY || NET_LWIP\n+\tdepends on NET\n \tdefault y\n \tbool \"Sandbox: Mocked Ethernet driver\"\n \thelp\ndiff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig\nindex 93f32aea595..0025c895f12 100644\n--- a/drivers/net/phy/Kconfig\n+++ b/drivers/net/phy/Kconfig\n@@ -7,7 +7,7 @@ config MV88E6352_SWITCH\n \n menuconfig PHYLIB\n \tbool \"Ethernet PHY (physical media interface) support\"\n-\tdepends on NET_LEGACY || NET_LWIP\n+\tdepends on NET\n \thelp\n \t Enable Ethernet PHY (physical media interface) support.\n \ndiff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig\nindex d4ffc24c063..18582962249 100644\n--- a/drivers/usb/gadget/Kconfig\n+++ b/drivers/usb/gadget/Kconfig\n@@ -232,7 +232,7 @@ endif # USB_GADGET_DOWNLOAD\n \n config USB_ETHER\n \tbool \"USB Ethernet Gadget\"\n-\tdepends on NET_LEGACY || NET_LWIP\n+\tdepends on NET\n \tdefault y if ARCH_SUNXI && USB_MUSB_GADGET\n \thelp\n \t Creates an Ethernet network device through a USB peripheral\ndiff --git a/env/flags.c b/env/flags.c\nindex 45eb9820d9f..f1966bc91b4 100644\n--- a/env/flags.c\n+++ b/env/flags.c\n@@ -22,7 +22,7 @@\n #include \n #endif\n \n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n #define ENV_FLAGS_NET_VARTYPE_REPS \"im\"\n #else\n #define ENV_FLAGS_NET_VARTYPE_REPS \"\"\n@@ -57,7 +57,7 @@ static const char * const env_flags_vartype_names[] = {\n \t\"decimal\",\n \t\"hexadecimal\",\n \t\"boolean\",\n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n \t\"IP address\",\n \t\"MAC address\",\n #endif\n@@ -211,7 +211,7 @@ static void skip_num(int hex, const char *value, const char **end,\n \t\t*end = value;\n }\n \n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n int eth_validate_ethaddr_str(const char *addr)\n {\n \tconst char *end;\n@@ -244,7 +244,7 @@ static int _env_flags_validate_type(const char *value,\n \tenum env_flags_vartype type)\n {\n \tconst char *end;\n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n \tconst char *cur;\n \tint i;\n #endif\n@@ -273,7 +273,7 @@ static int _env_flags_validate_type(const char *value,\n \t\tif (value[1] != '\\0')\n \t\t\treturn -1;\n \t\tbreak;\n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n \tcase env_flags_vartype_ipaddr:\n \t\tcur = value;\n \t\tfor (i = 0; i < 4; i++) {\ndiff --git a/include/env_callback.h b/include/env_callback.h\nindex f7bb23df569..1181ab4a157 100644\n--- a/include/env_callback.h\n+++ b/include/env_callback.h\n@@ -32,7 +32,7 @@\n #define DNS_CALLBACK\n #endif\n \n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n #define NET_CALLBACKS \\\n \t\"bootfile:bootfile,\" \\\n \t\"ipaddr:ipaddr,\" \\\ndiff --git a/include/env_flags.h b/include/env_flags.h\nindex 85721a89cfb..123fdbcb0ba 100644\n--- a/include/env_flags.h\n+++ b/include/env_flags.h\n@@ -14,7 +14,7 @@ enum env_flags_vartype {\n \tenv_flags_vartype_decimal,\n \tenv_flags_vartype_hex,\n \tenv_flags_vartype_bool,\n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n \tenv_flags_vartype_ipaddr,\n \tenv_flags_vartype_macaddr,\n #endif\n@@ -41,7 +41,7 @@ enum env_flags_varaccess {\n #define CFG_ENV_FLAGS_LIST_STATIC \"\"\n #endif\n \n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n #ifdef CONFIG_REGEX\n #define ETHADDR_WILDCARD \"\\\\d*\"\n #else\n@@ -123,7 +123,7 @@ enum env_flags_varaccess env_flags_parse_varaccess(const char *flags);\n */\n enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags);\n \n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n /*\n * Check if a string has the format of an Ethernet MAC address\n */\ndiff --git a/include/net-common.h b/include/net-common.h\nindex 0cbdf344664..69b6316c1ec 100644\n--- a/include/net-common.h\n+++ b/include/net-common.h\n@@ -235,7 +235,7 @@ int eth_rx(void);\t\t\t/* Check for received packets */\n */\n void reset_phy(void);\n \n-#if CONFIG_IS_ENABLED(NET_LEGACY) || CONFIG_IS_ENABLED(NET_LWIP)\n+#if CONFIG_IS_ENABLED(NET)\n /**\n * eth_set_enable_bootdevs() - Enable or disable binding of Ethernet bootdevs\n *\ndiff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig\nindex 495a85fa869..3279fc88354 100644\n--- a/lib/efi_loader/Kconfig\n+++ b/lib/efi_loader/Kconfig\n@@ -517,7 +517,7 @@ config EFI_RISCV_BOOT_PROTOCOL\n config EFI_IP4_CONFIG2_PROTOCOL\n \tbool \"EFI_IP4_CONFIG2_PROTOCOL support\"\n \tdefault y if ARCH_QEMU || SANDBOX\n-\tdepends on NET_LEGACY || NET_LWIP\n+\tdepends on NET\n \thelp\n \t Provides an implementation of the EFI_IP4_CONFIG2_PROTOCOL, this\n \t protocol can be used to set and get the current ip address and\n@@ -599,7 +599,7 @@ config EFI_BOOTMGR\n \n config EFI_HTTP_BOOT\n \tbool \"EFI HTTP Boot support\"\n-\tdepends on NET_LEGACY || NET_LWIP\n+\tdepends on NET\n \tselect CMD_NET\n \tselect CMD_DHCP\n \tselect CMD_DNS\ndiff --git a/net/Makefile b/net/Makefile\nindex a9323ceb40b..ceac6de6377 100644\n--- a/net/Makefile\n+++ b/net/Makefile\n@@ -37,7 +37,7 @@ CFLAGS_eth_common.o += -Wno-format-extra-args\n \n endif\n \n-ifeq ($(filter y,$(CONFIG_NET_LEGACY) $(CONFIG_NET_LWIP)),y)\n+ifeq ($(CONFIG_NET),y)\n obj-$(CONFIG_DM_DSA) += dsa-uclass.o\n obj-$(CONFIG_$(PHASE_)DM_ETH) += eth-uclass.o\n obj-$(CONFIG_$(PHASE_)BOOTDEV_ETH) += eth_bootdev.o\ndiff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c\nindex 3233a0a6a51..7f4f1868c6a 100644\n--- a/test/cmd/bdinfo.c\n+++ b/test/cmd/bdinfo.c\n@@ -172,7 +172,7 @@ static int bdinfo_test_all(struct unit_test_state *uts)\n \tut_assertok(test_num_l(uts, \"reloc off\", gd->reloc_off));\n \tut_assert_nextline(\"%-12s= %u-bit\", \"Build\", (uint)sizeof(void *) * 8);\n \n-\tif (IS_ENABLED(CONFIG_NET_LEGACY) || IS_ENABLED(CONFIG_NET_LWIP))\n+\tif (IS_ENABLED(CONFIG_NET))\n \t\tut_assertok(test_eth(uts));\n \n \t/*\n@@ -314,7 +314,7 @@ static int bdinfo_test_help(struct unit_test_state *uts)\n \t\t\tut_assert_nextlinen(\"bdinfo -a\");\n \t\tut_assert_nextlinen(\" - print all Board Info structure\");\n \t\tif (CONFIG_IS_ENABLED(GETOPT)) {\n-\t\t\tif (IS_ENABLED(CONFIG_NET_LEGACY) || IS_ENABLED(CONFIG_NET_LWIP)) {\n+\t\t\tif (IS_ENABLED(CONFIG_NET)) {\n \t\t\t\tut_assert_nextlinen(\"bdinfo -e\");\n \t\t\t\tut_assert_nextlinen(\" - print Board Info related to network\");\n \t\t\t}\n@@ -348,7 +348,7 @@ static int bdinfo_test_eth(struct unit_test_state *uts)\n \tut_assertok(run_commandf(\"bdinfo -e\"));\n \tif (!CONFIG_IS_ENABLED(GETOPT))\n \t\tut_assertok(bdinfo_test_all(uts));\n-\telse if (IS_ENABLED(CONFIG_NET_LEGACY) || IS_ENABLED(CONFIG_NET_LWIP))\n+\telse if (IS_ENABLED(CONFIG_NET))\n \t\tut_assertok(test_eth(uts));\n \tut_assert_console_end();\n \ndiff --git a/test/py/tests/test_efi_loader.py b/test/py/tests/test_efi_loader.py\nindex fc45209a581..91f151d09cd 100644\n--- a/test/py/tests/test_efi_loader.py\n+++ b/test/py/tests/test_efi_loader.py\n@@ -98,7 +98,7 @@ def test_efi_setup_dhcp(ubman):\n global net_set_up\n net_set_up = True\n \n-@pytest.mark.buildconfigspec('net_legacy', 'net_lwip')\n+@pytest.mark.buildconfigspec('net')\n def test_efi_setup_static(ubman):\n \"\"\"Set up the network using a static IP configuration.\n \ndiff --git a/test/py/tests/test_fpga.py b/test/py/tests/test_fpga.py\nindex 0ab47c0bde5..74cd42b910e 100644\n--- a/test/py/tests/test_fpga.py\n+++ b/test/py/tests/test_fpga.py\n@@ -506,7 +506,7 @@ def test_fpga_loadfs(ubman):\n @pytest.mark.buildconfigspec('cmd_fpga_load_secure')\n @pytest.mark.buildconfigspec('cmd_net')\n @pytest.mark.buildconfigspec('cmd_dhcp')\n-@pytest.mark.buildconfigspec('net_legacy', 'net_lwip')\n+@pytest.mark.buildconfigspec('net')\n def test_fpga_secure_bit_auth(ubman):\n \n test_net.test_net_dhcp(ubman)\n@@ -534,7 +534,7 @@ def test_fpga_secure_bit_auth(ubman):\n @pytest.mark.buildconfigspec('cmd_fpga_load_secure')\n @pytest.mark.buildconfigspec('cmd_net')\n @pytest.mark.buildconfigspec('cmd_dhcp')\n-@pytest.mark.buildconfigspec('net_legacy', 'net_lwip')\n+@pytest.mark.buildconfigspec('net')\n def test_fpga_secure_bit_img_auth_kup(ubman):\n \n test_net.test_net_dhcp(ubman)\ndiff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py\nindex 4f899530060..27cdd73fd49 100644\n--- a/test/py/tests/test_net.py\n+++ b/test/py/tests/test_net.py\n@@ -201,7 +201,7 @@ def test_net_dhcp6(ubman):\n global net6_set_up\n net6_set_up = True\n \n-@pytest.mark.buildconfigspec('net_legacy', 'net_lwip')\n+@pytest.mark.buildconfigspec('net')\n def test_net_setup_static(ubman):\n \"\"\"Set up a static IP configuration.\n \n","prefixes":["4/6"]}