Skip to contentSkip to conversation

Introduce the lwIP network stack

PATCH Superseded Jerome Forissier 3 participants 31 messages Oct 9, 2024 – Oct 15, 2024

Subsystems (11)

v12 of 13 Superseded Latest is v13 →

lore
Share & tools
lore
#0 lore raw

v12 cover Introduce the lwIP network stack

This is a rework of a patch series by Maxim Uvarov: "net/lwip: add lwip library for the network stack" [1]. The goal is to introduce the lwIP TCP/IP stack [2] [3] as an alternative to the current implementation in net/, selectable with Kconfig, and ultimately keep only lwIP if possible. Some reasons for doing so are:
- Make the support of HTTPS in the wget command easier. Javier T. and Raymond M. (CC'd) have some additional lwIP and Mbed TLS patches to do so. With that it becomes possible to fetch and launch a distro installer such as Debian etc. using a secure, authenticated connection directly from the U-Boot shell. Several use cases:
* Authentication: prevent MITM attack (third party replacing the
binary with a different one)
* Confidentiality: prevent third parties from grabbing a copy of the
image as it is being downloaded
* Allow connection to servers that do not support plain HTTP anymore
(this is becoming more and more common on the Internet these days)
- Possibly benefit from additional features implemented in lwIP
- Less code to maintain in U-Boot

Prior to applying this series, the lwIP stack needs to be added as a Git subtree with the following command:

 $ git subtree add --squash --prefix lib/lwip/lwip \
   https://github.com/lwip-tcpip/lwip.git  STABLE-2_2_0_RELEASE 

Notes

1. A number of features are currently incompatible with NET_LWIP:
DFU_TFTP, FASTBOOT, SPL_NET, ETH_SANDBOX, ETH_SANDBOX_RAW, DM_ETH. They all make assumptions on how the network stack is implemented and/or pull sybols that are not trivially exported from lwIP. Some interface rework may be needed.

2. Due to the above, and in order to provide some level of testing of the lwIP code in CI even when the legacy NET is the default, a new QEMU configuration is introduced (qemu_arm64_lwip_defconfig) which is based on qemu_arm64_defconfig with NET_LWIP and CMD_*_LWIP enabled. In addition to that, this series has some [TESTING] patches which make NET_LWIP the default.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://www.nongnu.org/lwip/
[3] https://en.wikipedia.org/wiki/LwIP

Changes in v12:

- Rebase onto master
- Combine "net: split include/net.h into net{, -common, -legacy, -lwip}.h" and "net: move copy_filename() to new file net/net-common.c" (Ilias A.)
- Fold "net-lwip: lwIP wget supports user defined port in the uri, so allow it." into parent patch "net-lwip: add wget command"
- CI: update .gitlab-ci.yml too (Tom R.)
- Fold "configs: replace '# CONFIG_NET is not set' with CONFIG_NO_NET=y" into "net: introduce alternative implementation as net-lwip/"
- bootflow_cmd_label test: use 'if CONFIG_IS_ENABLED(DSA_SANDBOX)'
- Drop the "[TESTING]" patches:
* "[TESTING] Kconfig: enable NET_LWIP by default"
* "[TESTING] configs: set CONFIG_NET=y for FTGMAC100"
- Drop the patches sent separately:
* "net: recv(): return -EAGAIN instead of 0 when no cleanup is expected"
* "Make AVB_VERIFY depend on FASTBOOT"
* "linker_lists: set LINKER_LIST_ALIGN to 8 if 64BIT"
- Fix "configs: use syntax CONFIG_FOO=n in tools-only_defconfig":
'CONFIG_NET=n' was inadvertently forgotten.
- Fix "net: introduce alternative implementation as net-lwip/": set CONFIG_NO_NET=y in tools-only_defconfig.
- Add the "git subtree add" command to the patch description in "net-lwip: build lwIP".
- All patches: use "net: lwip:" as a subsystem prefix rather than "net-lwip:".
- Apply review tags

Changes in v11:

- Rebased onto next
- "Miscellaneous fixes" removed (patches were merged in next). The
series still begins with small fixes posted separately [1] [2] [3].
- Add (some) support for CMD_PXE and therefore drop patch "[TESTING]
configs: set CONFIG_NET=y when PXE is enabled". This is build-tested
only and it is very likely that some work is needed to make it useful.
For example, adding the code for DHCP option 209 to lwIP so that BOOTP_PXE_DHCP_OPTION can be supported.
- SANDBOX is now supported, but with the dm eth and wget tests
disabled.
- Move eth_set_enable_bootdevs() declaration to net-common.h
Fixes warning with snow_defconfig:
test/test-main.c:310:17: warning: implicit declaration of function ‘eth_set_enable_bootdevs’ [....]
- Do eth_init() and eth_init_rings() only once, and do not forget
lwip_init()! Fixes TFTP stalls on TI K3 (reported by Tom R. and
tested by Ilias A.)
- Set MEM_ALIGNMENT to 8 in lib/lwip/u-boot/lwipopts.h. Fixes TFTP
random crashes on TI K3 (Ilias A.)
- net_lwip_rx(): call free_pkt() even when recv() has returned 0,
as required by the driver model documentation (and imx8mp_evk). Fixes
a regression introduced in v9. Goes together with patch [2].
- Add "lwip: tftp: bind to TFTP port only when in server mode" to
fix an issue with interrupted tftp commands (the tftp command hangs
if it is interrupted with Ctrl-C and started again).
- TFTP: fix uninitialized "ret" variable in do_tftpb(); print "Abort"
on Ctrl-C.
- MAINTAINERS: remove README and add sandbox ethernet driver to the
list of maintained files.
- AFAICT, CI should be all good except qemu_xtensa_dc233c which is
broken when NET_LWIP=y (QEMU just hangs with no output). I could
not find or build a suitable GDB binary to debug that.

[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
[2] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
[3] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

Changes in v10:

- Rebase onto next
- URL for lwIP changed in cover letter: using GitHub now since all tags have suddenly disappeared from the repository on gnu.org.
- Post fixes as a separate series [1] or individual patches [2] [3]
- Add "if NET_LWIP" to net/lwip/Kconfig to fix a kconfig warning when doing the full branch build with buildman ("[NEW]")
- net/ is added to libs-y only when NET or NET_LWIP, not NO_NET
- Apply review tags

[1] http://patchwork.ozlabs.org/project/uboot/list/?series=422079
https://lists.denx.de/pipermail/u-boot/2024-September/563904.html
[2] http://patchwork.ozlabs.org/project/uboot/list/?series=421962
[3] http://patchwork.ozlabs.org/project/uboot/list/?series=421959

Changes in v9:

- Rebased onto master, reordered commits to put some fixes that are not strictly related to lwIP first.
- New commit "test/py: test_efi_loader: add missing dependency on cmd_tftpboot" (Tom R.)
- test_efi_loader.py: add missing dependency on cmd_wget (Tom R.)
- wget: fix divide by zero when transfer takes less than 1ms (Tom R.)
- New commit "configs: use syntax CONFIG_FOO=n in tools-only_defconfig" (Tom R.)
- Make TCP_WND configurable (via CONFIG_LWIP_TCP_WND) because a large value is needed for good performance especially with latency but transfers stall in QEMU (-net user) when the value is larger than a few KB (Anton A., offlist)
- Added [TESTING] commits to run CI with NET_LWIP enabled by default except for SANDBOX and platforms that enable PXE, and fixed a number of issues:
* coreboot_defconfig: 'implicit declaration' warnings on ip_checksum_ok() and compute_ip_checksum()
* Fix EFI net tests (bootefi selftest) by adding missing push_packed() call to net_process_received_packet()
* qemu_arm64: fix test_efi_loader.py failures (skip HTTP test by default since it needs a HTTP server; fix a bug in the dhcp command which would not set the "serverip" variable)
* QEMU CI tests for r2dplus_i82557c, r2dplus_rtl8139:
Fixed receive errors due to calling free_pkt() with a length of zero. r2dplus_tulip: fixed "dm_pci_phys_to_bus:
invalid physical address" caused by too late eth_init_rings().
With that the CI status is all GREEN:
https://dev.azure.com/u-boot/u-boot/_build/results?buildId=9225&view=results

Changes in v8:

- Fix bootefi with tftp and wget. It would previously fail with an error message: "No UEFI binary known at 200000". Tested on Raspberry 3B+. Also fix the legacy wget. (Tom R.)
- wget: add "Bytes transferred =" message and accept legacy syntax for better compatibility which also makes it easier to add a test to the test suite
- wget: When no server name or address is supplied, use ${httpserverip} then ${serverip}.
- wget: start the timer used for measuring throughput when the first data block is received. In other words: do not include DNS resolution and TCP connection time in measurement. It gives better numbers ;) but more importantly is how the legacy code works.
- wget: handle non-200 result codes from the server as errors.
- tftp: when no server name or ip is supplied, use ${tftpserverip} then fall back to ${serverip}.
- New commit: "test/py: add HTTP (wget) test"
- New commit: "net: wget: removed unused function wget_success()"
- Change back all !CONFIG_IS_ENABLED(NO_NET) tests to (CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)) since the NO_NET case is wrong when CONFIG_SPL_BUILD or CONFIG_TPL_BUILD is defined (Tom R.)

Changes in v7:

- Rebased onto master
- Updated binary size comparisons in this cover letter. Note that the increase for imx8mp_evk_defconfig was wrong due to a configuration error.

Changes in v6:

- Rebased on next
- "flash: prefix error codes with FL_"
Update drivers/mtd/altera_qspi.c too (Tom R.)
- "net: introduce alternative implementation as net-lwip/" Introduce a "Networking" top-level menu in the main Kconfig. Avoids having a lot of network-related symbols on the first screen of menuconfig. The "Networking stack" choice as well as the applicable symbols (depending on the selected choice) are now all inside this "Networking" menu. (Michal S.)
For PROT_DHCP_LWIP and PROT_DNS_LWIP, use "select" PROT_UDP_LWIP rather than "depends on".
Move NET_RANDOM_ETHADDR to the common ('if NET || NET_LWIP') block. Move SYS_RX_ETH_BUFFER out of 'if NET || NET_LWIP' since it is used unguarded in some code (e.g., am62x_beagleplay_r5) (Tom R.).
- "net: split include/net.h into net{,-common,-legacy,-lwip}.h" Move net_random_ethaddr() to net-common.h.
- "net: eth-uclass: add function eth_start_udev()"
Fix typo and apply Tom R.'s R-b.
- "net-lwip: add DHCP support and dhcp commmand"
Convert !CONFIG_IS_ENABLED(NET) to CONFIG_IS_ENABLED(NO_NET) in board/xilinx/common/board.c to fix an issue with device having no MAC address (thanks Michal S.). Do the same at other places (icore_mx8mp.c, imx8mp_debix_model_a.c, board/ti/am335x/board.c, tiny-printf.c).
Move CMD_MII and CMD_MDIO into 'if NET || NET_LWIP'.
- "net-lwip: add TFTP support and tftpboot command":
Fix help string.
- "net: split cmd/net.c into cmd/net.c and cmd/net-common.c":
Apply Ilias' R-b.
- "net-lwip: add TFTP_BLOCKSIZE"
Apply Ilias' R-b. I moved the TFTP_BLOCKSIZE Kconfig into this commit where it belongs (it was previously in "net" split ... net.h").

Changes in v5:

- Rebased on next
- Refactor Kconfig options to avoid duplicates
- Library functions use a more consistent naming (dhcp_loop(), ping_loop() etc.) and take a struct udevice * parameter (Heinrich S.)
- Do not use net_process_receive_packet() for input anymore. Instead of calling eth_rx() which would invoke net_process_receive_packet(), we call a new net_lwip_rx(udev) function which invokes the device recv() and pushes the packets up the lwIP stack. Thus everything is tied to a udevice now. (Heinrich S.)
- Add "configs: replace '# CONFIG_NET is not set' with CONFIG_NO_NET=y" (Tom R.)
- tftp: unify display with legacy command: add throughput, 65 hashes per line, one every 10 blocks received (Tom R.)
- Moved net-lwip/* to net/lwip/* (Simon G.)
- Rename static function low_level_output() to linkoutput() since it is the name used in the lwIP netif struct.
- Fixed off-by-one in parse_url() which could cause wget to fail when passed a URL with a host name (as opposed to a URL with an IP address).
- Improved TFTP performance by adding support for the blksize option (patches "lwip: tftp: add support of blksize option to client" and "net-lwip: add TFTP_BLOCKSIZE) (Tom R.)
- Add an optional port number to the tftp command for easier testing (syntax: tftp [[ip:[port:]]filename])
- wget: display an "unsupported URI" error if uri is not http://
(Jon H.)
- Adjusted the lwIP TCP options in lib/lwip/u-boot/lwipopts.h for better performance, in particular TCP_WND.
- Add "net: fec_mxc_init(): do not ignore return status of fec_open()"
- Set the proper environment variables when DHCP succeeds (ipaddr%d etc.) and read the proper ones for the given device in new_netif(), allowing correct behavior when several adapters are available (tested on i.MX8M Plus).
- Fix an alignment issue with outgoing packets (see the linkoutput() function). With that the i.MX8M Plus ENET1 interface works properly. (reported by Tim H.).
- Add review tags

Changes in v4:

- Fixed the DHCP algorithm which was missing a sys_timeout() call in the "fine timer" callback. This should close the issue that Tom R. reported with his Raspberry Pi 3 (it does fix it on mine).
- The DHCP exchange timeout is increased from 2 to 10 seconds
- The DHCP exchange can be interrupted with Ctrl-C.
- "net: introduce alternative implementation as net-lwip/": rework dependencies. A few symbols have 'depends on !NET_LWIP' and in addition 'NET_LWIP depends on !SANDBOX'. Sandbox, DSA and fastboot are unsupported, because they are deeply welded to the current stack.
- All network commands (dns, ping, tftp and wget):
* Get rid of global variables (Ilias A.)
* Use printf() rather than log_info()
- "net-lwip: add ping command": use packet count instead of timeout, fix code style (Ilias A.)
- Add "net: split cmd/net.c into cmd/net.c and cmd/net-common.c" extracted from the wget patch (Ilias A.).
- Add "net: split include/net.h into net{,-common,-legacy,-lwip}.h" (Ilias A.)
- Add "flash: prefix error codes with FL_" which is required to avoid name clashes when splitting net.h
- Reworked the initialization of the lwIP stack. One and only one network interface (struct netif) is added for the duration of the command that uses that interface. That's commit "net-lwip:
add DHCP support and dhcp commmand".
- Drop "test: dm: dsa, eth: disable tests when CONFIG_NET_LWIP=y", not needed now that NET_LWIP depend on !SANDBOX.
- qemu_arm64_lwip_defconfig now enables CMD_DNS and CMD_WGET (so that all the supported network commands are available).

Changes in v3:

- Make NET_LWIP a Kconfig choice in patch "net: introduce alternative implementation as net-lwip/" (Tom R.)
- Drop the patch introducing lwIP as a Git subtree and document the git command in the cover letter instead (Tom R.)
- "net-lwip: add TFTP support and tftpboot command": use the same "Bytes transferred =" message as in the legacy implementation (Tom R., Maxim U.)
- Drop "test/py: net: add _lwip variants of dhcp, ping and tftpboot tests" which is not needed anymore.
- Add missing kfree() calls in cmd/net-common.c and fix the parsing of decimal address in net-lwip/wget.c (patch "net-lwip: add wget command") (Maxim U.)
- "net-lwip: add ping command": drop the ICMP payload (Ilias A.). Set the sequence number to zero when entering ping_loop().

Changes in v2:

** Address comments from Ilias A.

- "net-lwip: add wget command"
Implement the wget_with_dns() function to do most of the wget work and call it from do_wget(). This allows to simplify patch "net-lwip: add support for EFI_HTTP_BOOT".

- "net-lwip: import net command from cmd/net.c"
Move a few functions from cmd/net.c to a new file cmd/net-common.c rather than duplicating then in cmd/net-lwip.c.

- "net-lwip: add support for EFI_HTTP_BOOT"
Since wget_with_dns() is now implemented in "net-lwip: add wget command", just enable the wget command when the lwIP stack is enabled and EFI_HTTP_BOOT is requested.

** Address comments from Tom R.

- "net-lwip: add DHCP support and dhcp commmand", "net-lwip: add TFTP support and tftpboot command", "net-lwip: add ping command",
"net-lwip: add dns command",
"net-lwip: add wget command"
Do not introduce new CMD_XXX_LWIP symbols and use existing CMD_XXX instead.

- "configs: add qemu_arm64_lwip_defconfig"
Use #include <configs/qemu_arm64_defconfig>.

- "net-lwip: import lwIP library under lib/lwip"
Patch removed and replaced by the introduction of a Git subtree:
"Squashed 'lib/lwip/lwip/' content from commit 0a0452b2c3".

Note that I have not yet addressed your comments on "test: dm: dsa,
eth: disable tests when CONFIG_NET_LWIP=y"). I need some more time for that and I think running CI on this v2 will help better understand what is needed for v3.

** Miscellaneous improvements

- "net: introduce alternative implementation as net-lwip/":

* Make DFU_OVER_TFTP not DFU_TFTP incompatible with NET_LWIP. It seems quite natural to supplement "depends on NET" with "&& !NET_LWIP".
* Make PROT_*_LWIP not visible by removing the Kconfig prompt.

Jerome Forissier (21):
configs: use syntax CONFIG_FOO=n in tools-only_defconfig
sandbox: add dummy driver ETH_SANDBOX_LWIP
test: boot: fix bootdev_test_any for when DSA_SANDBOX is disabled
test: boot: fix bootflow_cmd_label for when DSA_SANDBOX is disabled
net: introduce alternative implementation as net/lwip/
net: split net into net{,-common,-legacy,-lwip}
net: eth-uclass: add function eth_start_udev()
net: lwip: build lwIP
net: lwip: add DHCP support and dhcp commmand
net: lwip: tftp: bind to TFTP port only when in server mode
net: lwip: add TFTP support and tftpboot command
net: lwip: add ping command
net: lwip: add dns command
net: split cmd/net.c into cmd/net.c and cmd/net-common.c
net: lwip: add wget command
cmd: bdinfo: enable -e when CONFIG_CMD_NET_LWIP=y
configs: add qemu_arm64_lwip_defconfig
net: lwip: tftp: add support of blksize option to client
net: lwip: add TFTP_BLOCKSIZE
CI: add qemu_arm64_lwip to the test matrix
MAINTAINERS: net: lwip: add myself as a maintainer

 .azure-pipelines.yml                          |   7 +
 .gitlab-ci.yml                                |   9 +
 Kconfig                                       |  29 +
 MAINTAINERS                                   |  11 +
 Makefile                                      |   6 +-
 board/engicam/imx8mp/icore_mx8mp.c            |   2 +-
 .../imx8mp_debix_model_a.c                    |   2 +-
 board/ti/am335x/board.c                       |   3 +-
 board/xilinx/common/board.c                   |   3 +-
 boot/Kconfig                                  |   4 +-
 cmd/Kconfig                                   | 140 +--
 cmd/Makefile                                  |   9 +-
 cmd/bdinfo.c                                  |   5 +-
 cmd/elf.c                                     |   2 +-
 cmd/net-common.c                              | 109 ++
 cmd/net-lwip.c                                |  45 +
 cmd/net.c                                     | 115 ---
 common/Kconfig                                |   2 +-
 common/board_r.c                              |   4 +-
 common/spl/Kconfig                            |   1 +
 common/usb_kbd.c                              |   2 +-
 configs/LicheePi_Zero_defconfig               |   2 +-
 configs/M5249EVB_defconfig                    |   2 +-
 configs/am335x_pdu001_defconfig               |   2 +-
 configs/am62ax_evm_r5_defconfig               |   2 +-
 configs/am62px_evm_r5_defconfig               |   2 +-
 configs/am62x_beagleplay_r5_defconfig         |   2 +-
 configs/amcore_defconfig                      |   2 +-
 configs/amd_versal2_mini_defconfig            |   2 +-
 configs/amd_versal2_mini_emmc_defconfig       |   2 +-
 configs/amd_versal2_mini_ospi_defconfig       |   2 +-
 configs/amd_versal2_mini_qspi_defconfig       |   2 +-
 configs/anbernic-rgxx3-rk3566_defconfig       |   2 +-
 configs/ap143_defconfig                       |   2 +-
 configs/ap152_defconfig                       |   2 +-
 configs/apple_m1_defconfig                    |   2 +-
 configs/astro_mcf5373l_defconfig              |   2 +-
 configs/at91sam9rlek_dataflash_defconfig      |   2 +-
 configs/at91sam9rlek_mmc_defconfig            |   2 +-
 configs/at91sam9rlek_nandflash_defconfig      |   2 +-
 configs/bcm7260_defconfig                     |   2 +-
 configs/bcm7445_defconfig                     |   2 +-
 configs/bcm968380gerg_ram_defconfig           |   2 +-
 configs/bcmns_defconfig                       |   2 +-
 configs/chromebook_samus_tpl_defconfig        |   2 +-
 configs/cortina_presidio-asic-base_defconfig  |   2 +-
 configs/cortina_presidio-asic-pnand_defconfig |   2 +-
 configs/durian_defconfig                      |   2 +-
 configs/e850-96_defconfig                     |   2 +-
 configs/ea-lpc3250devkitv2_defconfig          |   2 +-
 configs/efi-x86_app32_defconfig               |   2 +-
 configs/efi-x86_app64_defconfig               |   2 +-
 configs/emsdp_defconfig                       |   2 +-
 configs/evb-px5_defconfig                     |   2 +-
 configs/generic-rk3568_defconfig              |   2 +-
 configs/generic-rk3588_defconfig              |   2 +-
 configs/hc2910_2aghd05_defconfig              |   2 +-
 configs/igep00x0_defconfig                    |   2 +-
 configs/imx6q_bosch_acc_defconfig             |   2 +-
 configs/imx6ulz_smm_m2_defconfig              |   2 +-
 configs/iot_devkit_defconfig                  |   2 +-
 configs/j722s_evm_r5_defconfig                |   2 +-
 configs/legoev3_defconfig                     |   2 +-
 configs/mk808_defconfig                       |   2 +-
 configs/mx23evk_defconfig                     |   2 +-
 configs/mx28evk_defconfig                     |   2 +-
 configs/mx6memcal_defconfig                   |   2 +-
 configs/mx6ulz_14x14_evk_defconfig            |   2 +-
 configs/mx7ulp_com_defconfig                  |   2 +-
 configs/mx7ulp_evk_defconfig                  |   2 +-
 configs/mx7ulp_evk_plugin_defconfig           |   2 +-
 configs/netgear_cg3100d_ram_defconfig         |   2 +-
 configs/nsim_700_defconfig                    |   2 +-
 configs/nsim_700be_defconfig                  |   2 +-
 configs/nsim_hs38be_defconfig                 |   2 +-
 configs/openpiton_riscv64_defconfig           |   2 +-
 configs/openpiton_riscv64_spl_defconfig       |   2 +-
 configs/origen_defconfig                      |   2 +-
 configs/pe2201_defconfig                      |   2 +-
 configs/pinecube_defconfig                    |   2 +-
 configs/pm9261_defconfig                      |   2 +-
 configs/qemu_arm64_lwip_defconfig             |   9 +
 configs/s5p4418_nanopi2_defconfig             |   2 +-
 configs/s5p_goni_defconfig                    |   2 +-
 configs/s5pc210_universal_defconfig           |   2 +-
 configs/sama5d27_giantboard_defconfig         |   2 +-
 configs/sama5d29_curiosity_mmc1_defconfig     |   2 +-
 configs/sama5d29_curiosity_mmc_defconfig      |   2 +-
 .../sama5d29_curiosity_qspiflash_defconfig    |   2 +-
 configs/sama7g54_curiosity_mmc_defconfig      |   2 +-
 .../sama7g54_curiosity_nandflash_defconfig    |   2 +-
 .../sama7g54_curiosity_qspiflash_defconfig    |   2 +-
 configs/sipeed_maix_bitm_defconfig            |   2 +-
 configs/sipeed_maix_smode_defconfig           |   2 +-
 configs/stemmy_defconfig                      |   2 +-
 configs/stm32f429-discovery_defconfig         |   2 +-
 configs/stm32f429-evaluation_defconfig        |   2 +-
 configs/stm32f469-discovery_defconfig         |   2 +-
 configs/stm32h743-disco_defconfig             |   2 +-
 configs/stm32h743-eval_defconfig              |   2 +-
 configs/stm32h750-art-pi_defconfig            |   2 +-
 configs/stm32mp25_defconfig                   |   2 +-
 configs/stmark2_defconfig                     |   2 +-
 configs/th1520_lpi4a_defconfig                |   2 +-
 configs/thunderx_88xx_defconfig               |   2 +-
 configs/tools-only_defconfig                  |  40 +-
 configs/topic_miami_defconfig                 |   2 +-
 configs/topic_miamilite_defconfig             |   2 +-
 configs/topic_miamiplus_defconfig             |   2 +-
 configs/total_compute_defconfig               |   2 +-
 configs/trats2_defconfig                      |   2 +-
 configs/trats_defconfig                       |   2 +-
 configs/xenguest_arm64_defconfig              |   2 +-
 configs/xenguest_arm64_virtio_defconfig       |   2 +-
 configs/xilinx_versal_mini_defconfig          |   2 +-
 configs/xilinx_versal_mini_emmc0_defconfig    |   2 +-
 configs/xilinx_versal_mini_emmc1_defconfig    |   2 +-
 configs/xilinx_versal_mini_ospi_defconfig     |   2 +-
 configs/xilinx_versal_mini_qspi_defconfig     |   2 +-
 configs/xilinx_versal_net_mini_defconfig      |   2 +-
 configs/xilinx_versal_net_mini_emmc_defconfig |   2 +-
 configs/xilinx_versal_net_mini_ospi_defconfig |   2 +-
 configs/xilinx_versal_net_mini_qspi_defconfig |   2 +-
 configs/xilinx_zynqmp_mini_defconfig          |   2 +-
 configs/xilinx_zynqmp_mini_emmc0_defconfig    |   2 +-
 configs/xilinx_zynqmp_mini_emmc1_defconfig    |   2 +-
 configs/xilinx_zynqmp_mini_nand_defconfig     |   2 +-
 .../xilinx_zynqmp_mini_nand_single_defconfig  |   2 +-
 configs/xilinx_zynqmp_mini_qspi_defconfig     |   2 +-
 configs/zynq_cse_nand_defconfig               |   2 +-
 configs/zynq_cse_nor_defconfig                |   2 +-
 configs/zynq_cse_qspi_defconfig               |   2 +-
 drivers/dfu/Kconfig                           |   1 +
 drivers/fastboot/Kconfig                      |   1 +
 drivers/net/Kconfig                           |  16 +-
 drivers/net/Makefile                          |   1 +
 drivers/net/phy/Kconfig                       |   2 +-
 drivers/net/sandbox-lwip.c                    |  85 ++
 drivers/usb/gadget/Kconfig                    |   2 +-
 include/net-common.h                          | 509 ++++++++++
 include/net-legacy.h                          | 541 ++++++++++
 include/net-lwip.h                            |  41 +
 include/net.h                                 | 943 +-----------------
 lib/Makefile                                  |   2 +
 lib/binman.c                                  |   1 +
 lib/lwip/Makefile                             |  55 +
 lib/lwip/lwip/src/apps/tftp/tftp.c            | 104 +-
 .../lwip/src/include/lwip/apps/tftp_client.h  |   1 +
 lib/lwip/u-boot/arch/cc.h                     |  45 +
 lib/lwip/u-boot/arch/sys_arch.h               |   0
 lib/lwip/u-boot/limits.h                      |   0
 lib/lwip/u-boot/lwipopts.h                    | 157 +++
 lib/tiny-printf.c                             |   3 +-
 net/Kconfig                                   |  81 +-
 net/Makefile                                  |  20 +-
 net/eth-uclass.c                              |  38 +-
 net/lwip/Kconfig                              |  49 +
 net/lwip/Makefile                             |   8 +
 net/lwip/dhcp.c                               | 139 +++
 net/lwip/dns.c                                | 127 +++
 net/lwip/eth_internal.h                       |  35 +
 net/lwip/net-lwip.c                           | 305 ++++++
 net/lwip/ping.c                               | 177 ++++
 net/lwip/tftp.c                               | 290 ++++++
 net/lwip/wget.c                               | 357 +++++++
 net/net-common.c                              |  13 +
 net/net.c                                     |  12 -
 test/boot/bootdev.c                           |  11 +-
 test/boot/bootflow.c                          |  12 +-
 test/cmd/Makefile                             |   2 +
 test/dm/Makefile                              |   2 +
 171 files changed, 3626 insertions(+), 1339 deletions(-)
 create mode 100644 cmd/net-common.c
 create mode 100644 cmd/net-lwip.c
 create mode 100644 configs/qemu_arm64_lwip_defconfig
 create mode 100644 drivers/net/sandbox-lwip.c
 create mode 100644 include/net-common.h
 create mode 100644 include/net-legacy.h
 create mode 100644 include/net-lwip.h
 create mode 100644 lib/lwip/Makefile
 create mode 100644 lib/lwip/u-boot/arch/cc.h
 create mode 100644 lib/lwip/u-boot/arch/sys_arch.h
 create mode 100644 lib/lwip/u-boot/limits.h
 create mode 100644 lib/lwip/u-boot/lwipopts.h
 create mode 100644 net/lwip/Kconfig
 create mode 100644 net/lwip/Makefile
 create mode 100644 net/lwip/dhcp.c
 create mode 100644 net/lwip/dns.c
 create mode 100644 net/lwip/eth_internal.h
 create mode 100644 net/lwip/net-lwip.c
 create mode 100644 net/lwip/ping.c
 create mode 100644 net/lwip/tftp.c
 create mode 100644 net/lwip/wget.c
 create mode 100644 net/net-common.c
Signature · 1 line
2.40.1
#1 lore raw

PATCH v12 1/21 configs: use syntax CONFIG_FOO=n in tools-only_defconfig

The tools-only defconfig causes troubles on MacOSX due to the default C compiler being Clang (LLVM) rather than GCC and more specifically due to [1]. Therefore replace "# CONFIG_FOO is not set" with the equivalent "CONFIG_FOO=n" using the following command:

 $ sed -i -e 's/# \(CONFIG_[^ ]*\) is not set/\1=n/' \
       configs/tools-only_defconfig

This fixes the tools_only_macOS CI job on GitHub [2].

[1] https://github.com/llvm/llvm-project/issues/78778
[2] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=9105&view=results

---
 configs/tools-only_defconfig | 40 ++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 13 deletions(-)
configs/tools-only_defconfig +27 -13
index 5a08563bec1..29554be7a65 100644
@@ -4,27 +4,27 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_SYS_LOAD_ADDR=0x0
 CONFIG_PCI=y
-# CONFIG_SANDBOX_SDL is not set
-# CONFIG_EFI_LOADER is not set
+CONFIG_SANDBOX_SDL=n
+CONFIG_EFI_LOADER=n
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_TIMESTAMP=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
-# CONFIG_BOOTSTD_FULL is not set
-# CONFIG_BOOTMETH_CROS is not set
-# CONFIG_BOOTMETH_VBE is not set
+CONFIG_BOOTSTD_FULL=n
+CONFIG_BOOTMETH_CROS=n
+CONFIG_BOOTMETH_VBE=n
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="run distro_bootcmd"
-# CONFIG_CMD_BOOTD is not set
-# CONFIG_CMD_BOOTM is not set
-# CONFIG_CMD_BOOTI is not set
-# CONFIG_CMD_ELF is not set
-# CONFIG_CMD_EXTENSION is not set
-# CONFIG_CMD_DATE is not set
+CONFIG_CMD_BOOTD=n
+CONFIG_CMD_BOOTM=n
+CONFIG_CMD_BOOTI=n
+CONFIG_CMD_ELF=n
+CONFIG_CMD_EXTENSION=n
+CONFIG_CMD_DATE=n
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
-# CONFIG_ACPIGEN is not set
+CONFIG_NET=n
+CONFIG_ACPIGEN=n
 CONFIG_AXI=y
 CONFIG_AXI_SANDBOX=y
 CONFIG_SANDBOX_GPIO=y
@@ -33,8 +33,22 @@ CONFIG_DM_RTC=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_TIMER=y
+<<<<<<< HEAD
 # CONFIG_VIRTIO_MMIO is not set
 # CONFIG_VIRTIO_PCI is not set
 # CONFIG_VIRTIO_SANDBOX is not set
 # CONFIG_GENERATE_ACPI_TABLE is not set
+||||||| parent of 7b58f8ee778 (configs: use syntax CONFIG_FOO=n in tools-only_defconfig)
+# CONFIG_VIRTIO_MMIO is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_SANDBOX is not set
+# CONFIG_GENERATE_ACPI_TABLE is not set
+# CONFIG_EFI_LOADER is not set
+=======
+CONFIG_VIRTIO_MMIO=n
+CONFIG_VIRTIO_PCI=n
+CONFIG_VIRTIO_SANDBOX=n
+CONFIG_GENERATE_ACPI_TABLE=n
+CONFIG_EFI_LOADER=n
+>>>>>>> 7b58f8ee778 (configs: use syntax CONFIG_FOO=n in tools-only_defconfig)
 CONFIG_TOOLS_MKEFICAPSULE=y
Signature · 1 line
2.40.1
#2 lore raw

PATCH v12 2/21 sandbox: add dummy driver ETH_SANDBOX_LWIP

In reply to Jerome Forissier

Introduce ETH_SANDBOX_LWIP which enables a mock driver similar to ETH_SANDOX but without the dependencies on the legacy network stack (NET) so that it may be enabled when the lwIP stack (NET_LWIP) is introduced. The driver does nothing at this stage but its presence will allow dm_test_iommu_noiommu [1] to pass.

[1] ./u-boot -T -c "ut dm dm_test_iommu_noiommu"

---
 drivers/net/Kconfig        | 11 +++++
 drivers/net/Makefile       |  1 +
 drivers/net/sandbox-lwip.c | 85 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 drivers/net/sandbox-lwip.c
drivers/net/Kconfig +11 -0
index e7d0ddfe25a..2f39ec05ac7 100644
@@ -350,6 +350,17 @@ config ETH_SANDBOX
 
 	  This driver is particularly useful in the test/dm/eth.c tests
 
+config ETH_SANDBOX_LWIP
+	depends on SANDBOX
+	depends on NET_LWIP
+	default y
+	bool "Sandbox: Mocked Ethernet driver (for NET_LWIP)"
+	help
+	  This driver is meant as a replacement for ETH_SANDBOX when
+	  the network stack is NET_LWIP rather than NET. It currently
+	  does nothing, i.e. it drops the sent packets and never receives
+	  data.
+
 config ETH_SANDBOX_RAW
 	depends on SANDBOX
 	default y
drivers/net/Makefile +1 -0
index 4946a63f80f..f5ab1f5dedf 100644
@@ -39,6 +39,7 @@ obj-$(CONFIG_ETH_DESIGNWARE_SOCFPGA) += dwmac_socfpga.o
 obj-$(CONFIG_ETH_SANDBOX) += sandbox.o
 obj-$(CONFIG_ETH_SANDBOX_RAW) += sandbox-raw-bus.o
 obj-$(CONFIG_ETH_SANDBOX_RAW) += sandbox-raw.o
+obj-$(CONFIG_ETH_SANDBOX_LWIP) += sandbox-lwip.o
 obj-$(CONFIG_FEC_MXC) += fec_mxc.o
 obj-$(CONFIG_FMAN_ENET) += fm/
 obj-$(CONFIG_FMAN_ENET) += fsl_mdio.o
drivers/net/sandbox-lwip.c new file +85 -0

85 lines not on this page · raw message

Signature · 1 line
2.40.1
#3 lore raw

PATCH v12 3/21 test: boot: fix bootdev_test_any for when DSA_SANDBOX is disabled

In reply to Jerome Forissier

When DSA_SANDBOX is not set, the sandbox tests fail as follows:

 $ ./test/py/test.py --build-dir=$(pwd) -k bootdev_test_any
 [...]
 Test: bootdev_test_any: bootdev.c
 test/boot/bootdev.c:156, bootdev_test_any(): "mmc2" = media->name: Expected "mmc2", got "mmc0"
 [...]

This is due to the device list containing two less entries than expected. Therefore, adjust the expected index to be two less when DSA_SANDBOX is disabled.

The actual use case is NET_LWIP=y (to be introduced in later patches) which implies DSA_SANDBOX=n for the time being.

---
 test/boot/bootdev.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
test/boot/bootdev.c +10 -1
index c635d06ec25..369105ca4cf 100644
@@ -128,6 +128,7 @@ BOOTSTD_TEST(bootdev_test_labels, UTF_DM | UTF_SCAN_FDT | UTF_ETH_BOOTDEV);
 static int bootdev_test_any(struct unit_test_state *uts)
 {
 	struct udevice *dev, *media;
+	char *seq;
 	int mflags;
 
 	/*
@@ -147,8 +148,16 @@ static int bootdev_test_any(struct unit_test_state *uts)
 	 * 8   [   ]      OK  mmc       mmc2.bootdev
 	 * 9   [ + ]      OK  mmc       mmc1.bootdev
 	 * a   [   ]      OK  mmc       mmc0.bootdev
+	 *
+	 * However if DSA_SANDBOX is disabled the dsa-test@{0,1} devices
+	 * are not there.
 	 */
-	ut_assertok(bootdev_find_by_any("8", &dev, &mflags));
+	if (CONFIG_IS_ENABLED(DSA_SANDBOX))
+		seq = "8";
+	else
+		seq = "6";
+
+	ut_assertok(bootdev_find_by_any(seq, &dev, &mflags));
 	ut_asserteq(UCLASS_BOOTDEV, device_get_uclass_id(dev));
 	ut_asserteq(BOOTFLOW_METHF_SINGLE_DEV, mflags);
 	media = dev_get_parent(dev);
Signature · 1 line
2.40.1
#4 lore raw

PATCH v12 4/21 test: boot: fix bootflow_cmd_label for when DSA_SANDBOX is disabled

In reply to Jerome Forissier

When DSA_SANDBOX is not set, the sandbox tests fail as follows:

 $ ./test/py/test.py --build-dir=$(pwd) -k bootdev_test_any
 [...]
 Scanning for bootflows with label '9'
 [...]
 Cannot find '9' (err=-19)

This is due to the device list containing two less entries than expected. Therefore, look for label '7' when DSA_SANDBOX is disabled.

The actual use case is NET_LWIP=y (to be introduced in later patches) which implies DSA_SANDBOX=n for the time being.

---
 test/boot/bootflow.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
test/boot/bootflow.c +10 -2
index 6ad63afe90a..154dea70a59 100644
@@ -109,9 +109,17 @@ static int bootflow_cmd_label(struct unit_test_state *uts)
 	 * 8   [   ]      OK  mmc       mmc2.bootdev
 	 * 9   [ + ]      OK  mmc       mmc1.bootdev
 	 * a   [   ]      OK  mmc       mmc0.bootdev
+	 *
+	 * However with CONFIG_DSA_SANDBOX=n we have two fewer (dsa-test@0 and
+	 * dsa-test@1).
 	 */
-	ut_assertok(run_command("bootflow scan -lH 9", 0));
-	ut_assert_nextline("Scanning for bootflows with label '9'");
+	if (CONFIG_IS_ENABLED(DSA_SANDBOX)) {
+		ut_assertok(run_command("bootflow scan -lH 9", 0));
+		ut_assert_nextline("Scanning for bootflows with label '9'");
+	} else {
+		ut_assertok(run_command("bootflow scan -lH 7", 0));
+		ut_assert_nextline("Scanning for bootflows with label '7'");
+	}
 	ut_assert_skip_to_line("(1 bootflow, 1 valid)");
 
 	ut_assertok(run_command("bootflow scan -lH 0", 0));
Signature · 1 line
2.40.1
#8 lore raw

PATCH v12 7/21 net: eth-uclass: add function eth_start_udev()

In reply to Jerome Forissier

Add a function to start a given network device, and update eth_init() to use it.

---
 include/net-common.h |  1 +
 net/eth-uclass.c     | 38 +++++++++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 13 deletions(-)
include/net-common.h +1 -0
index 543f528a4a4..6bc76658d9d 100644
@@ -192,6 +192,7 @@ int eth_env_set_enetaddr_by_index(const char *base_name, int index,
 int usb_ether_init(void);
 
 int eth_init(void);			/* Initialize the device */
+int eth_start_udev(struct udevice *dev); /* ->start() if not already running */
 int eth_send(void *packet, int length);	   /* Send a packet */
 #if defined(CONFIG_API) || defined(CONFIG_EFI_LOADER)
 int eth_receive(void *packet, int length); /* Receive a packet*/
net/eth-uclass.c +25 -13
index e34d7af0229..5555f82f23e 100644
@@ -284,6 +284,27 @@ static int on_ethaddr(const char *name, const char *value, enum env_op op,
 }
 U_BOOT_ENV_CALLBACK(ethaddr, on_ethaddr);
 
+int eth_start_udev(struct udevice *dev)
+{
+	struct eth_device_priv *priv = dev_get_uclass_priv(dev);
+	int ret;
+
+	if (priv->running)
+		return 0;
+
+	if (!device_active(dev))
+		return -EINVAL;
+
+	ret = eth_get_ops(dev)->start(dev);
+	if (ret < 0)
+		return ret;
+
+	priv->state = ETH_STATE_ACTIVE;
+	priv->running = true;
+
+	return 0;
+}
+
 int eth_init(void)
 {
 	struct udevice *current = NULL;
@@ -328,20 +349,11 @@ int eth_init(void)
 		if (current) {
 			debug("Trying %s\n", current->name);
 
-			if (device_active(current)) {
-				ret = eth_get_ops(current)->start(current);
-				if (ret >= 0) {
-					struct eth_device_priv *priv =
-						dev_get_uclass_priv(current);
-
-					priv->state = ETH_STATE_ACTIVE;
-					priv->running = true;
-					ret = 0;
-					goto end;
-				}
-			} else {
+			ret = eth_start_udev(current);
+			if (ret < 0)
 				ret = eth_errno;
-			}
+			else
+				break;
 
 			debug("FAIL\n");
 		} else {
Signature · 1 line
2.40.1
#7 lore raw

PATCH v12 6/21 net: split net into net{,-common,-legacy,-lwip}

In reply to Jerome Forissier

Make net.h a wrapper which includes net-common.h and either net-legacy.h or net-lwip.h based on NET_LWIP. The function copy_filename() can be useful when NET_LWIP is enabled, therefore move it out of net/net.c which is built only when networking choice is NET and create a new file net/net-common.c.

---
 Makefile             |   4 +-
 include/net-common.h | 501 +++++++++++++++++++++++
 include/net-legacy.h | 544 +++++++++++++++++++++++++
 include/net-lwip.h   |  14 +
 include/net.h        | 943 +------------------------------------------
 net/Makefile         |   2 +
 net/net-common.c     |  13 +
 net/net.c            |  12 -
 8 files changed, 1081 insertions(+), 952 deletions(-)
 create mode 100644 include/net-common.h
 create mode 100644 include/net-legacy.h
 create mode 100644 include/net-lwip.h
 create mode 100644 net/net-common.c
Makefile +3 -1
index 75344ade751..935eaf605c6 100644
@@ -836,7 +836,9 @@ UBOOTINCLUDE    := \
 			-I$(srctree)/arch/arm/thumb1/include)) \
 	-I$(srctree)/arch/$(ARCH)/include \
 	-include $(srctree)/include/linux/kconfig.h \
-	-I$(srctree)/dts/upstream/include
+	-I$(srctree)/dts/upstream/include \
+	$(if $(CONFIG_NET_LWIP), -I$(srctree)/lib/lwip/lwip/src/include \
+		-I$(srctree)/lib/lwip/u-boot)
 
 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
 
include/net-common.h new file +501 -0

501 lines not on this page · raw message

include/net-legacy.h new file +544 -0

544 lines not on this page · raw message

include/net-lwip.h new file +14 -0
new file mode 100644
index 00000000000..5c3f9e7e86c
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __NET_LWIP_H__
+#define __NET_LWIP_H__
+
+#include <lwip/ip4.h>
+#include <lwip/netif.h>
+
+struct netif *net_lwip_new_netif(struct udevice *udev);
+struct netif *net_lwip_new_netif_noip(struct udevice *udev);
+void net_lwip_remove_netif(struct netif *netif);
+struct netif *net_lwip_get_netif(void);
+
+#endif /* __NET_LWIP_H__ */
include/net.h +4 -939

953 lines not on this page · raw message

net/Makefile +2 -0
index 70eec8caf0d..a9cecee637a 100644
@@ -42,3 +42,5 @@ obj-$(CONFIG_CMD_WGET) += wget.o
 CFLAGS_eth_common.o += -Wno-format-extra-args
 
 endif
+
+obj-y += net-common.o
net/net-common.c new file +13 -0
new file mode 100644
index 00000000000..a7f767d5e9c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0
+
+void copy_filename(char *dst, const char *src, int size)
+{
+	if (src && *src && (*src == '"')) {
+		++src;
+		--size;
+	}
+
+	while ((--size > 0) && src && *src && (*src != '"'))
+		*dst++ = *src++;
+	*dst = '\0';
+}
net/net.c +0 -12
index 1e0b7c85624..c1d10a77b9e 100644
@@ -1689,18 +1689,6 @@ void net_set_udp_header(uchar *pkt, struct in_addr dest, int dport, int sport,
 	ip->udp_xsum = 0;
 }
 
-void copy_filename(char *dst, const char *src, int size)
-{
-	if (src && *src && (*src == '"')) {
-		++src;
-		--size;
-	}
-
-	while ((--size > 0) && src && *src && (*src != '"'))
-		*dst++ = *src++;
-	*dst = '\0';
-}
-
 int is_serverip_in_cmd(void)
 {
 	return !!strchr(net_boot_file_name, ':');
Signature · 1 line
2.40.1
#9 lore raw

PATCH v12 8/21 net: lwip: build lwIP

In reply to Jerome Forissier

Build the lwIP library when NET_LWIP is enabled. The following files are adaptation layers written specially for U-Boot:

lib/lwip/u-boot/arch/cc.h
lib/lwip/u-boot/arch/sys_arch.h (empty)
lib/lwip/u-boot/limits.h (empty)
lib/lwip/u-boot/lwipopts.h

They were initially contributed by Maxim in a previous RFC patch series.

The lwIP stack needs to be added as a Git subtree with the following command:

 $ git subtree add --squash --prefix lib/lwip/lwip \
   https://github.com/lwip-tcpip/lwip.git  STABLE-2_2_0_RELEASE
---
 lib/Makefile                    |   2 +
 lib/lwip/Makefile               |  55 +++++++++++
 lib/lwip/u-boot/arch/cc.h       |  45 +++++++++
 lib/lwip/u-boot/arch/sys_arch.h |   0
 lib/lwip/u-boot/limits.h        |   0
 lib/lwip/u-boot/lwipopts.h      | 157 ++++++++++++++++++++++++++++++++
 6 files changed, 259 insertions(+)
 create mode 100644 lib/lwip/Makefile
 create mode 100644 lib/lwip/u-boot/arch/cc.h
 create mode 100644 lib/lwip/u-boot/arch/sys_arch.h
 create mode 100644 lib/lwip/u-boot/limits.h
 create mode 100644 lib/lwip/u-boot/lwipopts.h
lib/Makefile +2 -0
index d300249f57c..00bfd11002a 100644
@@ -96,6 +96,8 @@ obj-$(CONFIG_LIBAVB) += libavb/
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += libfdt/
 obj-$(CONFIG_$(SPL_TPL_)OF_REAL) += fdtdec_common.o fdtdec.o
 
+obj-$(CONFIG_NET_LWIP) += lwip/
+
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16-ccitt.o
 obj-$(CONFIG_$(SPL_TPL_)HASH) += crc16-ccitt.o
lib/lwip/Makefile new file +55 -0

55 lines not on this page · raw message

lib/lwip/u-boot/arch/cc.h new file +45 -0

45 lines not on this page · raw message

lib/lwip/u-boot/arch/sys_arch.h new file +0 -0
new file mode 100644
index 00000000000..e69de29bb2d
lib/lwip/u-boot/limits.h new file +0 -0
new file mode 100644
index 00000000000..e69de29bb2d
lib/lwip/u-boot/lwipopts.h new file +157 -0

157 lines not on this page · raw message

Signature · 1 line
2.40.1
#12 lore raw

PATCH v12 10/21 net: lwip: tftp: bind to TFTP port only when in server mode

In reply to Jerome Forissier

The TFTP app should not bind to the TFTP server port when configured as a client. Instead, the local port should be chosen from the dynamic range (49152 ~ 65535) so that if the application is stopped and started again, the remote server will not consider the new packets as part of the same context (which would cause an error since a new RRQ would be unexpected).

Submitted upstream: https://savannah.nongnu.org/patch/?10480

---
 lib/lwip/lwip/src/apps/tftp/tftp.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
lib/lwip/lwip/src/apps/tftp/tftp.c +6 -4
index ddfdbfc0c1b..74fc1fbe586 100644
@@ -454,10 +454,12 @@ tftp_init_common(u8_t mode, const struct tftp_context *ctx)
     return ERR_MEM;
   }
 
-  ret = udp_bind(pcb, IP_ANY_TYPE, TFTP_PORT);
-  if (ret != ERR_OK) {
-    udp_remove(pcb);
-    return ret;
+  if (mode == LWIP_TFTP_MODE_SERVER) {
+    ret = udp_bind(pcb, IP_ANY_TYPE, TFTP_PORT);
+    if (ret != ERR_OK) {
+      udp_remove(pcb);
+      return ret;
+    }
   }
 
   tftp_state.handle    = NULL;
Signature · 1 line
2.40.1
#13 lore raw

PATCH v12 11/21 net: lwip: add TFTP support and tftpboot command

In reply to Jerome Forissier

Implement do_tftpb(). This implementation of the tftp command supports an optional port number. For example:

tftp 192.168.0.30:9069:file.bin

It also supports taking the server IP from ${tftpserverip} if defined, before falling back to ${serverip}.

---
 cmd/Kconfig          |   3 +-
 cmd/net-lwip.c       |   8 ++
 include/net-common.h |   4 +
 include/net-lwip.h   |   4 +
 lib/binman.c         |   1 +
 net/lwip/dhcp.c      |  11 +-
 net/lwip/net-lwip.c  |  16 +++
 net/lwip/tftp.c      | 283 ++++++++++++++++++++++++++++++++++++++++++-
 8 files changed, 324 insertions(+), 6 deletions(-)
cmd/Kconfig +1 -2
index fec679df402..01b884f6f59 100644
@@ -2125,10 +2125,9 @@ config CMD_MDIO
 config CMD_TFTPBOOT
 	bool "tftp"
 	select PROT_UDP_LWIP if NET_LWIP
-	default n
+	default y
 	help
 	  tftpboot - load file via network using TFTP protocol
-	  Currently a placeholder (not implemented) when NET_LWIP=y.
 
 endif  # if CMD_NET
 
cmd/net-lwip.c +8 -0
index 82edb5fd2e6..80f0872bb8f 100644
@@ -11,3 +11,11 @@ U_BOOT_CMD(
         "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 #endif
+
+#if defined(CONFIG_CMD_TFTPBOOT)
+U_BOOT_CMD(
+	tftpboot,	3,	0,	do_tftpb,
+	"boot image via network using TFTP protocol\n",
+	"[loadAddress] [[hostIPaddr:]bootfilename]"
+);
+#endif
include/net-common.h +4 -0
index cbcac178c82..fd7c5e7b488 100644
@@ -459,6 +459,10 @@ static inline struct in_addr env_get_ip(char *var)
 
 int net_init(void);
 
+/* NET compatibility */
+enum proto_t;
+int net_loop(enum proto_t protocol);
+
 /**
  * dhcp_run() - Run DHCP on the current ethernet device
  *
include/net-lwip.h +4 -0
index cfd06726577..37744b0e2cd 100644
@@ -6,6 +6,10 @@
 #include <lwip/ip4.h>
 #include <lwip/netif.h>
 
+enum proto_t {
+	TFTPGET
+};
+
 struct netif *net_lwip_new_netif(struct udevice *udev);
 struct netif *net_lwip_new_netif_noip(struct udevice *udev);
 void net_lwip_remove_netif(struct netif *netif);
lib/binman.c +1 -0
index 9047f5275f3..93d85548116 100644
@@ -137,6 +137,7 @@ int binman_init(void)
 {
 	int ret;
 
+	return 0;
 	binman = malloc(sizeof(struct binman_info));
 	if (!binman)
 		return log_msg_ret("space for binman", -ENOMEM);
net/lwip/dhcp.c +10 -1
index a2cc25d88f5..23b56226921 100644
@@ -119,11 +119,20 @@ int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 int dhcp_run(ulong addr, const char *fname, bool autoload)
 {
 	char *dhcp_argv[] = {"dhcp", NULL, };
+#ifdef CONFIG_CMD_TFTPBOOT
+	char *tftp_argv[] = {"tftpboot", boot_file_name, NULL, };
+#endif
 	struct cmd_tbl cmdtp = {};	/* dummy */
 
 	if (autoload) {
-		/* Will be supported when TFTP is added */
+#ifdef CONFIG_CMD_TFTPBOOT
+		/* Assume DHCP was already performed */
+		if (boot_file_name[0])
+			return do_tftpb(&cmdtp, 0, 2, tftp_argv);
+		return 0;
+#else
 		return -EOPNOTSUPP;
+#endif
 	}
 
 	return do_dhcp(&cmdtp, 0, 1, dhcp_argv);
net/lwip/net-lwip.c +16 -0
index 3b08ffe3b74..5c2bb2e0361 100644
@@ -28,6 +28,7 @@ const u8 net_bcast_ethaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 char *pxelinux_configfile;
 /* Our IP addr (0 = unknown) */
 struct in_addr	net_ip;
+char net_boot_file_name[1024];
 
 static err_t linkoutput(struct netif *netif, struct pbuf *p)
 {
@@ -283,6 +284,21 @@ void net_process_received_packet(uchar *in_packet, int len)
 #endif
 }
 
+int net_loop(enum proto_t protocol)
+{
+	char *argv[1];
+
+	switch (protocol) {
+	case TFTPGET:
+		argv[0] = "tftpboot";
+		return do_tftpb(NULL, 0, 1, argv);
+	default:
+		return -EINVAL;
+	}
+
+	return -EINVAL;
+}
+
 u32_t sys_now(void)
 {
 	return get_timer(0);
net/lwip/tftp.c +280 -3

290 lines not on this page · raw message

Signature · 1 line
2.40.1
#14 lore raw

PATCH v12 12/21 net: lwip: add ping command

In reply to Jerome Forissier

Add support for the the ping command with NET_LWIP. The implementation is derived from lwIP's contrib/apps/ping/ping.c.

---
 cmd/Kconfig        |  11 +--
 cmd/net-lwip.c     |   8 ++
 include/net-lwip.h |   1 +
 net/lwip/Makefile  |   1 +
 net/lwip/ping.c    | 177 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 193 insertions(+), 5 deletions(-)
 create mode 100644 net/lwip/ping.c
cmd/Kconfig +6 -5
index 01b884f6f59..132835e43f8 100644
@@ -2024,11 +2024,6 @@ config CMD_WGET
 	  wget is a simple command to download kernel, or other files,
 	  from a http server over TCP.
 
-config CMD_PING
-	bool "ping"
-	help
-	  Send ICMP ECHO_REQUEST to network host
-
 config CMD_PING6
 	bool "ping6"
 	depends on IPV6
@@ -2122,6 +2117,12 @@ config CMD_MDIO
 	  The MDIO interface is orthogonal to the MII interface and extends
 	  it by adding access to more registers through indirect addressing.
 
+config CMD_PING
+	bool "ping"
+	select PROT_RAW_LWIP if NET_LWIP
+	help
+	  Send ICMP ECHO_REQUEST to network host
+
 config CMD_TFTPBOOT
 	bool "tftp"
 	select PROT_UDP_LWIP if NET_LWIP
cmd/net-lwip.c +8 -0
index 80f0872bb8f..feed719beef 100644
@@ -12,6 +12,14 @@ U_BOOT_CMD(
 );
 #endif
 
+#if defined(CONFIG_CMD_PING)
+U_BOOT_CMD(
+	ping,	2,	1,	do_ping,
+	"send ICMP ECHO_REQUEST to network host",
+	"pingAddress"
+);
+#endif
+
 #if defined(CONFIG_CMD_TFTPBOOT)
 U_BOOT_CMD(
 	tftpboot,	3,	0,	do_tftpb,
include/net-lwip.h +1 -0
index 37744b0e2cd..9aa371e962c 100644
@@ -17,5 +17,6 @@ struct netif *net_lwip_get_netif(void);
 int net_lwip_rx(struct udevice *udev, struct netif *netif);
 
 int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
+int do_ping(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 
 #endif /* __NET_LWIP_H__ */
net/lwip/Makefile +1 -0
index 4e92a101ddb..b5af37a9b18 100644
@@ -2,4 +2,5 @@ ccflags-y += -I$(srctree)/lib/lwip/lwip/src/include -I$(srctree)/lib/lwip/u-boot
 
 obj-$(CONFIG_$(SPL_)DM_ETH) += net-lwip.o
 obj-$(CONFIG_CMD_DHCP) += dhcp.o
+obj-$(CONFIG_CMD_PING) += ping.o
 obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
net/lwip/ping.c new file +177 -0

177 lines not on this page · raw message

Signature · 1 line
2.40.1
#16 lore raw

PATCH v12 13/21 net: lwip: add dns command

In reply to Jerome Forissier

Add CMD_DNS when NET_LWIP is enabled to provide the dns command using lwIP.

---
 cmd/Kconfig        |  11 ++--
 cmd/net-lwip.c     |   8 +++
 include/net-lwip.h |   1 +
 net/lwip/Makefile  |   1 +
 net/lwip/dns.c     | 127 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 143 insertions(+), 5 deletions(-)
 create mode 100644 net/lwip/dns.c
cmd/Kconfig +6 -5
index 132835e43f8..6a3920a162b 100644
@@ -2042,11 +2042,6 @@ config CMD_SNTP
 	help
 	  Synchronize RTC via network
 
-config CMD_DNS
-	bool "dns"
-	help
-	  Lookup the IP of a hostname
-
 config CMD_LINK_LOCAL
 	bool "linklocal"
 	select LIB_RAND
@@ -2094,6 +2089,12 @@ config CMD_DHCP
 	help
 	  Boot image via network using DHCP/TFTP protocol
 
+config CMD_DNS
+	bool "dns"
+	select PROT_DNS_LWIP if NET_LWIP
+	help
+	  Lookup the IP of a hostname
+
 config CMD_MII
 	bool "mii"
 	imply CMD_MDIO
cmd/net-lwip.c +8 -0
index feed719beef..c021da6a674 100644
@@ -27,3 +27,11 @@ U_BOOT_CMD(
 	"[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 #endif
+
+#if defined(CONFIG_CMD_DNS)
+U_BOOT_CMD(
+	dns,	3,	1,	do_dns,
+	"lookup the IP of a hostname",
+	"hostname [envvar]"
+);
+#endif
include/net-lwip.h +1 -0
index 9aa371e962c..ff9d03b23e8 100644
@@ -17,6 +17,7 @@ struct netif *net_lwip_get_netif(void);
 int net_lwip_rx(struct udevice *udev, struct netif *netif);
 
 int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
+int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ping(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 
 #endif /* __NET_LWIP_H__ */
net/lwip/Makefile +1 -0
index b5af37a9b18..645d8a8c457 100644
@@ -2,5 +2,6 @@ ccflags-y += -I$(srctree)/lib/lwip/lwip/src/include -I$(srctree)/lib/lwip/u-boot
 
 obj-$(CONFIG_$(SPL_)DM_ETH) += net-lwip.o
 obj-$(CONFIG_CMD_DHCP) += dhcp.o
+obj-$(CONFIG_CMD_DNS) += dns.o
 obj-$(CONFIG_CMD_PING) += ping.o
 obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
net/lwip/dns.c new file +127 -0

127 lines not on this page · raw message

Signature · 1 line
2.40.1
#18 lore raw

PATCH v12 14/21 net: split cmd/net.c into cmd/net.c and cmd/net-common.c

In reply to Jerome Forissier

Extract some code from cmd/net.c that will be useful in a subsequent commit to implement wget with NET_LWIP.

---
 cmd/Makefile     |   5 ++-
 cmd/net-common.c | 109 ++++++++++++++++++++++++++++++++++++++++++++
 cmd/net.c        | 115 -----------------------------------------------
 3 files changed, 113 insertions(+), 116 deletions(-)
 create mode 100644 cmd/net-common.c
cmd/Makefile +4 -1
index 1c8cc42503d..75e85feb017 100644
@@ -130,7 +130,10 @@ obj-$(CONFIG_CMD_NAND) += nand.o
 ifdef CONFIG_CMD_NET
 obj-$(CONFIG_NET) += net.o
 obj-$(CONFIG_NET_LWIP) += net-lwip.o
-CFLAGS_net-lwip.o := -I$(srctree)/lib/lwip/lwip/src/include -I$(srctree)/lib/lwip/u-boot
+obj-$(filter y,$(CONFIG_CMD_NET) $(CONFIG_CMD_NET_LWIP)) += net-common.o
+lwip-includes := -I$(srctree)/lib/lwip/lwip/src/include -I$(srctree)/lib/lwip/u-boot
+CFLAGS_net-lwip.o := $(lwip-includes)
+CFLAGS_net-common.o := $(lwip-includes)
 endif
 obj-$(CONFIG_ENV_SUPPORT) += nvedit.o
 obj-$(CONFIG_CMD_NVEDIT_EFI) += nvedit_efi.o
cmd/net-common.c new file +109 -0

109 lines not on this page · raw message

cmd/net.c +0 -115

118 lines not on this page · raw message

Signature · 1 line
2.40.1
#19 lore raw

PATCH v12 15/21 net: lwip: add wget command

In reply to Jerome Forissier

Add support for the wget command with NET_LWIP. The command normally expects a URL: wget [loadaddr] url, but it also accepts the legacy
syntax: wget [loadaddr] [server:]file.
The server IP may alternatively be supplied via ${httpserverip} which has higher priority than ${serverip}.

Based on code initially developed by Maxim U.

---
 cmd/Kconfig        |  18 ++-
 cmd/net-lwip.c     |   8 +
 include/net-lwip.h |  18 +++
 net/lwip/Makefile  |   1 +
 net/lwip/wget.c    | 357 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 394 insertions(+), 8 deletions(-)
 create mode 100644 net/lwip/wget.c
cmd/Kconfig +10 -8
index 6a3920a162b..0e1f0ce1adc 100644
@@ -2016,14 +2016,6 @@ config SYS_DISABLE_AUTOLOAD
 	  is complete.  Enable this option to disable this behavior and instead
 	  require files to be loaded over the network by subsequent commands.
 
-config CMD_WGET
-	bool "wget"
-	select PROT_TCP
-	default y if SANDBOX
-	help
-	  wget is a simple command to download kernel, or other files,
-	  from a http server over TCP.
-
 config CMD_PING6
 	bool "ping6"
 	depends on IPV6
@@ -2131,6 +2123,16 @@ config CMD_TFTPBOOT
 	help
 	  tftpboot - load file via network using TFTP protocol
 
+config CMD_WGET
+	bool "wget"
+	default y if SANDBOX
+	select PROT_TCP if NET
+	select PROT_TCP_LWIP if NET_LWIP
+	select PROT_DNS_LWIP if NET_LWIP
+	help
+	  wget is a simple command to download kernel, or other files,
+	  from a http server over TCP.
+
 endif  # if CMD_NET
 
 config CMD_PXE
cmd/net-lwip.c +8 -0
index c021da6a674..42f8bd6b259 100644
@@ -35,3 +35,11 @@ U_BOOT_CMD(
 	"hostname [envvar]"
 );
 #endif
+
+#if defined(CONFIG_CMD_WGET)
+U_BOOT_CMD(
+	wget,   3,      1,      do_wget,
+	"boot image via network using HTTP protocol",
+	"[loadAddress] URL"
+);
+#endif
include/net-lwip.h +18 -0
index ff9d03b23e8..1c3583f82a1 100644
@@ -16,8 +16,26 @@ void net_lwip_remove_netif(struct netif *netif);
 struct netif *net_lwip_get_netif(void);
 int net_lwip_rx(struct udevice *udev, struct netif *netif);
 
+/**
+ * wget_with_dns() - runs dns host IP address resulution before wget
+ *
+ * @dst_addr:	destination address to download the file
+ * @uri:	uri string of target file of wget
+ * Return:	downloaded file size, negative if failed
+ */
+
+int wget_with_dns(ulong dst_addr, char *uri);
+/**
+ * wget_validate_uri() - varidate the uri
+ *
+ * @uri:	uri string of target file of wget
+ * Return:	true if uri is valid, false if uri is invalid
+ */
+bool wget_validate_uri(char *uri);
+
 int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ping(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
+int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
 
 #endif /* __NET_LWIP_H__ */
net/lwip/Makefile +1 -0
index 645d8a8c457..f2558f8763a 100644
@@ -5,3 +5,4 @@ obj-$(CONFIG_CMD_DHCP) += dhcp.o
 obj-$(CONFIG_CMD_DNS) += dns.o
 obj-$(CONFIG_CMD_PING) += ping.o
 obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
+obj-$(CONFIG_CMD_WGET) += wget.o
net/lwip/wget.c new file +357 -0

357 lines not on this page · raw message

Signature · 1 line
2.40.1
#21 lore raw

PATCH v12 16/21 cmd: bdinfo: enable -e when CONFIG_CMD_NET_LWIP=y

In reply to Jerome Forissier

Support "bdinfo -e" when lwIP is selected.

---
 cmd/bdinfo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
cmd/bdinfo.c +3 -2
index f6e534dd5bb..4c0e2adabc3 100644
@@ -151,7 +151,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_CMD_NET))
+	if (IS_ENABLED(CONFIG_CMD_NET) || IS_ENABLED(CONFIG_CMD_NET_LWIP))
 		print_eth();
 	bdinfo_print_num_l("fdt_blob", (ulong)map_to_sysmem(gd->fdt_blob));
 	if (IS_ENABLED(CONFIG_VIDEO))
@@ -192,7 +192,8 @@ 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_CMD_NET))
+			if (!IS_ENABLED(CONFIG_CMD_NET) &&
+			    !IS_ENABLED(CONFIG_CMD_NET_LWIP))
 				return CMD_RET_USAGE;
 			print_eth();
 			return CMD_RET_SUCCESS;
Signature · 1 line
2.40.1
#22 lore raw

PATCH v12 17/21 configs: add qemu_arm64_lwip_defconfig

In reply to Jerome Forissier

Add qemu_arm64_lwip_defconfig which #include's qemu_arm64_defconfig and selects NET_LWIP instead of NET. This config has all the supported net commands enabled.

---
 configs/qemu_arm64_lwip_defconfig | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 configs/qemu_arm64_lwip_defconfig
configs/qemu_arm64_lwip_defconfig new file +9 -0
new file mode 100644
index 00000000000..d3d8ef16e66
@@ -0,0 +1,9 @@
+#include <configs/qemu_arm64_defconfig>
+
+CONFIG_ARM=y
+CONFIG_ARCH_QEMU=y
+
+CONFIG_NET_LWIP=y
+CONFIG_CMD_DNS=y
+CONFIG_CMD_WGET=y
+CONFIG_EFI_HTTP_BOOT=y
Signature · 1 line
2.40.1
#23 lore raw

PATCH v12 18/21 net: lwip: tftp: add support of blksize option to client

In reply to Jerome Forissier

The TFTP protocol uses a default block size of 512 bytes. This value is sub-optimal for ethernet devices, which have a MTU (Maximum Transmission Unit) of 1500 bytes. When taking into acount the overhead of the IP and UDP layers, this leaves 1468 bytes for the TFTP payload.

This patch introduces a new function: tftp_client_set_blksize() which may be used to change the block size from the default. It has to be called after tftp_client_init() and before tftp_get(). If the server does not support the option, the client will still accept to receive 512-byte blocks.

Submitted upstream: https://savannah.nongnu.org/patch/index.php?10462

---
 lib/lwip/lwip/src/apps/tftp/tftp.c            | 94 +++++++++++++++++--
 .../lwip/src/include/lwip/apps/tftp_client.h  |  1 +
 2 files changed, 89 insertions(+), 6 deletions(-)
lib/lwip/lwip/src/apps/tftp/tftp.c +88 -6
index 74fc1fbe586..8e0c071772a 100644
@@ -57,7 +57,7 @@
 #include "lwip/timeouts.h"
 #include "lwip/debug.h"
 
-#define TFTP_MAX_PAYLOAD_SIZE 512
+#define TFTP_DEFAULT_BLOCK_SIZE 512
 #define TFTP_HEADER_LENGTH    4
 
 #define TFTP_RRQ   1
@@ -65,6 +65,7 @@
 #define TFTP_DATA  3
 #define TFTP_ACK   4
 #define TFTP_ERROR 5
+#define TFTP_OACK  6
 
 enum tftp_error {
   TFTP_ERROR_FILE_NOT_FOUND    = 1,
@@ -88,9 +89,11 @@ struct tftp_state {
   int timer;
   int last_pkt;
   u16_t blknum;
+  u16_t blksize;
   u8_t retries;
   u8_t mode_write;
   u8_t tftp_mode;
+  bool wait_oack;
 };
 
 static struct tftp_state tftp_state;
@@ -137,10 +140,24 @@ send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname,
 {
   size_t fname_length = strlen(fname)+1;
   size_t mode_length = strlen(mode)+1;
-  struct pbuf* p = init_packet(opcode, 0, fname_length + mode_length - 2);
+  size_t blksize_length = 0;
+  struct pbuf* p;
   char* payload;
   err_t ret;
 
+  if (tftp_state.blksize) {
+    blksize_length = 14; /* maximum (blksize is a u16_t): 'blksize\0XXXXX\0' */
+    if (tftp_state.blksize < 10000)
+	    blksize_length--;
+    if (tftp_state.blksize < 1000)
+	    blksize_length--;
+    if (tftp_state.blksize < 100)
+	    blksize_length--;
+    if (tftp_state.blksize < 10)
+	    blksize_length--;
+  }
+
+  p = init_packet(opcode, 0, fname_length + mode_length + blksize_length - 2);
   if (p == NULL) {
     return ERR_MEM;
   }
@@ -148,7 +165,10 @@ send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname,
   payload = (char*) p->payload;
   MEMCPY(payload+2,              fname, fname_length);
   MEMCPY(payload+2+fname_length, mode,  mode_length);
+  if (tftp_state.blksize)
+    sprintf(payload+2+fname_length+mode_length, "blksize%c%d%c", 0, tftp_state.blksize, 0);
 
+  tftp_state.wait_oack = true;
   ret = udp_sendto(tftp_state.upcb, p, addr, port);
   pbuf_free(p);
   return ret;
@@ -221,14 +241,14 @@ send_data(const ip_addr_t *addr, u16_t port)
     pbuf_free(tftp_state.last_data);
   }
 
-  tftp_state.last_data = init_packet(TFTP_DATA, tftp_state.blknum, TFTP_MAX_PAYLOAD_SIZE);
+  tftp_state.last_data = init_packet(TFTP_DATA, tftp_state.blknum, TFTP_DEFAULT_BLOCK_SIZE);
   if (tftp_state.last_data == NULL) {
     return;
   }
 
   payload = (u16_t *) tftp_state.last_data->payload;
 
-  ret = tftp_state.ctx->read(tftp_state.handle, &payload[2], TFTP_MAX_PAYLOAD_SIZE);
+  ret = tftp_state.ctx->read(tftp_state.handle, &payload[2], TFTP_DEFAULT_BLOCK_SIZE);
   if (ret < 0) {
     send_error(addr, port, TFTP_ERROR_ACCESS_VIOLATION, "Error occurred while reading the file.");
     close_handle();
@@ -239,6 +259,28 @@ send_data(const ip_addr_t *addr, u16_t port)
   resend_data(addr, port);
 }
 
+static u16_t payload_size(void)
+{
+  if (tftp_state.blksize)
+    return tftp_state.blksize;
+  return TFTP_DEFAULT_BLOCK_SIZE;
+}
+
+static const char *
+find_option(struct pbuf *p, const char *option)
+{
+  int i;
+  u16_t optlen = strlen(option);
+  const char *b = p->payload;
+
+  for (i = 0; i + optlen + 1 < p->len; i++) {
+    if (lwip_strnstr(b + i, option, optlen))
+      return b + i + optlen + 2;
+  }
+
+  return NULL;
+}
+
 static void
 tftp_recv(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr, u16_t port)
 {
@@ -338,6 +380,15 @@ tftp_recv(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr
       }
 
       blknum = lwip_ntohs(sbuf[1]);
+      if (tftp_state.blksize && tftp_state.wait_oack) {
+        /*
+         * Data received while we are expecting an OACK for our blksize option.
+         * This means the server doesn't support it, let's switch back to the
+         * default block size.
+         */
+       tftp_state.blksize = 0;
+       tftp_state.wait_oack = false;
+      }
       if (blknum == tftp_state.blknum) {
         pbuf_remove_header(p, TFTP_HEADER_LENGTH);
 
@@ -349,7 +400,7 @@ tftp_recv(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr
           send_ack(addr, port, blknum);
         }
 
-        if (p->tot_len < TFTP_MAX_PAYLOAD_SIZE) {
+        if (p->tot_len < payload_size()) {
           close_handle();
         } else {
           tftp_state.blknum++;
@@ -386,7 +437,7 @@ tftp_recv(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr
       lastpkt = 0;
 
       if (tftp_state.last_data != NULL) {
-        lastpkt = tftp_state.last_data->tot_len != (TFTP_MAX_PAYLOAD_SIZE + TFTP_HEADER_LENGTH);
+        lastpkt = tftp_state.last_data->tot_len != (TFTP_DEFAULT_BLOCK_SIZE + TFTP_HEADER_LENGTH);
       }
 
       if (!lastpkt) {
@@ -405,6 +456,25 @@ tftp_recv(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr
         close_handle();
       }
       break;
+    case PP_HTONS(TFTP_OACK): {
+      const char *optval = find_option(p, "blksize");
+      u16_t srv_blksize = 0;
+      tftp_state.wait_oack = false;
+      if (optval) {
+	if (!tftp_state.blksize) {
+	  /* We did not request this option */
+          send_error(addr, port, TFTP_ERROR_ILLEGAL_OPERATION, "blksize unexpected");
+	}
+	srv_blksize = atoi(optval);
+	if (srv_blksize <= 0 || srv_blksize > tftp_state.blksize) {
+	  send_error(addr, port, TFTP_ERROR_ILLEGAL_OPERATION, "Invalid blksize");
+	}
+	LWIP_DEBUGF(TFTP_DEBUG | LWIP_DBG_STATE, ("tftp: accepting blksize=%d\n", srv_blksize));
+	tftp_state.blksize = srv_blksize;
+      }
+      send_ack(addr, port, 0);
+      break;
+    }
     default:
       send_error(addr, port, TFTP_ERROR_ILLEGAL_OPERATION, "Unknown operation");
       break;
@@ -495,6 +565,18 @@ tftp_init_client(const struct tftp_context *ctx)
   return tftp_init_common(LWIP_TFTP_MODE_CLIENT, ctx);
 }
 
+/** @ingroup tftp
+ * Set the block size to be used by the TFTP client. The server may choose to
+ * accept a lower value.
+ * @param blksize Block size in bytes
+ */
+void
+tftp_client_set_blksize(u16_t blksize)
+{
+  if (blksize != TFTP_DEFAULT_BLOCK_SIZE)
+    tftp_state.blksize = blksize;
+}
+
 /** @ingroup tftp
  * Deinitialize ("turn off") TFTP client/server.
  */
lib/lwip/lwip/src/include/lwip/apps/tftp_client.h +1 -0
index 24dbda6a8c9..e1e21d06b67 100644
@@ -44,6 +44,7 @@ enum tftp_transfer_mode {
 };
 
 err_t tftp_init_client(const struct tftp_context* ctx);
+void tftp_client_set_blksize(u16_t blksize);
 err_t tftp_get(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, enum tftp_transfer_mode mode);
 err_t tftp_put(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, enum tftp_transfer_mode mode);
 
Signature · 1 line
2.40.1
#27 lore raw

PATCH v12 19/21 net: lwip: add TFTP_BLOCKSIZE

In reply to Jerome Forissier

Add support for setting the TFTP block size. The default value (1468) is fine for Ethernet and allows a better throughput than the TFTP default (512), if the server supports the blksize option of course.

I tested this change with qemu_arm64_lwip_defconfig. The throughput is now 875 KiB/s vs. 313 KiB/s before. That is still a low number, but I think we can't expect more without implementing the windowsize option.

---
 net/Kconfig     | 20 ++++++++++----------
 net/lwip/tftp.c |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)
net/Kconfig +10 -10
index 16a9de47e94..76ab7d91eeb 100644
@@ -60,16 +60,6 @@ config SYS_FAULT_ECHO_LINK_DOWN
 	  this option is active, then CONFIG_SYS_FAULT_MII_ADDR also needs to
 	  be configured.
 
-config TFTP_BLOCKSIZE
-	int "TFTP block size"
-	default 1468
-	help
-	  Default TFTP block size.
-	  The MTU is typically 1500 for ethernet, so a TFTP block of
-	  1468 (MTU minus eth.hdrs) provides a good throughput with
-	  almost-MTU block sizes.
-	  You can also activate CONFIG_IP_DEFRAG to set a larger block.
-
 config TFTP_PORT
 	bool "Set TFTP UDP source/destination ports via the environment"
 	help
@@ -254,6 +244,16 @@ config NET_RANDOM_ETHADDR
 	  generated. It will be saved to the appropriate environment variable,
 	  too.
 
+config TFTP_BLOCKSIZE
+	int "TFTP block size"
+	default 1468
+	help
+	  Default TFTP block size.
+	  The MTU is typically 1500 for ethernet, so a TFTP block of
+	  1468 (MTU minus eth.hdrs) provides a good throughput with
+	  almost-MTU block sizes.
+	  You can also activate CONFIG_IP_DEFRAG to set a larger block.
+
 endif   # if NET || NET_LWIP
 
 config SYS_RX_ETH_BUFFER
net/lwip/tftp.c +2 -0
index 26978643313..f4d0a6aa19a 100644
@@ -139,6 +139,8 @@ static int tftp_loop(struct udevice *udev, ulong addr, char *fname,
 	if (!(err == ERR_OK || err == ERR_USE))
 		log_err("tftp_init_client err: %d\n", err);
 
+	tftp_client_set_blksize(CONFIG_TFTP_BLOCKSIZE);
+
 	ctx.start_time = get_timer(0);
 	err = tftp_get(&ctx, &srvip, srvport, fname, TFTP_MODE_OCTET);
 	/* might return different errors, like routing problems */
Signature · 1 line
2.40.1
#28 lore raw

PATCH v12 20/21 CI: add qemu_arm64_lwip to the test matrix

In reply to Jerome Forissier

Build and run qemu_arm64_lwip_defconfig in CI. This tests the lightweight IP (lwIP) implementation of the dhcp, tftpboot and ping commands.

---
 .azure-pipelines.yml | 7 +++++++
 .gitlab-ci.yml       | 9 +++++++++
 2 files changed, 16 insertions(+)
.azure-pipelines.yml +7 -0
index 93111eb6127..59fddb96a48 100644
@@ -238,6 +238,10 @@ stages:
           cd \${WORK_DIR}
           git config --global --add safe.directory \${WORK_DIR}
           git clone --depth=1 https://source.denx.de/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks
+          # qemu_arm64_lwip_defconfig is the same as qemu_arm64 but with NET_LWIP enabled.
+          # The test config and the boardenv file from qemu_arm64 can be re-used so create symlinks
+          ln -s conf.qemu_arm64_na /tmp/uboot-test-hooks/bin/travis-ci/conf.qemu_arm64_lwip_na
+          ln -s u_boot_boardenv_qemu_arm64_na.py /tmp/uboot-test-hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_lwip_na.py
           ln -s travis-ci /tmp/uboot-test-hooks/bin/\`hostname\`
           ln -s travis-ci /tmp/uboot-test-hooks/py/\`hostname\`
           grub-mkimage --prefix=\"\" -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd
@@ -415,6 +419,9 @@ stages:
         qemu_arm64:
           TEST_PY_BD: "qemu_arm64"
           TEST_PY_TEST_SPEC: "not sleep"
+        qemu_arm64_lwip:
+          TEST_PY_BD: "qemu_arm64_lwip"
+          TEST_PY_TEST_SPEC: "test_net_dhcp or test_net_ping or test_net_tftpboot"
         qemu_m68k:
           TEST_PY_BD: "M5208EVBE"
           TEST_PY_ID: "--id qemu"
.gitlab-ci.yml +9 -0
index 7d621031b85..700f3fe3a5f 100644
@@ -27,6 +27,9 @@ stages:
     # Clone uboot-test-hooks
     - git config --global --add safe.directory "${CI_PROJECT_DIR}"
     - git clone --depth=1 https://source.denx.de/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks
+    # qemu_arm64_lwip_defconfig is the same as qemu_arm64 but with NET_LWIP enabled.
+    # The test config and the boardenv file from qemu_arm64 can be re-used so create symlinks
+    - ln -s conf.qemu_arm64_na /tmp/uboot-test-hooks/bin/travis-ci/conf.qemu_arm64_lwip_na
     - ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname`
     - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname`
     - grub-mkimage --prefix="" -o ~/grub_x86.efi -O i386-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
@@ -344,6 +347,12 @@ qemu_arm64 test.py:
     TEST_PY_TEST_SPEC: "not sleep"
   <<: *buildman_and_testpy_dfn
 
+qemu_arm64_lwip test.py:
+  variables:
+    TEST_PY_BD: "qemu_arm64_lwip"
+    TEST_PY_TEST_SPEC: "test_net_dhcp or test_net_ping or test_net_tftpboot"
+  <<: *buildman_and_testpy_dfn
+
 qemu_m68k test.py:
   variables:
     TEST_PY_BD: "M5208EVBE"
Signature · 1 line
2.40.1
#29 lore raw

PATCH v12 21/21 MAINTAINERS: net: lwip: add myself as a maintainer

In reply to Jerome Forissier

Add myself as a maintainer for the lwIP network stack integration code and network commands as well as the sandbox ethernet driver for lwIP.

---
 MAINTAINERS | 11 +++++++++++
 1 file changed, 11 insertions(+)
MAINTAINERS +11 -0
index 7aefda93d01..ddfb0f481a4 100644
@@ -1359,6 +1359,17 @@ F:	drivers/net/
 F:	include/net.h
 F:	net/
 
+NETWORK (LWIP)
+M:	Jerome Forissier <[email protected]>
+S:	Maintained
+F:	cmd/net-lwip.c
+F:	configs/qemu_arm64_lwip_defconfig
+F:	drivers/net/sandbox-lwip.c
+F:	include/net-lwip.h
+F:	lib/lwip/Makefile
+F:	lib/lwip/u-boot/
+F:	net/lwip/
+
 NIOS
 M:	Thomas Chou <[email protected]>
 S:	Maintained
Signature · 1 line
2.40.1
#5 lore raw

PATCH v12 5/21 net: introduce alternative implementation as net/lwip/

In reply to Jerome Forissier

Prepare the introduction of the lwIP (lightweight IP) TCP/IP stack by adding a new net/lwip/ directory and the NET_LWIP symbol. Network support is either NO_NET, NET (legacy stack) or NET_LWIP. Subsequent commits will introduce the lwIP code, re-work the NETDEVICE integration and port some of the NET commands and features to lwIP.

SPL_NET cannot be enabled when NET_LWIP=y. SPL_NET pulls some symbols that are part of NET (such as arp_init(), arp_timeout_check(), arp_receive(), net_arp_wait_packet_ip()). lwIP support in SPL may be added later.

Similarly, DFU_TFTP and FASTBOOT are not compatible with NET_LWIP because of dependencies on net_loop(), tftp_timeout_ms, tftp_timeout_count_max and other NET things. Let's add a dependency on !NET_LWIP for now.

SANDBOX can select NET_LWIP but doing so will currently disable the eth dm tests as well as the wget tests which have strong dependencies on the NET code.

Other adjustments to Kconfig files are made to fix "unmet direct dependencies detected" for USB_FUNCTION_SDP and CMD_FASTBOOT when the default networking stack is set to NET_LWIP ("default NET_LWIP" instead of "default NET" in Kconfig).

The networking stack is now a choice between NO_NET, NET and NET_LWIP. Therefore '# CONFIG_NET is not set' should be 'CONFIG_NO_NET=y'. Adjust the defconfigs accordingly.

---
 Kconfig                                       | 29 +++++++++
 Makefile                                      |  2 +-
 boot/Kconfig                                  |  4 +-
 cmd/Kconfig                                   |  1 +
 common/Kconfig                                |  2 +-
 common/spl/Kconfig                            |  1 +
 configs/LicheePi_Zero_defconfig               |  2 +-
 configs/M5249EVB_defconfig                    |  2 +-
 configs/am335x_pdu001_defconfig               |  2 +-
 configs/am62ax_evm_r5_defconfig               |  2 +-
 configs/am62px_evm_r5_defconfig               |  2 +-
 configs/am62x_beagleplay_r5_defconfig         |  2 +-
 configs/amcore_defconfig                      |  2 +-
 configs/amd_versal2_mini_defconfig            |  2 +-
 configs/amd_versal2_mini_emmc_defconfig       |  2 +-
 configs/amd_versal2_mini_ospi_defconfig       |  2 +-
 configs/amd_versal2_mini_qspi_defconfig       |  2 +-
 configs/anbernic-rgxx3-rk3566_defconfig       |  2 +-
 configs/ap143_defconfig                       |  2 +-
 configs/ap152_defconfig                       |  2 +-
 configs/apple_m1_defconfig                    |  2 +-
 configs/astro_mcf5373l_defconfig              |  2 +-
 configs/at91sam9rlek_dataflash_defconfig      |  2 +-
 configs/at91sam9rlek_mmc_defconfig            |  2 +-
 configs/at91sam9rlek_nandflash_defconfig      |  2 +-
 configs/bcm7260_defconfig                     |  2 +-
 configs/bcm7445_defconfig                     |  2 +-
 configs/bcm968380gerg_ram_defconfig           |  2 +-
 configs/bcmns_defconfig                       |  2 +-
 configs/chromebook_samus_tpl_defconfig        |  2 +-
 configs/cortina_presidio-asic-base_defconfig  |  2 +-
 configs/cortina_presidio-asic-pnand_defconfig |  2 +-
 configs/durian_defconfig                      |  2 +-
 configs/e850-96_defconfig                     |  2 +-
 configs/ea-lpc3250devkitv2_defconfig          |  2 +-
 configs/efi-x86_app32_defconfig               |  2 +-
 configs/efi-x86_app64_defconfig               |  2 +-
 configs/emsdp_defconfig                       |  2 +-
 configs/evb-px5_defconfig                     |  2 +-
 configs/generic-rk3568_defconfig              |  2 +-
 configs/generic-rk3588_defconfig              |  2 +-
 configs/hc2910_2aghd05_defconfig              |  2 +-
 configs/igep00x0_defconfig                    |  2 +-
 configs/imx6q_bosch_acc_defconfig             |  2 +-
 configs/imx6ulz_smm_m2_defconfig              |  2 +-
 configs/iot_devkit_defconfig                  |  2 +-
 configs/j722s_evm_r5_defconfig                |  2 +-
 configs/legoev3_defconfig                     |  2 +-
 configs/mk808_defconfig                       |  2 +-
 configs/mx23evk_defconfig                     |  2 +-
 configs/mx28evk_defconfig                     |  2 +-
 configs/mx6memcal_defconfig                   |  2 +-
 configs/mx6ulz_14x14_evk_defconfig            |  2 +-
 configs/mx7ulp_com_defconfig                  |  2 +-
 configs/mx7ulp_evk_defconfig                  |  2 +-
 configs/mx7ulp_evk_plugin_defconfig           |  2 +-
 configs/netgear_cg3100d_ram_defconfig         |  2 +-
 configs/nsim_700_defconfig                    |  2 +-
 configs/nsim_700be_defconfig                  |  2 +-
 configs/nsim_hs38be_defconfig                 |  2 +-
 configs/openpiton_riscv64_defconfig           |  2 +-
 configs/openpiton_riscv64_spl_defconfig       |  2 +-
 configs/origen_defconfig                      |  2 +-
 configs/pe2201_defconfig                      |  2 +-
 configs/pinecube_defconfig                    |  2 +-
 configs/pm9261_defconfig                      |  2 +-
 configs/s5p4418_nanopi2_defconfig             |  2 +-
 configs/s5p_goni_defconfig                    |  2 +-
 configs/s5pc210_universal_defconfig           |  2 +-
 configs/sama5d27_giantboard_defconfig         |  2 +-
 configs/sama5d29_curiosity_mmc1_defconfig     |  2 +-
 configs/sama5d29_curiosity_mmc_defconfig      |  2 +-
 .../sama5d29_curiosity_qspiflash_defconfig    |  2 +-
 configs/sama7g54_curiosity_mmc_defconfig      |  2 +-
 .../sama7g54_curiosity_nandflash_defconfig    |  2 +-
 .../sama7g54_curiosity_qspiflash_defconfig    |  2 +-
 configs/sipeed_maix_bitm_defconfig            |  2 +-
 configs/sipeed_maix_smode_defconfig           |  2 +-
 configs/stemmy_defconfig                      |  2 +-
 configs/stm32f429-discovery_defconfig         |  2 +-
 configs/stm32f429-evaluation_defconfig        |  2 +-
 configs/stm32f469-discovery_defconfig         |  2 +-
 configs/stm32h743-disco_defconfig             |  2 +-
 configs/stm32h743-eval_defconfig              |  2 +-
 configs/stm32h750-art-pi_defconfig            |  2 +-
 configs/stm32mp25_defconfig                   |  2 +-
 configs/stmark2_defconfig                     |  2 +-
 configs/th1520_lpi4a_defconfig                |  2 +-
 configs/thunderx_88xx_defconfig               |  2 +-
 configs/tools-only_defconfig                  |  2 +-
 configs/topic_miami_defconfig                 |  2 +-
 configs/topic_miamilite_defconfig             |  2 +-
 configs/topic_miamiplus_defconfig             |  2 +-
 configs/total_compute_defconfig               |  2 +-
 configs/trats2_defconfig                      |  2 +-
 configs/trats_defconfig                       |  2 +-
 configs/xenguest_arm64_defconfig              |  2 +-
 configs/xenguest_arm64_virtio_defconfig       |  2 +-
 configs/xilinx_versal_mini_defconfig          |  2 +-
 configs/xilinx_versal_mini_emmc0_defconfig    |  2 +-
 configs/xilinx_versal_mini_emmc1_defconfig    |  2 +-
 configs/xilinx_versal_mini_ospi_defconfig     |  2 +-
 configs/xilinx_versal_mini_qspi_defconfig     |  2 +-
 configs/xilinx_versal_net_mini_defconfig      |  2 +-
 configs/xilinx_versal_net_mini_emmc_defconfig |  2 +-
 configs/xilinx_versal_net_mini_ospi_defconfig |  2 +-
 configs/xilinx_versal_net_mini_qspi_defconfig |  2 +-
 configs/xilinx_zynqmp_mini_defconfig          |  2 +-
 configs/xilinx_zynqmp_mini_emmc0_defconfig    |  2 +-
 configs/xilinx_zynqmp_mini_emmc1_defconfig    |  2 +-
 configs/xilinx_zynqmp_mini_nand_defconfig     |  2 +-
 .../xilinx_zynqmp_mini_nand_single_defconfig  |  2 +-
 configs/xilinx_zynqmp_mini_qspi_defconfig     |  2 +-
 configs/zynq_cse_nand_defconfig               |  2 +-
 configs/zynq_cse_nor_defconfig                |  2 +-
 configs/zynq_cse_qspi_defconfig               |  2 +-
 drivers/dfu/Kconfig                           |  1 +
 drivers/fastboot/Kconfig                      |  1 +
 drivers/net/Kconfig                           |  3 +
 drivers/net/phy/Kconfig                       |  2 +-
 drivers/usb/gadget/Kconfig                    |  2 +-
 net/Kconfig                                   | 61 ++++++++++---------
 net/Makefile                                  |  4 ++
 net/lwip/Kconfig                              | 49 +++++++++++++++
 test/cmd/Makefile                             |  2 +
 test/dm/Makefile                              |  2 +
 126 files changed, 241 insertions(+), 145 deletions(-)
 create mode 100644 net/lwip/Kconfig
Kconfig +29 -0
index 74e8ce5edfd..a206d1f8124 100644
@@ -758,8 +758,37 @@ source "dts/Kconfig"
 
 source "env/Kconfig"
 
+menu Networking
+
+choice
+	prompt "Networking stack"
+	default NET
+
+config NO_NET
+	bool "No networking support"
+
+config NET
+	bool "Legacy U-Boot networking stack"
+	imply NETDEVICES
+
+config NET_LWIP
+	bool "Use lwIP for networking stack"
+	imply NETDEVICES
+	help
+	  Include networking support based on the lwIP (lightweight IP)
+	  TCP/IP stack (https://nongnu.org/lwip). This is a replacement for
+	  the default U-Boot network stack and applications located in net/
+	  and enabled via CONFIG_NET as well as other pieces of code that
+	  depend on CONFIG_NET (such as cmd/net.c enabled via CONFIG_CMD_NET).
+	  Therefore the two symbols CONFIG_NET and CONFIG_NET_LWIP are mutually
+	  exclusive.
+
+endchoice
+
 source "net/Kconfig"
 
+endmenu
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"
Makefile +1 -1
index da32324647b..75344ade751 100644
@@ -859,7 +859,7 @@ libs-$(CONFIG_OF_EMBED) += dts/
 libs-y += env/
 libs-y += lib/
 libs-y += fs/
-libs-y += net/
+libs-$(filter y,$(CONFIG_NET) $(CONFIG_NET_LWIP)) += net/
 libs-y += disk/
 libs-y += drivers/
 libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/
boot/Kconfig +3 -1
index 925afe06a19..1d50a83a2d2 100644
@@ -503,7 +503,8 @@ config BOOTMETH_ANDROID
 	select ANDROID_AB
 	select ANDROID_BOOT_IMAGE
 	select CMD_BCB
-	select CMD_FASTBOOT
+	imply CMD_FASTBOOT
+	imply FASTBOOT if !NET_LWIP
 	select PARTITION_TYPE_GUID
 	select PARTITION_UUIDS
 	help
@@ -559,6 +560,7 @@ config BOOTMETH_EXTLINUX_PXE
 config BOOTMETH_EFILOADER
 	bool "Bootdev support for EFI boot"
 	depends on EFI_BINARY_EXEC
+	imply CMD_TFTPBOOT if CMD_NET
 	default y
 	help
 	  Enables support for EFI boot using bootdevs. This makes the
cmd/Kconfig +1 -0
index dd33266cec7..49409ee9843 100644
@@ -1668,6 +1668,7 @@ config CMD_USB
 
 config CMD_USB_SDP
 	bool "sdp"
+	depends on USB_GADGET_DOWNLOAD
 	select USB_FUNCTION_SDP
 	help
 	  Enables the command "sdp" which is used to have U-Boot emulating the
common/Kconfig +1 -1
index 957de0c5c02..0339b9e4c84 100644
@@ -424,7 +424,7 @@ config LOGF_FUNC_PAD
 
 config LOG_SYSLOG
 	bool "Log output to syslog server"
-	depends on NET
+	depends on NET || NET_LWIP
 	help
 	  Enables a log driver which broadcasts log records via UDP port 514
 	  to syslog servers.
common/spl/Kconfig +1 -0
index 2baf2ba7ccb..9a27eabd741 100644
@@ -1083,6 +1083,7 @@ config SPL_DM_SPI_FLASH
 
 config SPL_NET
 	bool "Support networking"
+	depends on !NET_LWIP
 	help
 	  Enable support for network devices (such as Ethernet) in SPL.
 	  This permits SPL to load U-Boot over a network link rather than
configs/LicheePi_Zero_defconfig +1 -1
index 009384eaf1b..c37c49ccbb1 100644
@@ -5,4 +5,4 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN8I_V3S=y
 CONFIG_DRAM_CLK=360
 # CONFIG_HAS_ARMV7_SECURE_BASE is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
configs/M5249EVB_defconfig +1 -1
index eac85b9c2d5..ed1446d81cb 100644
@@ -22,7 +22,7 @@ CONFIG_CMD_MX_CYCLIC=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/am335x_pdu001_defconfig +1 -1
index 54da31f45f7..09753fdbd06 100644
@@ -42,7 +42,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_OF_TRANSLATE=y
configs/am62ax_evm_r5_defconfig +1 -1
index 2fe6c49b80f..f386875a89f 100644
@@ -66,7 +66,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=1
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_REGMAP=y
configs/am62px_evm_r5_defconfig +1 -1
index 0cdbd30a760..5fed277d59d 100644
@@ -70,7 +70,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=1
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_DEVICE_REMOVE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/am62x_beagleplay_r5_defconfig +1 -1
index 0038747155e..9daee2a38bb 100644
@@ -67,7 +67,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_SPL_MULTI_DTB_FIT=y
 CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_REGMAP=y
configs/amcore_defconfig +1 -1
index f1f5201b30a..94c5379590d 100644
@@ -33,7 +33,7 @@ CONFIG_CMD_DIAG=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="AMCORE"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/amd_versal2_mini_defconfig +1 -1
index d4760e40223..ec1921aac39 100644
@@ -62,7 +62,7 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/amd_versal2_mini_emmc_defconfig +1 -1
index d2de379d07c..6d4b261606f 100644
@@ -54,7 +54,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
configs/amd_versal2_mini_ospi_defconfig +1 -1
index 22a8bfa8511..6c394432f5b 100644
@@ -56,7 +56,7 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/amd_versal2_mini_qspi_defconfig +1 -1
index de404b0f658..5c770a7530a 100644
@@ -56,7 +56,7 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/anbernic-rgxx3-rk3566_defconfig +1 -1
index 83337d68cc0..4dcf18e22ca 100644
@@ -42,7 +42,7 @@ CONFIG_OF_LIVE=y
 # CONFIG_OF_UPSTREAM is not set
 CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SPL_SYSCON=y
configs/ap143_defconfig +1 -1
index 9d503bdf61f..9083bf293f5 100644
@@ -46,7 +46,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-boot),64k(u-boot-env),6336k
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_ENV_SPI_MAX_HZ=25000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/ap152_defconfig +1 -1
index d830a85be69..0864bf46d54 100644
@@ -46,7 +46,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-boot),64k(u-boot-env),6336k
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_ENV_SPI_MAX_HZ=25000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/apple_m1_defconfig +1 -1
index 6a5affcaca9..2d685da8c9e 100644
@@ -11,7 +11,7 @@ CONFIG_SYS_PBSIZE=276
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_CMD_SELECT_FONT=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_APPLE_SPI_KEYB=y
 # CONFIG_MMC is not set
configs/astro_mcf5373l_defconfig +1 -1
index d1942c28971..8dd369d68a1 100644
@@ -27,7 +27,7 @@ CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_JFFS2=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_FPGA_ALTERA=y
 CONFIG_FPGA_CYCLON2=y
 CONFIG_FPGA_XILINX=y
configs/at91sam9rlek_dataflash_defconfig +1 -1
index 141e83fe5fd..9ebe2de1f2c 100644
@@ -41,7 +41,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GPIO=y
configs/at91sam9rlek_mmc_defconfig +1 -1
index d497d59a073..0fef493164e 100644
@@ -39,7 +39,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GPIO=y
configs/at91sam9rlek_nandflash_defconfig +1 -1
index 1bcdab8e5aa..c40e99817b9 100644
@@ -40,7 +40,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GPIO=y
configs/bcm7260_defconfig +1 -1
index aeb1f907199..ed026e58617 100644
@@ -36,7 +36,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCMSTB=y
 CONFIG_MTD=y
configs/bcm7445_defconfig +1 -1
index 03012056fbb..07294451100 100644
@@ -38,7 +38,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCMSTB=y
 CONFIG_MTD=y
configs/bcm968380gerg_ram_defconfig +1 -1
index 6c119eb42a6..053c459e05c 100644
@@ -41,7 +41,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
configs/bcmns_defconfig +1 -1
index 989017b96d9..c53c6fffbc4 100644
@@ -29,7 +29,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="NS"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
configs/chromebook_samus_tpl_defconfig +1 -1
index 1be57560f89..075e3f192a3 100644
@@ -74,7 +74,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
configs/cortina_presidio-asic-base_defconfig +1 -1
index 0cb33996fe7..d779e7d8e58 100644
@@ -32,7 +32,7 @@ CONFIG_CMD_TIMER=y
 CONFIG_CMD_SMC=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIVE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CORTINA_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_DM_SERIAL=y
configs/cortina_presidio-asic-pnand_defconfig +1 -1
index 093874d3023..cdb9681b32b 100644
@@ -33,7 +33,7 @@ CONFIG_CMD_TIMER=y
 CONFIG_CMD_SMC=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIVE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CORTINA_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
configs/durian_defconfig +1 -1
index 7765fe3a6a2..ea1d37e9db6 100644
@@ -28,7 +28,7 @@ CONFIG_SYS_PROMPT="durian#"
 CONFIG_CMD_PCI=y
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 # CONFIG_MMC is not set
configs/e850-96_defconfig +1 -1
index e5d90996234..5797c6cb1f9 100644
@@ -20,7 +20,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PART=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_RNG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK_EXYNOS850=y
 CONFIG_MMC_DW=y
 CONFIG_SOC_SAMSUNG=y
configs/ea-lpc3250devkitv2_defconfig +1 -1
index af9fc5f2f5c..c3af7afced1 100644
@@ -25,7 +25,7 @@ CONFIG_SYS_PROMPT="EA-LPC3250v2=> "
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_OF_CONTROL=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_LPC32XX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_LPC32XX=y
configs/efi-x86_app32_defconfig +1 -1
index 0025e56b5d7..c730945f4f9 100644
@@ -36,7 +36,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_GZIP is not set
configs/efi-x86_app64_defconfig +1 -1
index 1cc50b689c9..1831fb2d5a7 100644
@@ -40,7 +40,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CONSOLE_SCROLL_LINES=5
configs/emsdp_defconfig +1 -1
index efa5eecad0d..376862ad300 100644
@@ -30,7 +30,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="app.bin"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MMC=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_SNPS=y
configs/evb-px5_defconfig +1 -1
index 48f5b90a7dc..b08714437fd 100644
@@ -57,7 +57,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent"
 CONFIG_TPL_OF_PLATDATA=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_TPL_DM=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
configs/generic-rk3568_defconfig +1 -1
index 9b9eab6bad1..1d06f3411fe 100644
@@ -41,7 +41,7 @@ CONFIG_OF_LIVE=y
 # CONFIG_OF_UPSTREAM is not set
 CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SPL_SYSCON=y
configs/generic-rk3588_defconfig +1 -1
index f22277f935d..ebe883ed597 100644
@@ -35,7 +35,7 @@ CONFIG_OF_LIVE=y
 # CONFIG_OF_UPSTREAM is not set
 CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SPL_SYSCON=y
configs/hc2910_2aghd05_defconfig +1 -1
index d06f922ba57..d7cc7d18ed8 100644
@@ -37,7 +37,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
 # CONFIG_INPUT is not set
configs/igep00x0_defconfig +1 -1
index f1d9bb34aba..51c825d3fbe 100644
@@ -60,7 +60,7 @@ CONFIG_ENV_UBI_VOLUME="config"
 CONFIG_ENV_UBI_VOLUME_REDUND="config_r"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
configs/imx6q_bosch_acc_defconfig +1 -1
index 354b73752ad..a46b3250b2e 100644
@@ -82,7 +82,7 @@ CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_ENV_WRITEABLE_LIST=y
 CONFIG_ENV_ACCESS_IGNORE_FORCE=y
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
configs/imx6ulz_smm_m2_defconfig +1 -1
index 93ead4c373b..c2adff17abf 100644
@@ -42,7 +42,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
configs/iot_devkit_defconfig +1 -1
index ba275d04a11..5b7e131c9ac 100644
@@ -34,7 +34,7 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="app.bin"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MMC=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_SNPS=y
configs/j722s_evm_r5_defconfig +1 -1
index 74fbe52e588..e6a573d599d 100644
@@ -70,7 +70,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=1
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_DEVICE_REMOVE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/legoev3_defconfig +1 -1
index 34ef3493cac..60b7a84205c 100644
@@ -44,7 +44,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DAVINCI=y
configs/mk808_defconfig +1 -1
index 0610b51748e..dc9b12e5d8c 100644
@@ -68,7 +68,7 @@ CONFIG_OF_DTB_PROPS_REMOVE=y
 CONFIG_SPL_OF_PLATDATA=y
 CONFIG_TPL_OF_PLATDATA=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_TPL_DM=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
configs/mx23evk_defconfig +1 -1
index 793ba6add55..6152d930e3a 100644
@@ -41,7 +41,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_PINCTRL=y
configs/mx28evk_defconfig +1 -1
index a94d34d2c4c..951d506cec2 100644
@@ -47,7 +47,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_MXS_GPIO=y
 CONFIG_MMC_MXS=y
configs/mx6memcal_defconfig +1 -1
index 0c98c685565..bfde8b0cfb3 100644
@@ -39,7 +39,7 @@ CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 # CONFIG_MMC is not set
 CONFIG_FSL_USDHC=y
configs/mx6ulz_14x14_evk_defconfig +1 -1
index d57b47ef47a..2c13dd4dbc3 100644
@@ -36,7 +36,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
configs/mx7ulp_com_defconfig +1 -1
index eba57dd5fb1..a49cb2a728f 100644
@@ -33,7 +33,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
configs/mx7ulp_evk_defconfig +1 -1
index 262ee671fa0..12f13112b63 100644
@@ -33,7 +33,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
configs/mx7ulp_evk_plugin_defconfig +1 -1
index dc9fc50e150..8e05d394335 100644
@@ -31,7 +31,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
configs/netgear_cg3100d_ram_defconfig +1 -1
index 352b98fc0a5..377cc26f937 100644
@@ -39,7 +39,7 @@ CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_SPI=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
configs/nsim_700_defconfig +1 -1
index a46d2ee232a..d50e85a93fa 100644
@@ -25,7 +25,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
configs/nsim_700be_defconfig +1 -1
index 8dc31819fa1..4832195f6b4 100644
@@ -26,7 +26,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
configs/nsim_hs38be_defconfig +1 -1
index 5f21b31c84a..67de123d16b 100644
@@ -27,7 +27,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
configs/openpiton_riscv64_defconfig +1 -1
index a47214b0a42..1e693c621eb 100644
@@ -62,7 +62,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 # CONFIG_DOS_PARTITION is not set
 CONFIG_OF_EMBED=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CPU=y
 CONFIG_MMC=y
 # CONFIG_MMC_WRITE is not set
configs/openpiton_riscv64_spl_defconfig +1 -1
index d2eb891d69e..09054d93047 100644
@@ -78,7 +78,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 # CONFIG_DOS_PARTITION is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CPU=y
 CONFIG_MMC=y
 # CONFIG_MMC_WRITE is not set
configs/origen_defconfig +1 -1
index 9fd7bc103c7..c6cc17a0e03 100644
@@ -41,7 +41,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
 CONFIG_MMC_DW=y
configs/pe2201_defconfig +1 -1
index c28ceac0d45..72f6274ec41 100644
@@ -27,7 +27,7 @@ CONFIG_CMD_DM=y
 CONFIG_CMD_PCI=y
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 # CONFIG_MMC is not set
configs/pinecube_defconfig +1 -1
index 7cc0a862949..7567a6aa739 100644
@@ -9,7 +9,7 @@ CONFIG_DRAM_ODT_EN=y
 CONFIG_I2C0_ENABLE=y
 # CONFIG_HAS_ARMV7_SECURE_BASE is not set
 CONFIG_SPL_I2C=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x7f
configs/pm9261_defconfig +1 -1
index 9f4d434f3e2..026c6de3109 100644
@@ -37,7 +37,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:256k(u-boot)ro,64k(u-boot-env)
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_FLASH=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GPIO=y
configs/s5p4418_nanopi2_defconfig +1 -1
index 23862090df7..548963c933f 100644
@@ -49,7 +49,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_MMC_ENV_DEV=2
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_NEXELL=y
 CONFIG_MMC_DW=y
configs/s5p_goni_defconfig +1 -1
index 4316510541c..084e19e1258 100644
@@ -44,7 +44,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
 CONFIG_DM_I2C_GPIO=y
configs/s5pc210_universal_defconfig +1 -1
index 1607a31ce09..190ec961b97 100644
@@ -41,7 +41,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
 CONFIG_SYS_I2C_S3C24X0=y
configs/sama5d27_giantboard_defconfig +1 -1
index 4b29891d7d6..7cde865a12b 100644
@@ -64,7 +64,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
 CONFIG_ENV_IS_IN_FAT=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_CLK=y
configs/sama5d29_curiosity_mmc1_defconfig +1 -1
index 25ff38c94f3..c8976eec02d 100644
@@ -72,7 +72,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA5D29"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_UTMI=y
configs/sama5d29_curiosity_mmc_defconfig +1 -1
index e691839d1b9..7fe1a5b7552 100644
@@ -71,7 +71,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA5D29"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_UTMI=y
configs/sama5d29_curiosity_qspiflash_defconfig +1 -1
index f340423a46f..fd3551131db 100644
@@ -71,7 +71,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA5D29"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_UTMI=y
configs/sama7g54_curiosity_mmc_defconfig +1 -1
index 41c18452f9e..fec883e3c17 100644
@@ -75,7 +75,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA7G54"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_CCF=y
 CONFIG_CLK_AT91=y
configs/sama7g54_curiosity_nandflash_defconfig +1 -1
index 59e8189287b..7a4cdb0d2ab 100644
@@ -73,7 +73,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA7G54"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_CCF=y
 CONFIG_CLK_AT91=y
configs/sama7g54_curiosity_qspiflash_defconfig +1 -1
index 20cd7143cb8..adf5f558e2e 100644
@@ -74,7 +74,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA7G54"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_CCF=y
 CONFIG_CLK_AT91=y
configs/sipeed_maix_bitm_defconfig +1 -1
index 0d74d63786d..b2e21c7d7ae 100644
@@ -19,7 +19,7 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi3:0"
 CONFIG_MTDPARTS_DEFAULT="nor0:1M(u-boot),0x1000@0xfff000(env)"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK_K210_SET_RATE=y
 # CONFIG_INPUT is not set
 CONFIG_FS_EXT4=y
configs/sipeed_maix_smode_defconfig +1 -1
index 4af6e3428ba..d838b252d53 100644
@@ -20,7 +20,7 @@ CONFIG_SYS_PBSIZE=276
 CONFIG_HUSH_PARSER=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi3:0"
 CONFIG_MTDPARTS_DEFAULT="nor0:1M(u-boot),0x1000@0xfff000(env)"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_INPUT is not set
 CONFIG_FS_EXT4=y
 CONFIG_FS_FAT=y
configs/stemmy_defconfig +1 -1
index 88e76087a69..631ccababf1 100644
@@ -29,7 +29,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PART=y
 CONFIG_CMD_GETTIME=y
 CONFIG_EFI_PARTITION=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x18100000
 CONFIG_FASTBOOT_FLASH=y
configs/stm32f429-discovery_defconfig +1 -1
index 5199e542208..77889336147 100644
@@ -27,7 +27,7 @@ CONFIG_CMD_IMLS=y
 CONFIG_CMD_TIMER=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_FLASH=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
configs/stm32f429-evaluation_defconfig +1 -1
index 412533e64f4..2fa8dc9faad 100644
@@ -25,7 +25,7 @@ CONFIG_CMD_TIMER=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
configs/stm32f469-discovery_defconfig +1 -1
index 93420cb5bb1..98399416fa5 100644
@@ -26,7 +26,7 @@ CONFIG_CMD_TIMER=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
configs/stm32h743-disco_defconfig +1 -1
index 376edc271a1..40fc9383aee 100644
@@ -30,6 +30,6 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_STM32_SDMMC2=y
 # CONFIG_PINCTRL_FULL is not set
configs/stm32h743-eval_defconfig +1 -1
index c249c4dd3d4..953e67e75bb 100644
@@ -30,6 +30,6 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_STM32_SDMMC2=y
 # CONFIG_PINCTRL_FULL is not set
configs/stm32h750-art-pi_defconfig +1 -1
index d66f440fdb7..4ca2d30e44c 100644
@@ -36,7 +36,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_DMA=y
 CONFIG_STM32_SDMMC2=y
 # CONFIG_PINCTRL_FULL is not set
configs/stm32mp25_defconfig +1 -1
index 85e6830d74e..d3f0c088157 100644
@@ -32,7 +32,7 @@ CONFIG_CMD_TIMER=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_LOG=y
 CONFIG_OF_LIVE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_GPIO_HOG=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_STM32F7=y
configs/stmark2_defconfig +1 -1
index f43a24c5b5e..79b21acd032 100644
@@ -39,7 +39,7 @@ CONFIG_ENV_SPI_CS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="stmark2"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_FSL=y
 CONFIG_MTD=y
configs/th1520_lpi4a_defconfig +1 -1
index 98bcb220392..a57cedbfd11 100644
@@ -59,7 +59,7 @@ CONFIG_CMD_BOOTMENU=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_BLOCK_CACHE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/thunderx_88xx_defconfig +1 -1
index 3cc04afe69b..24ad84bd114 100644
@@ -33,7 +33,7 @@ CONFIG_SYS_PROMPT="ThunderX_88XX> "
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_MMC is not set
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
configs/tools-only_defconfig +1 -1
index 29554be7a65..8925e37e02a 100644
@@ -23,7 +23,7 @@ CONFIG_CMD_EXTENSION=n
 CONFIG_CMD_DATE=n
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_NET=n
+CONFIG_NO_NET=y
 CONFIG_ACPIGEN=n
 CONFIG_AXI=y
 CONFIG_AXI_SANDBOX=y
configs/topic_miami_defconfig +1 -1
index accdfe9a2ab..039ac710b38 100644
@@ -52,7 +52,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
configs/topic_miamilite_defconfig +1 -1
index 1c65f6ef632..b53f3a7150e 100644
@@ -52,7 +52,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
configs/topic_miamiplus_defconfig +1 -1
index 53bf0afd4d1..ba7f248db3b 100644
@@ -52,7 +52,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
configs/total_compute_defconfig +1 -1
index 5f21d2e367a..b3d2e5c88a6 100644
@@ -43,7 +43,7 @@ CONFIG_CMD_AVB=y
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 # CONFIG_MMC_WRITE is not set
 CONFIG_ARM_PL180_MMCI=y
configs/trats2_defconfig +1 -1
index 3796aed1a93..f4afd373653 100644
@@ -43,7 +43,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
 CONFIG_DM_I2C_GPIO=y
configs/trats_defconfig +1 -1
index 91ad6b52297..14849d0e691 100644
@@ -42,7 +42,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
 CONFIG_DM_I2C_GPIO=y
configs/xenguest_arm64_defconfig +1 -1
index 64e8eb2d81f..e9a5219a7c4 100644
@@ -37,7 +37,7 @@ CONFIG_CMD_PVBLOCK=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_MMC is not set
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_DM_SERIAL=y
configs/xenguest_arm64_virtio_defconfig +1 -1
index b5e9b390683..acf131fc837 100644
@@ -42,7 +42,7 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_PARTITION_TYPE_GUID=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_MMC is not set
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_REGION_MULTI_ENTRY=y
configs/xilinx_versal_mini_defconfig +1 -1
index 229a38dc134..7388a787386 100644
@@ -58,7 +58,7 @@ CONFIG_SYS_ALT_MEMTEST=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_SLEEP is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_MMC is not set
 CONFIG_ARM_DCC=y
configs/xilinx_versal_mini_emmc0_defconfig +1 -1
index 8cd24f4ef81..a36e40dfbb3 100644
@@ -56,7 +56,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/xilinx_versal_mini_emmc1_defconfig +1 -1
index e868d476db5..3ae2115212a 100644
@@ -56,7 +56,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/xilinx_versal_mini_ospi_defconfig +1 -1
index eecbc12f809..d0ea2b6aebd 100644
@@ -52,7 +52,7 @@ CONFIG_SYS_PROMPT="Versal> "
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_MMC is not set
 CONFIG_MTD=y
configs/xilinx_versal_mini_qspi_defconfig +1 -1
index 3c0adcde34e..ef6eec075d0 100644
@@ -54,7 +54,7 @@ CONFIG_SYS_PROMPT="Versal> "
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/xilinx_versal_net_mini_defconfig +1 -1
index ba656c9441f..1640dfaff9e 100644
@@ -62,7 +62,7 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/xilinx_versal_net_mini_emmc_defconfig +1 -1
index 61b0b2a1c97..4c6159a4df1 100644
@@ -51,7 +51,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
configs/xilinx_versal_net_mini_ospi_defconfig +1 -1
index 6dc82bc0d96..071eeb8197b 100644
@@ -51,7 +51,7 @@ CONFIG_SYS_PROMPT="Versal NET> "
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_MMC is not set
 CONFIG_MTD=y
configs/xilinx_versal_net_mini_qspi_defconfig +1 -1
index 8d05d99a627..227c45df28c 100644
@@ -53,7 +53,7 @@ CONFIG_SYS_PROMPT="Versal NET> "
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/xilinx_zynqmp_mini_defconfig +1 -1
index 1e76692e4da..7aab69c9e46 100644
@@ -54,7 +54,7 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_DM_MAILBOX is not set
 # CONFIG_MMC is not set
configs/xilinx_zynqmp_mini_emmc0_defconfig +1 -1
index 391b6f4207c..c56b1e830d6 100644
@@ -65,7 +65,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_DM_MAILBOX is not set
configs/xilinx_zynqmp_mini_emmc1_defconfig +1 -1
index 132210bee62..a8dbf0056da 100644
@@ -65,7 +65,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_DM_MAILBOX is not set
configs/xilinx_zynqmp_mini_nand_defconfig +1 -1
index 1de6b00923d..ba8f02c5b11 100644
@@ -49,7 +49,7 @@ CONFIG_CLOCKS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_DM_MAILBOX is not set
 # CONFIG_MMC is not set
configs/xilinx_zynqmp_mini_nand_single_defconfig +1 -1
index 8c67786f68d..a8a0055f2e5 100644
@@ -49,7 +49,7 @@ CONFIG_CLOCKS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_DM_MAILBOX is not set
 # CONFIG_MMC is not set
configs/xilinx_zynqmp_mini_qspi_defconfig +1 -1
index 1a2dafe4738..c08b10c6944 100644
@@ -68,7 +68,7 @@ CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_FIRMWARE is not set
configs/zynq_cse_nand_defconfig +1 -1
index d95e69712b0..80852f3507d 100644
@@ -70,7 +70,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_MMC is not set
configs/zynq_cse_nor_defconfig +1 -1
index fbec4a6ab25..326e4e3f7d1 100644
@@ -70,7 +70,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_MMC is not set
configs/zynq_cse_qspi_defconfig +1 -1
index 53c7edf8bb7..cd84df1e290 100644
@@ -79,7 +79,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_MMC is not set
drivers/dfu/Kconfig +1 -0
index aadd7e8cf7f..604386bb734 100644
@@ -20,6 +20,7 @@ config DFU_WRITE_ALT
 config DFU_TFTP
 	bool "DFU via TFTP"
 	depends on NETDEVICES
+	depends on !NET_LWIP
 	select UPDATE_COMMON
 	select DFU_OVER_TFTP
 	help
drivers/fastboot/Kconfig +1 -0
index 70207573de2..1eb460f5a02 100644
@@ -1,5 +1,6 @@
 menu "Fastboot support"
 	depends on CMDLINE
+	depends on !NET_LWIP
 
 config FASTBOOT
 	bool
drivers/net/Kconfig +3 -0
index 2f39ec05ac7..9c042808b44 100644
@@ -48,6 +48,7 @@ config DM_DSA
 	bool "Enable Driver Model for DSA switches"
 	depends on DM_MDIO
 	depends on PHY_FIXED
+	depends on !NET_LWIP
 	help
 	  Enable driver model for DSA switches
 
@@ -342,6 +343,7 @@ config ESSEDMA
 
 config ETH_SANDBOX
 	depends on SANDBOX
+	depends on NET
 	default y
 	bool "Sandbox: Mocked Ethernet driver"
 	help
@@ -363,6 +365,7 @@ config ETH_SANDBOX_LWIP
 
 config ETH_SANDBOX_RAW
 	depends on SANDBOX
+	depends on NET
 	default y
 	bool "Sandbox: Bridge to Linux Raw Sockets"
 	help
drivers/net/phy/Kconfig +1 -1
index a9efc509814..13e73810ad6 100644
@@ -11,7 +11,7 @@ config MV88E6352_SWITCH
 
 menuconfig PHYLIB
 	bool "Ethernet PHY (physical media interface) support"
-	depends on NET
+	depends on NET || NET_LWIP
 	help
 	  Enable Ethernet PHY (physical media interface) support.
 
drivers/usb/gadget/Kconfig +1 -1
index 1694ad03183..010084ef7f3 100644
@@ -233,7 +233,7 @@ endif # USB_GADGET_DOWNLOAD
 
 config USB_ETHER
 	bool "USB Ethernet Gadget"
-	depends on NET
+	depends on NET || NET_LWIP
 	default y if ARCH_SUNXI && USB_MUSB_GADGET
 	help
 	  Creates an Ethernet network device through a USB peripheral
net/Kconfig +31 -30

83 lines not on this page · raw message

net/Makefile +4 -0
index 64ab7ec740a..70eec8caf0d 100644
@@ -5,6 +5,8 @@
 
 #ccflags-y += -DDEBUG
 
+ifeq ($(CONFIG_NET),y)
+
 obj-$(CONFIG_NET)      += arp.o
 obj-$(CONFIG_CMD_BOOTP) += bootp.o
 obj-$(CONFIG_CMD_CDP)  += cdp.o
@@ -38,3 +40,5 @@ obj-$(CONFIG_CMD_WGET) += wget.o
 # sprintf(buf, index ? "foo%d" : "foo", index)
 # and this is intentional usage.
 CFLAGS_eth_common.o += -Wno-format-extra-args
+
+endif
net/lwip/Kconfig new file +49 -0

49 lines not on this page · raw message

test/cmd/Makefile +2 -0
index 8f2134998ad..dbee9b26405 100644
@@ -30,7 +30,9 @@ ifdef CONFIG_SANDBOX
 obj-$(CONFIG_CMD_MBR) += mbr.o
 obj-$(CONFIG_CMD_READ) += rw.o
 obj-$(CONFIG_CMD_SETEXPR) += setexpr.o
+ifdef CONFIG_NET
 obj-$(CONFIG_CMD_WGET) += wget.o
+endif
 obj-$(CONFIG_ARM_FFA_TRANSPORT) += armffa.o
 endif
 obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o
test/dm/Makefile +2 -0
index c12589d487c..03952441278 100644
@@ -48,7 +48,9 @@ obj-$(CONFIG_VIDEO_MIPI_DSI) += dsi_host.o
 obj-$(CONFIG_DM_DSA) += dsa.o
 obj-$(CONFIG_ECDSA_VERIFY) += ecdsa.o
 obj-$(CONFIG_EFI_MEDIA_SANDBOX) += efi_media.o
+ifdef CONFIG_NET
 obj-$(CONFIG_DM_ETH) += eth.o
+endif
 obj-$(CONFIG_EXTCON) += extcon.o
 ifneq ($(CONFIG_EFI_PARTITION),)
 obj-$(CONFIG_FASTBOOT_FLASH_MMC) += fastboot.o
Signature · 1 line
2.40.1
#11 lore raw

PATCH v12 9/21 net: lwip: add DHCP support and dhcp commmand

In reply to Jerome Forissier

Add what it takes to enable NETDEVICES with NET_LWIP and enable DHCP as well as the dhcp command. CMD_TFTPBOOT is selected by BOOTMETH_EFI due to this code having an implicit dependency on do_tftpb().

Note that PXE is likely non-fonctional with NET_LWIP (or at least not 100% functional) because DHCP option 209 is not supported by the lwIP library. Therefore, BOOTP_PXE_DHCP_OPTION cannot be enabled.

---
 board/engicam/imx8mp/icore_mx8mp.c            |   2 +-
 .../imx8mp_debix_model_a.c                    |   2 +-
 board/ti/am335x/board.c                       |   3 +-
 board/xilinx/common/board.c                   |   3 +-
 cmd/Kconfig                                   | 100 +++---
 cmd/Makefile                                  |   6 +-
 cmd/elf.c                                     |   2 +-
 cmd/net-lwip.c                                |  13 +
 common/board_r.c                              |   4 +-
 common/usb_kbd.c                              |   2 +-
 drivers/net/Kconfig                           |   2 +-
 include/net-common.h                          |   3 +
 include/net-legacy.h                          |   3 -
 include/net-lwip.h                            |   3 +
 lib/tiny-printf.c                             |   3 +-
 net/Makefile                                  |  14 +-
 net/lwip/Makefile                             |   5 +
 net/lwip/dhcp.c                               | 130 ++++++++
 net/lwip/eth_internal.h                       |  35 +++
 net/lwip/net-lwip.c                           | 289 ++++++++++++++++++
 net/lwip/tftp.c                               |  11 +
 21 files changed, 573 insertions(+), 62 deletions(-)
 create mode 100644 cmd/net-lwip.c
 create mode 100644 net/lwip/Makefile
 create mode 100644 net/lwip/dhcp.c
 create mode 100644 net/lwip/eth_internal.h
 create mode 100644 net/lwip/net-lwip.c
 create mode 100644 net/lwip/tftp.c
board/engicam/imx8mp/icore_mx8mp.c +1 -1
index e2ed70caa43..bfdc447c478 100644
@@ -33,7 +33,7 @@ static void setup_fec(void)
 	setbits_le32(&gpr->gpr[1], BIT(22));
 }
 
-#if CONFIG_IS_ENABLED(NET)
+#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
 int board_phy_config(struct phy_device *phydev)
 {
 	if (phydev->drv->config)
board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c +1 -1
index 112770ba493..c709d017483 100644
@@ -29,7 +29,7 @@ static void setup_fec(void)
 	setbits_le32(&gpr->gpr[1], BIT(22));
 }
 
-#if CONFIG_IS_ENABLED(NET)
+#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
 int board_phy_config(struct phy_device *phydev)
 {
 	if (phydev->drv->config)
board/ti/am335x/board.c +2 -1
index 681002ba1da..249c9fd2e7e 100644
@@ -900,7 +900,8 @@ int board_late_init(void)
 #endif
 
 /* CPSW plat */
-#if CONFIG_IS_ENABLED(NET) && !CONFIG_IS_ENABLED(OF_CONTROL)
+#if (CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)) && \
+    !CONFIG_IS_ENABLED(OF_CONTROL)
 struct cpsw_slave_data slave_data[] = {
 	{
 		.slave_reg_ofs  = CPSW_SLAVE0_OFFSET,
board/xilinx/common/board.c +2 -1
index 5e5eb49ddf3..b6a2381c909 100644
@@ -491,7 +491,8 @@ int board_late_init_xilinx(void)
 				ret |= env_set_by_index("uuid", id, uuid);
 			}
 
-			if (!CONFIG_IS_ENABLED(NET))
+			if (!(CONFIG_IS_ENABLED(NET) ||
+			      CONFIG_IS_ENABLED(NET_LWIP)))
 				continue;
 
 			for (i = 0; i < EEPROM_HDR_NO_OF_MAC_ADDR; i++) {
cmd/Kconfig +57 -43

147 lines not on this page · raw message

cmd/Makefile +5 -1
index 91227f1249c..1c8cc42503d 100644
@@ -127,7 +127,11 @@ obj-y += legacy-mtd-utils.o
 endif
 obj-$(CONFIG_CMD_MUX) += mux.o
 obj-$(CONFIG_CMD_NAND) += nand.o
-obj-$(CONFIG_CMD_NET) += net.o
+ifdef CONFIG_CMD_NET
+obj-$(CONFIG_NET) += net.o
+obj-$(CONFIG_NET_LWIP) += net-lwip.o
+CFLAGS_net-lwip.o := -I$(srctree)/lib/lwip/lwip/src/include -I$(srctree)/lib/lwip/u-boot
+endif
 obj-$(CONFIG_ENV_SUPPORT) += nvedit.o
 obj-$(CONFIG_CMD_NVEDIT_EFI) += nvedit_efi.o
 obj-$(CONFIG_CMD_ONENAND) += onenand.o
cmd/elf.c +1 -1
index 114f2caf7fa..6b49c613703 100644
@@ -133,7 +133,7 @@ int do_bootvx(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 	else
 		addr = hextoul(argv[1], NULL);
 
-#if defined(CONFIG_CMD_NET)
+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_LWIP)
 	/*
 	 * Check to see if we need to tftp the image ourselves
 	 * before starting
cmd/net-lwip.c new file +13 -0
new file mode 100644
index 00000000000..82edb5fd2e6
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* Copyright (C) 2024 Linaro Ltd. */
+
+#include <command.h>
+#include <net.h>
+
+#if defined(CONFIG_CMD_DHCP)
+U_BOOT_CMD(
+        dhcp,   3,      1,      do_dhcp,
+        "boot image via network using DHCP/TFTP protocol",
+        "[loadAddress] [[hostIPaddr:]bootfilename]"
+);
+#endif
common/board_r.c +2 -2
index 4faaa202421..49347370a1f 100644
@@ -472,7 +472,7 @@ static int initr_status_led(void)
 }
 #endif
 
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET)
 static int initr_net(void)
 {
 	puts("Net:   ");
@@ -738,7 +738,7 @@ static init_fnc_t init_sequence_r[] = {
 #ifdef CONFIG_PCI_ENDPOINT
 	pci_ep_init,
 #endif
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET)
 	INIT_FUNC_WATCHDOG_RESET
 	initr_net,
 #endif
common/usb_kbd.c +1 -1
index bbfee23bc26..36107a3b278 100644
@@ -423,7 +423,7 @@ static int usb_kbd_testc(struct stdio_dev *sdev)
 	 */
 	unsigned long poll_delay = CONFIG_SYS_HZ / 50;
 
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_LWIP)
 	/*
 	 * If net_busy_flag is 1, NET transfer is running,
 	 * then we check key-pressed every second (first check may be
drivers/net/Kconfig +1 -1
index 9c042808b44..25084b4103d 100644
@@ -97,7 +97,7 @@ config DSA_SANDBOX
 
 menuconfig NETDEVICES
 	bool "Network device support"
-	depends on NET
+	depends on NET || NET_LWIP
 	select DM_ETH
 	help
 	  You must select Y to enable any network device support
include/net-common.h +3 -0
index 6bc76658d9d..cbcac178c82 100644
@@ -118,6 +118,9 @@ extern int		net_restart_wrap;	/* Tried all network devices */
 extern uchar               *net_rx_packets[PKTBUFSRX]; /* Receive packets */
 extern const u8		net_bcast_ethaddr[ARP_HLEN];	/* Ethernet broadcast address */
 extern char	net_boot_file_name[1024];/* Boot File name */
+extern struct in_addr	net_ip;		/* Our    IP addr (0 = unknown) */
+/* Indicates whether the pxe path prefix / config file was specified in dhcp option */
+extern char *pxelinux_configfile;
 
 /**
  * compute_ip_checksum() - Compute IP checksum
include/net-legacy.h +0 -3
index 19c991e12f6..bdca904a0f8 100644
@@ -285,12 +285,9 @@ extern char	net_hostname[32];	/* Our hostname */
 #ifdef CONFIG_NET
 extern char	net_root_path[CONFIG_BOOTP_MAX_ROOT_PATH_LEN];	/* Our root path */
 #endif
-/* Indicates whether the pxe path prefix / config file was specified in dhcp option */
-extern char *pxelinux_configfile;
 /** END OF BOOTP EXTENTIONS **/
 extern u8		net_ethaddr[ARP_HLEN];		/* Our ethernet address */
 extern u8		net_server_ethaddr[ARP_HLEN];	/* Boot server enet address */
-extern struct in_addr	net_ip;		/* Our    IP addr (0 = unknown) */
 extern struct in_addr	net_server_ip;	/* Server IP addr (0 = unknown) */
 extern uchar		*net_tx_packet;		/* THE transmit packet */
 extern uchar		*net_rx_packets[PKTBUFSRX]; /* Receive packets */
include/net-lwip.h +3 -0
index 5c3f9e7e86c..cfd06726577 100644
@@ -10,5 +10,8 @@ struct netif *net_lwip_new_netif(struct udevice *udev);
 struct netif *net_lwip_new_netif_noip(struct udevice *udev);
 void net_lwip_remove_netif(struct netif *netif);
 struct netif *net_lwip_get_netif(void);
+int net_lwip_rx(struct udevice *udev, struct netif *netif);
+
+int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 
 #endif /* __NET_LWIP_H__ */
lib/tiny-printf.c +2 -1
index 64dee779c4a..cc1dfe61cf7 100644
@@ -269,7 +269,8 @@ static int _vprintf(struct printf_info *info, const char *fmt, va_list va)
 				}
 				break;
 			case 'p':
-				if (CONFIG_IS_ENABLED(NET) || _DEBUG) {
+				if (CONFIG_IS_ENABLED(NET) ||
+				    CONFIG_IS_ENABLED(NET_LWIP) || _DEBUG) {
 					pointer(info, fmt, va_arg(va, void *));
 					/*
 					 * Skip this because it pulls in _ctype which is
net/Makefile +9 -5
index a9cecee637a..68370595a8e 100644
@@ -12,11 +12,6 @@ obj-$(CONFIG_CMD_BOOTP) += bootp.o
 obj-$(CONFIG_CMD_CDP)  += cdp.o
 obj-$(CONFIG_CMD_DNS)  += dns.o
 obj-$(CONFIG_DM_DSA)   += dsa-uclass.o
-obj-$(CONFIG_$(SPL_)DM_ETH) += eth-uclass.o
-obj-$(CONFIG_$(SPL_TPL_)BOOTDEV_ETH) += eth_bootdev.o
-obj-$(CONFIG_DM_MDIO)  += mdio-uclass.o
-obj-$(CONFIG_DM_MDIO_MUX) += mdio-mux-uclass.o
-obj-$(CONFIG_$(SPL_)DM_ETH) += eth_common.o
 obj-$(CONFIG_CMD_LINK_LOCAL) += link_local.o
 obj-$(CONFIG_IPV6)     += ndisc.o
 obj-$(CONFIG_$(SPL_)DM_ETH) += net.o
@@ -43,4 +38,13 @@ CFLAGS_eth_common.o += -Wno-format-extra-args
 
 endif
 
+ifeq ($(filter y,$(CONFIG_NET) $(CONFIG_NET_LWIP)),y)
+obj-$(CONFIG_$(SPL_TPL_)BOOTDEV_ETH) += eth_bootdev.o
+obj-$(CONFIG_DM_MDIO)  += mdio-uclass.o
+obj-$(CONFIG_DM_MDIO_MUX) += mdio-mux-uclass.o
+obj-$(CONFIG_$(SPL_)DM_ETH) += eth-uclass.o
+obj-$(CONFIG_$(SPL_)DM_ETH) += eth_common.o
 obj-y += net-common.o
+endif
+
+obj-$(CONFIG_NET_LWIP) += lwip/
net/lwip/Makefile new file +5 -0
new file mode 100644
index 00000000000..4e92a101ddb
@@ -0,0 +1,5 @@
+ccflags-y += -I$(srctree)/lib/lwip/lwip/src/include -I$(srctree)/lib/lwip/u-boot
+
+obj-$(CONFIG_$(SPL_)DM_ETH) += net-lwip.o
+obj-$(CONFIG_CMD_DHCP) += dhcp.o
+obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
net/lwip/dhcp.c new file +130 -0

130 lines not on this page · raw message

net/lwip/eth_internal.h new file +35 -0
new file mode 100644
index 00000000000..0b829a8d388
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2001-2015
+ * Wolfgang Denk, DENX Software Engineering, [email protected].
+ * Joe Hershberger, National Instruments
+ */
+
+#ifndef __ETH_INTERNAL_H
+#define __ETH_INTERNAL_H
+
+/* Do init that is common to driver model and legacy networking */
+void eth_common_init(void);
+
+/**
+ * eth_env_set_enetaddr_by_index() - set the MAC address environment variable
+ *
+ * This sets up an environment variable with the given MAC address (@enetaddr).
+ * The environment variable to be set is defined by <@base_name><@index>addr.
+ * If @index is 0 it is omitted. For common Ethernet this means ethaddr,
+ * eth1addr, etc.
+ *
+ * @base_name:	Base name for variable, typically "eth"
+ * @index:	Index of interface being updated (>=0)
+ * @enetaddr:	Pointer to MAC address to put into the variable
+ * Return: 0 if OK, other value on error
+ */
+int eth_env_set_enetaddr_by_index(const char *base_name, int index,
+				 uchar *enetaddr);
+
+int eth_mac_skip(int index);
+void eth_current_changed(void);
+void eth_set_dev(struct udevice *dev);
+void eth_set_current_to_next(void);
+
+#endif
net/lwip/net-lwip.c new file +289 -0

289 lines not on this page · raw message

net/lwip/tftp.c new file +11 -0
new file mode 100644
index 00000000000..1fa246f55d9
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* Copyright (C) 2024 Linaro Ltd. */
+
+#include <command.h>
+#include <net-lwip.h>
+
+int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+{
+	/* Not implemented */
+	return CMD_RET_FAILURE;
+}
Signature · 1 line
2.40.1
#24 lore raw

Re: [PATCH v12 18/21] net: lwip: tftp: add support of blksize option to client

In reply to Jerome Forissier

Hi Jerome,

Quoted 65 lines · Jerome Forissier

The TFTP protocol uses a default block size of 512 bytes. This value is sub-optimal for ethernet devices, which have a MTU (Maximum Transmission Unit) of 1500 bytes. When taking into acount the overhead of the IP and UDP layers, this leaves 1468 bytes for the TFTP payload.

This patch introduces a new function: tftp_client_set_blksize() which may be used to change the block size from the default. It has to be called after tftp_client_init() and before tftp_get(). If the server does not support the option, the client will still accept to receive 512-byte blocks.

Submitted upstream: https://savannah.nongnu.org/patch/index.php?10462

---
 lib/lwip/lwip/src/apps/tftp/tftp.c            | 94 +++++++++++++++++--
 .../lwip/src/include/lwip/apps/tftp_client.h  |  1 +
 2 files changed, 89 insertions(+), 6 deletions(-)
lib/lwip/lwip/src/apps/tftp/tftp.c +7 -2
index 74fc1fbe586..8e0c071772a 100644
@@ -57,7 +57,7 @@
 #include "lwip/timeouts.h"
 #include "lwip/debug.h"
 
-#define TFTP_MAX_PAYLOAD_SIZE 512
+#define TFTP_DEFAULT_BLOCK_SIZE 512
 #define TFTP_HEADER_LENGTH    4
 
 #define TFTP_RRQ   1
@@ -65,6 +65,7 @@
 #define TFTP_DATA  3
 #define TFTP_ACK   4
 #define TFTP_ERROR 5
+#define TFTP_OACK  6
 
 enum tftp_error {
   TFTP_ERROR_FILE_NOT_FOUND    = 1,
@@ -88,9 +89,11 @@ struct tftp_state {
   int timer;
   int last_pkt;
   u16_t blknum;
+  u16_t blksize;
   u8_t retries;
   u8_t mode_write;
   u8_t tftp_mode;
+  bool wait_oack;
 };
 
 static struct tftp_state tftp_state;
@@ -137,10 +140,24 @@ send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname,
 {
   size_t fname_length = strlen(fname)+1;
   size_t mode_length = strlen(mode)+1;
-  struct pbuf* p = init_packet(opcode, 0, fname_length + mode_length - 2);
+  size_t blksize_length = 0;
+  struct pbuf* p;
   char* payload;
   err_t ret;
 
+  if (tftp_state.blksize) {

lib/lwip/lwip/src/apps/tftp/tftp.c send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname, · line 158

Quoted 10 lines
lib/lwip/lwip/src/apps/tftp/tftp.c +10 -0
+    blksize_length = 14; /* maximum (blksize is a u16_t): 'blksize\0XXXXX\0' */
+    if (tftp_state.blksize < 10000)
+           blksize_length--;
+    if (tftp_state.blksize < 1000)
+           blksize_length--;
+    if (tftp_state.blksize < 100)
+           blksize_length--;
+    if (tftp_state.blksize < 10)
+           blksize_length--;
+  }

I'd really prefer the alternative for this [0]. Since you havent changed it, make sure you queue it up if v12 gets merged

Quoted 4 lines
lib/lwip/lwip/src/apps/tftp/tftp.c +2 -0
+
+  p = init_packet(opcode, 0, fname_length + mode_length + blksize_length - 2);
   if (p == NULL) {
     return ERR_MEM;

[...]

Quoted 5 lines

--
2.40.1

[0] https://lore.kernel.org/u-boot/CAC_iWjJjsOZYZHB+019G8xs33+Bj2FeV8MB7FfhJ-C8v8uBNng@mail.gmail.com/

Thanks
/Ilias

#25 lore raw

Re: [PATCH v12 18/21] net: lwip: tftp: add support of blksize option to client

Quoted 68 lines · Ilias Apalodimas

Hi Jerome,

Quoted 64 lines · Jerome Forissier

The TFTP protocol uses a default block size of 512 bytes. This value is sub-optimal for ethernet devices, which have a MTU (Maximum Transmission Unit) of 1500 bytes. When taking into acount the overhead of the IP and UDP layers, this leaves 1468 bytes for the TFTP payload.

This patch introduces a new function: tftp_client_set_blksize() which may be used to change the block size from the default. It has to be called after tftp_client_init() and before tftp_get(). If the server does not support the option, the client will still accept to receive 512-byte blocks.

Submitted upstream: https://savannah.nongnu.org/patch/index.php?10462

---
 lib/lwip/lwip/src/apps/tftp/tftp.c            | 94 +++++++++++++++++--
 .../lwip/src/include/lwip/apps/tftp_client.h  |  1 +
 2 files changed, 89 insertions(+), 6 deletions(-)
lib/lwip/lwip/src/apps/tftp/tftp.c +6 -2
index 74fc1fbe586..8e0c071772a 100644
@@ -57,7 +57,7 @@
 #include "lwip/timeouts.h"
 #include "lwip/debug.h"
 
-#define TFTP_MAX_PAYLOAD_SIZE 512
+#define TFTP_DEFAULT_BLOCK_SIZE 512
 #define TFTP_HEADER_LENGTH    4
 
 #define TFTP_RRQ   1
@@ -65,6 +65,7 @@
 #define TFTP_DATA  3
 #define TFTP_ACK   4
 #define TFTP_ERROR 5
+#define TFTP_OACK  6
 
 enum tftp_error {
   TFTP_ERROR_FILE_NOT_FOUND    = 1,
@@ -88,9 +89,11 @@ struct tftp_state {
   int timer;
   int last_pkt;
   u16_t blknum;
+  u16_t blksize;
   u8_t retries;
   u8_t mode_write;
   u8_t tftp_mode;
+  bool wait_oack;
 };
 
 static struct tftp_state tftp_state;
@@ -137,10 +140,24 @@ send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname,
 {
   size_t fname_length = strlen(fname)+1;
   size_t mode_length = strlen(mode)+1;
-  struct pbuf* p = init_packet(opcode, 0, fname_length + mode_length - 2);
+  size_t blksize_length = 0;
+  struct pbuf* p;
   char* payload;
   err_t ret;
 
Quoted 14 lines

lib/lwip/lwip/src/apps/tftp/tftp.c send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname, · line 158

Quoted 11 lines
lib/lwip/lwip/src/apps/tftp/tftp.c +11 -0
+  if (tftp_state.blksize) {
+    blksize_length = 14; /* maximum (blksize is a u16_t): 'blksize\0XXXXX\0' */
+    if (tftp_state.blksize < 10000)
+           blksize_length--;
+    if (tftp_state.blksize < 1000)
+           blksize_length--;
+    if (tftp_state.blksize < 100)
+           blksize_length--;
+    if (tftp_state.blksize < 10)
+           blksize_length--;
+  }

I'd really prefer the alternative for this [0]. Since you havent changed it, make sure you queue it up if v12 gets merged

Sorry about that, I forgot. The code you propose in [0] needs a few
adjustments: >= not >, initialize cnt to 1 to account for one digit at least, and do nothing if tftp_state.blksize == 0. We can get rid of cnt and it still looks good and even better IMO. So how about this?

lib/lwip/lwip/src/apps/tftp/tftp.c +8 -10
index 8e0c071772a..7012aad9d91 100644
@@ -141,20 +141,18 @@ send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname,
   size_t fname_length = strlen(fname)+1;
   size_t mode_length = strlen(mode)+1;
   size_t blksize_length = 0;
+  int blksize = tftp_state.blksize;
   struct pbuf* p;
   char* payload;
   err_t ret;
 
-  if (tftp_state.blksize) {
-    blksize_length = 14; /* maximum (blksize is a u16_t): 'blksize\0XXXXX\0' */
-    if (tftp_state.blksize < 10000)
-	    blksize_length--;
-    if (tftp_state.blksize < 1000)
-	    blksize_length--;
-    if (tftp_state.blksize < 100)
-	    blksize_length--;
-    if (tftp_state.blksize < 10)
-	    blksize_length--;
+  if (blksize) {
+    /* "blksize\0.\0" with . = 1 digit */
+    blksize_length = strlen("blksize") + 1 + 1 + 1;
+    while (blksize >= 10) {
+      blksize /= 10;
+      blksize_length++;
+    }
 
Quoted 10 lines
Quoted 5 lines
lib/lwip/lwip/src/apps/tftp/tftp.c +2 -0
+
+  p = init_packet(opcode, 0, fname_length + mode_length + blksize_length - 2);
   if (p == NULL) {
     return ERR_MEM;

[...]

Quoted 2 lines
Quoted 8 lines
Quoted 3 lines

--
2.40.1

[0] https://lore.kernel.org/u-boot/CAC_iWjJjsOZYZHB+019G8xs33+Bj2FeV8MB7FfhJ-C8v8uBNng@mail.gmail.com/

Thanks
/Ilias

Thanks,

Signature · 1 line
Jerome
#26 lore raw

Re: [PATCH v12 18/21] net: lwip: tftp: add support of blksize option to client

Quoted 87 lines · Jerome Forissier
Quoted 68 lines · Ilias Apalodimas

Hi Jerome,

Quoted 64 lines · Jerome Forissier

The TFTP protocol uses a default block size of 512 bytes. This value is sub-optimal for ethernet devices, which have a MTU (Maximum Transmission Unit) of 1500 bytes. When taking into acount the overhead of the IP and UDP layers, this leaves 1468 bytes for the TFTP payload.

This patch introduces a new function: tftp_client_set_blksize() which may be used to change the block size from the default. It has to be called after tftp_client_init() and before tftp_get(). If the server does not support the option, the client will still accept to receive 512-byte blocks.

Submitted upstream: https://savannah.nongnu.org/patch/index.php?10462

---
 lib/lwip/lwip/src/apps/tftp/tftp.c            | 94 +++++++++++++++++--
 .../lwip/src/include/lwip/apps/tftp_client.h  |  1 +
 2 files changed, 89 insertions(+), 6 deletions(-)
lib/lwip/lwip/src/apps/tftp/tftp.c +6 -2
index 74fc1fbe586..8e0c071772a 100644
@@ -57,7 +57,7 @@
 #include "lwip/timeouts.h"
 #include "lwip/debug.h"
 
-#define TFTP_MAX_PAYLOAD_SIZE 512
+#define TFTP_DEFAULT_BLOCK_SIZE 512
 #define TFTP_HEADER_LENGTH    4
 
 #define TFTP_RRQ   1
@@ -65,6 +65,7 @@
 #define TFTP_DATA  3
 #define TFTP_ACK   4
 #define TFTP_ERROR 5
+#define TFTP_OACK  6
 
 enum tftp_error {
   TFTP_ERROR_FILE_NOT_FOUND    = 1,
@@ -88,9 +89,11 @@ struct tftp_state {
   int timer;
   int last_pkt;
   u16_t blknum;
+  u16_t blksize;
   u8_t retries;
   u8_t mode_write;
   u8_t tftp_mode;
+  bool wait_oack;
 };
 
 static struct tftp_state tftp_state;
@@ -137,10 +140,24 @@ send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname,
 {
   size_t fname_length = strlen(fname)+1;
   size_t mode_length = strlen(mode)+1;
-  struct pbuf* p = init_packet(opcode, 0, fname_length + mode_length - 2);
+  size_t blksize_length = 0;
+  struct pbuf* p;
   char* payload;
   err_t ret;
 
Quoted 14 lines

lib/lwip/lwip/src/apps/tftp/tftp.c send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname, · line 158

Quoted 11 lines
lib/lwip/lwip/src/apps/tftp/tftp.c +11 -0
+  if (tftp_state.blksize) {
+    blksize_length = 14; /* maximum (blksize is a u16_t): 'blksize\0XXXXX\0' */
+    if (tftp_state.blksize < 10000)
+           blksize_length--;
+    if (tftp_state.blksize < 1000)
+           blksize_length--;
+    if (tftp_state.blksize < 100)
+           blksize_length--;
+    if (tftp_state.blksize < 10)
+           blksize_length--;
+  }

I'd really prefer the alternative for this [0]. Since you havent changed it, make sure you queue it up if v12 gets merged

Quoted 2 lines

Sorry about that, I forgot. The code you propose in [0] needs a few
adjustments: >= not >,

There's a cnt++ in that code after the loop, so it's either with > and ++ or >=

Quoted 24 lines

initialize cnt to 1 to account for one digit at
least, and do nothing if tftp_state.blksize == 0. We can get rid of cnt and it still looks good and even better IMO. So how about this?

lib/lwip/lwip/src/apps/tftp/tftp.c +1 -7
index 8e0c071772a..7012aad9d91 100644
@@ -141,20 +141,18 @@ send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname,
   size_t fname_length = strlen(fname)+1;
   size_t mode_length = strlen(mode)+1;
   size_t blksize_length = 0;
+  int blksize = tftp_state.blksize;
   struct pbuf* p;
   char* payload;
   err_t ret;
 
-  if (tftp_state.blksize) {
-    blksize_length = 14; /* maximum (blksize is a u16_t): 'blksize\0XXXXX\0' */
-    if (tftp_state.blksize < 10000)
-           blksize_length--;
-    if (tftp_state.blksize < 1000)
-           blksize_length--;
-    if (tftp_state.blksize < 100)

lib/lwip/lwip/src/apps/tftp/tftp.c send_request(const ip_addr_t *addr, u16_t port, u16_t opcode, const char* fname, · line 155

Quoted 10 lines
lib/lwip/lwip/src/apps/tftp/tftp.c +7 -3
-           blksize_length--;
-    if (tftp_state.blksize < 10)
-           blksize_length--;
+  if (blksize) {
+    /* "blksize\0.\0" with . = 1 digit */
+    blksize_length = strlen("blksize") + 1 + 1 + 1;
+    while (blksize >= 10) {
+      blksize /= 10;
+      blksize_length++;
+    }

Yea that looks ok

Thanks
/Ilias

Quoted 23 lines
Quoted 11 lines
Quoted 6 lines
lib/lwip/lwip/src/apps/tftp/tftp.c +2 -0
+
+  p = init_packet(opcode, 0, fname_length + mode_length + blksize_length - 2);
   if (p == NULL) {
     return ERR_MEM;

[...]

Quoted 2 lines
Quoted 8 lines
Quoted 3 lines

--
2.40.1

[0] https://lore.kernel.org/u-boot/CAC_iWjJjsOZYZHB+019G8xs33+Bj2FeV8MB7FfhJ-C8v8uBNng@mail.gmail.com/

Thanks
/Ilias

Thanks,
--
Jerome

Acked-by on v12 15/21
#20 lore raw

Re: [PATCH v12 15/21] net: lwip: add wget command

In reply to Jerome Forissier
Quoted 478 lines · Jerome Forissier

Add support for the wget command with NET_LWIP. The command normally expects a URL: wget [loadaddr] url, but it also accepts the legacy
syntax: wget [loadaddr] [server:]file.
The server IP may alternatively be supplied via ${httpserverip} which has higher priority than ${serverip}.

Based on code initially developed by Maxim U.

---
 cmd/Kconfig        |  18 ++-
 cmd/net-lwip.c     |   8 +
 include/net-lwip.h |  18 +++
 net/lwip/Makefile  |   1 +
 net/lwip/wget.c    | 357 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 394 insertions(+), 8 deletions(-)
 create mode 100644 net/lwip/wget.c
cmd/Kconfig +10 -8
index 6a3920a162b..0e1f0ce1adc 100644
@@ -2016,14 +2016,6 @@ config SYS_DISABLE_AUTOLOAD
          is complete.  Enable this option to disable this behavior and instead
          require files to be loaded over the network by subsequent commands.
 
-config CMD_WGET
-       bool "wget"
-       select PROT_TCP
-       default y if SANDBOX
-       help
-         wget is a simple command to download kernel, or other files,
-         from a http server over TCP.
-
 config CMD_PING6
        bool "ping6"
        depends on IPV6
@@ -2131,6 +2123,16 @@ config CMD_TFTPBOOT
        help
          tftpboot - load file via network using TFTP protocol
 
+config CMD_WGET
+       bool "wget"
+       default y if SANDBOX
+       select PROT_TCP if NET
+       select PROT_TCP_LWIP if NET_LWIP
+       select PROT_DNS_LWIP if NET_LWIP
+       help
+         wget is a simple command to download kernel, or other files,
+         from a http server over TCP.
+
 endif  # if CMD_NET
 
 config CMD_PXE
cmd/net-lwip.c +8 -0
index c021da6a674..42f8bd6b259 100644
@@ -35,3 +35,11 @@ U_BOOT_CMD(
        "hostname [envvar]"
 );
 #endif
+
+#if defined(CONFIG_CMD_WGET)
+U_BOOT_CMD(
+       wget,   3,      1,      do_wget,
+       "boot image via network using HTTP protocol",
+       "[loadAddress] URL"
+);
+#endif
include/net-lwip.h +18 -0
index ff9d03b23e8..1c3583f82a1 100644
@@ -16,8 +16,26 @@ void net_lwip_remove_netif(struct netif *netif);
 struct netif *net_lwip_get_netif(void);
 int net_lwip_rx(struct udevice *udev, struct netif *netif);
 
+/**
+ * wget_with_dns() - runs dns host IP address resulution before wget
+ *
+ * @dst_addr:  destination address to download the file
+ * @uri:       uri string of target file of wget
+ * Return:     downloaded file size, negative if failed
+ */
+
+int wget_with_dns(ulong dst_addr, char *uri);
+/**
+ * wget_validate_uri() - varidate the uri
+ *
+ * @uri:       uri string of target file of wget
+ * Return:     true if uri is valid, false if uri is invalid
+ */
+bool wget_validate_uri(char *uri);
+
 int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ping(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
+int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
 
 #endif /* __NET_LWIP_H__ */
net/lwip/Makefile +1 -0
index 645d8a8c457..f2558f8763a 100644
@@ -5,3 +5,4 @@ obj-$(CONFIG_CMD_DHCP) += dhcp.o
 obj-$(CONFIG_CMD_DNS) += dns.o
 obj-$(CONFIG_CMD_PING) += ping.o
 obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
+obj-$(CONFIG_CMD_WGET) += wget.o
net/lwip/wget.c new file +357 -1
new file mode 100644
index 00000000000..b495ebd1aa9
@@ -0,0 +1,357 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* Copyright (C) 2024 Linaro Ltd. */
+
+#include <command.h>
+#include <console.h>
+#include <display_options.h>
+#include <efi_loader.h>
+#include <image.h>
+#include <lwip/apps/http_client.h>
+#include <lwip/timeouts.h>
+#include <mapmem.h>
+#include <net.h>
+#include <time.h>
+
+#define SERVER_NAME_SIZE 200
+#define HTTP_PORT_DEFAULT 80
+#define PROGRESS_PRINT_STEP_BYTES (100 * 1024)
+
+enum done_state {
+        NOT_DONE = 0,
+        SUCCESS = 1,
+        FAILURE = 2
+};
+
+struct wget_ctx {
+       char *path;
+       ulong daddr;
+       ulong saved_daddr;
+       ulong size;
+       ulong prevsize;
+       ulong start_time;
+       enum done_state done;
+};
+
+static int parse_url(char *url, char *host, u16 *port, char **path)
+{
+       char *p, *pp;
+       long lport;
+
+       p = strstr(url, "http://");
+       if (!p) {
+               log_err("only http:// is supported\n");
+               return -EINVAL;
+       }
+
+       p += strlen("http://");
+
+       /* Parse hostname */
+       pp = strchr(p, ':');
+       if (!pp)
+               pp = strchr(p, '/');
+       if (!pp)
+               return -EINVAL;
+
+       if (p + SERVER_NAME_SIZE <= pp)
+               return -EINVAL;
+
+       memcpy(host, p, pp - p);
+       host[pp - p] = '\0';
+
+       if (*pp == ':') {
+               /* Parse port number */
+               p = pp + 1;
+               lport = simple_strtol(p, &pp, 10);
+               if (pp && *pp != '/')
+                       return -EINVAL;
+               if (lport > 65535)
+                       return -EINVAL;
+               *port = (u16)lport;
+       } else {
+               *port = HTTP_PORT_DEFAULT;
+       }
+       if (*pp != '/')
+               return -EINVAL;
+       *path = pp;
+
+       return 0;
+}
+
+/*
+ * Legacy syntax support
+ * Convert [<server_name_or_ip>:]filename into a URL if needed
+ */
+static int parse_legacy_arg(char *arg, char *nurl, size_t rem)
+{
+       char *p = nurl;
+       size_t n;
+       char *col = strchr(arg, ':');
+       char *env;
+       char *server;
+       char *path;
+
+       if (strstr(arg, "http") == arg) {
+               n = snprintf(nurl, rem, "%s", arg);
+               if (n < 0 || n > rem)
+                       return -1;
+               return 0;
+       }
+
+       n = snprintf(p, rem, "%s", "http://");
+       if (n < 0 || n > rem)
+               return -1;
+       p += n;
+       rem -= n;
+
+       if (col) {
+               n = col - arg;
+               server = arg;
+               path = col + 1;
+       } else {
+               env = env_get("httpserverip");
+               if (!env)
+                       env = env_get("serverip");
+               if (!env) {
+                       log_err("error: httpserver/serverip has to be set\n");
+                       return -1;
+               }
+               n = strlen(env);
+               server = env;
+               path = arg;
+       }
+
+       if (rem < n)
+               return -1;
+       strncpy(p, server, n);
+       p += n;
+       rem -= n;
+       if (rem < 1)
+               return -1;
+       *p = '/';
+       p++;
+       rem--;
+       n = strlen(path);
+       if (rem < n)
+               return -1;
+       strncpy(p, path, n);
+       p += n;
+       rem -= n;
+       if (rem < 1)
+               return -1;
+       *p = '\0';
+
+       return 0;
+}
+
+static err_t httpc_recv_cb(void *arg, struct altcp_pcb *pcb, struct pbuf *pbuf,
+                          err_t err)
+{
+       struct wget_ctx *ctx = arg;
+       struct pbuf *buf;
+
+       if (!pbuf)
+               return ERR_BUF;
+
+       if (!ctx->start_time)
+               ctx->start_time = get_timer(0);
+
+       for (buf = pbuf; buf; buf = buf->next) {
+               memcpy((void *)ctx->daddr, buf->payload, buf->len);
+               ctx->daddr += buf->len;
+               ctx->size += buf->len;
+               if (ctx->size - ctx->prevsize > PROGRESS_PRINT_STEP_BYTES) {
+                       printf("#");
+                       ctx->prevsize = ctx->size;
+               }
+       }
+
+       altcp_recved(pcb, pbuf->tot_len);
+       pbuf_free(pbuf);
+       return ERR_OK;
+}
+
+static void httpc_result_cb(void *arg, httpc_result_t httpc_result,
+                           u32_t rx_content_len, u32_t srv_res, err_t err)
+{
+       struct wget_ctx *ctx = arg;
+       ulong elapsed;
+
+       if (httpc_result != HTTPC_RESULT_OK) {
+               log_err("\nHTTP client error %d\n", httpc_result);
+               ctx->done = FAILURE;
+               return;
+       }
+       if (srv_res != 200) {
+               log_err("\nHTTP server error %d\n", srv_res);
+               ctx->done = FAILURE;
+               return;
+       }
+
+       elapsed = get_timer(ctx->start_time);
+       if (!elapsed)
+               elapsed = 1;
+       if (rx_content_len > PROGRESS_PRINT_STEP_BYTES)
+               printf("\n");
+       printf("%u bytes transferred in %lu ms (", rx_content_len, elapsed);
+       print_size(rx_content_len / elapsed * 1000, "/s)\n");
+       printf("Bytes transferred = %lu (%lx hex)\n", ctx->size, ctx->size);
+       efi_set_bootdev("Net", "", ctx->path, map_sysmem(ctx->saved_daddr, 0),
+                       rx_content_len);
+       if (env_set_hex("filesize", rx_content_len) ||
+           env_set_hex("fileaddr", ctx->saved_daddr)) {
+               log_err("Could not set filesize or fileaddr\n");
+               ctx->done = FAILURE;
+               return;
+       }
+
+       ctx->done = SUCCESS;
+}
+
+static int wget_loop(struct udevice *udev, ulong dst_addr, char *uri)
+{
+       char server_name[SERVER_NAME_SIZE];
+       httpc_connection_t conn;
+       httpc_state_t *state;
+       struct netif *netif;
+       struct wget_ctx ctx;
+       char *path;
+       u16 port;
+
+       ctx.daddr = dst_addr;
+       ctx.saved_daddr = dst_addr;
+       ctx.done = NOT_DONE;
+       ctx.size = 0;
+       ctx.prevsize = 0;
+       ctx.start_time = 0;
+
+       if (parse_url(uri, server_name, &port, &path))
+               return CMD_RET_USAGE;
+
+       netif = net_lwip_new_netif(udev);
+       if (!netif)
+               return -1;
+
+       memset(&conn, 0, sizeof(conn));
+       conn.result_fn = httpc_result_cb;
+       ctx.path = path;
+       if (httpc_get_file_dns(server_name, port, path, &conn, httpc_recv_cb,
+                              &ctx, &state)) {
+               net_lwip_remove_netif(netif);
+               return CMD_RET_FAILURE;
+       }
+
+       while (!ctx.done) {
+               net_lwip_rx(udev, netif);
+               sys_check_timeouts();
+               if (ctrlc())
+                       break;
+       }
+
+       net_lwip_remove_netif(netif);
+
+       if (ctx.done == SUCCESS)
+               return 0;
+
+       return -1;
+}
+
+int wget_with_dns(ulong dst_addr, char *uri)
+{
+       eth_set_current();
+
+       return wget_loop(eth_get_dev(), dst_addr, uri);
+}
+
+int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
+{
+       char *end;
+       char *url;
+       ulong dst_addr;
+       char nurl[1024];
+
+       if (argc < 2 || argc > 3)
+               return CMD_RET_USAGE;
+
+       dst_addr = hextoul(argv[1], &end);
+        if (end == (argv[1] + strlen(argv[1]))) {
+               if (argc < 3)
+                       return CMD_RET_USAGE;
+               url = argv[2];
+       } else {
+               dst_addr = image_load_addr;
+               url = argv[1];
+       }
+
+       if (parse_legacy_arg(url, nurl, sizeof(nurl)))
+           return CMD_RET_FAILURE;
+
+       if (wget_with_dns(dst_addr, nurl))
+               return CMD_RET_FAILURE;
+
+       return CMD_RET_SUCCESS;
+}
+
+/**
+ * wget_validate_uri() - validate the uri for wget
+ *
+ * @uri:       uri string
+ *
+ * This function follows the current U-Boot wget implementation.
+ * scheme: only "http:" is supported
+ * authority:
+ *   - user information: not supported
+ *   - host: supported
+ *   - port: not supported(always use the default port)
+ *
+ * Uri is expected to be correctly percent encoded.
+ * This is the minimum check, control codes(0x1-0x19, 0x7F, except '\0')
+ * and space character(0x20) are not allowed.
+ *
+ * TODO: stricter uri conformance check
+ *
+ * Return:     true on success, false on failure
+ */
+bool wget_validate_uri(char *uri)
+{
+       char c;
+       bool ret = true;
+       char *str_copy, *s, *authority;
+
+       for (c = 0x1; c < 0x21; c++) {
+               if (strchr(uri, c)) {
+                       log_err("invalid character is used\n");
+                       return false;
+               }
+       }
+       if (strchr(uri, 0x7f)) {
+               log_err("invalid character is used\n");
+               return false;
+       }
+
+       if (strncmp(uri, "http://", 7)) {
+               log_err("only http:// is supported\n");
+               return false;
+       }
+       str_copy = strdup(uri);
+       if (!str_copy)
+               return false;
+
+       s = str_copy + strlen("http://");
+       authority = strsep(&s, "/");
+       if (!s) {
+               log_err("invalid uri, no file path\n");
+               ret = false;
+               goto out;
+       }
+       s = strchr(authority, '@');
+       if (s) {
+               log_err("user information is not supported\n");
+               ret = false;
+               goto out;
+       }
+
+out:
+       free(str_copy);
+
+       return ret;
+}
--
Quoted 2 lines

2.40.1

Acked-by on v12 12/21
#15 lore raw

Re: [PATCH v12 12/21] net: lwip: add ping command

In reply to Jerome Forissier
Quoted 267 lines · Jerome Forissier

Add support for the the ping command with NET_LWIP. The implementation is derived from lwIP's contrib/apps/ping/ping.c.

---
 cmd/Kconfig        |  11 +--
 cmd/net-lwip.c     |   8 ++
 include/net-lwip.h |   1 +
 net/lwip/Makefile  |   1 +
 net/lwip/ping.c    | 177 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 193 insertions(+), 5 deletions(-)
 create mode 100644 net/lwip/ping.c
cmd/Kconfig +6 -5
index 01b884f6f59..132835e43f8 100644
@@ -2024,11 +2024,6 @@ config CMD_WGET
          wget is a simple command to download kernel, or other files,
          from a http server over TCP.
 
-config CMD_PING
-       bool "ping"
-       help
-         Send ICMP ECHO_REQUEST to network host
-
 config CMD_PING6
        bool "ping6"
        depends on IPV6
@@ -2122,6 +2117,12 @@ config CMD_MDIO
          The MDIO interface is orthogonal to the MII interface and extends
          it by adding access to more registers through indirect addressing.
 
+config CMD_PING
+       bool "ping"
+       select PROT_RAW_LWIP if NET_LWIP
+       help
+         Send ICMP ECHO_REQUEST to network host
+
 config CMD_TFTPBOOT
        bool "tftp"
        select PROT_UDP_LWIP if NET_LWIP
cmd/net-lwip.c +8 -0
index 80f0872bb8f..feed719beef 100644
@@ -12,6 +12,14 @@ U_BOOT_CMD(
 );
 #endif
 
+#if defined(CONFIG_CMD_PING)
+U_BOOT_CMD(
+       ping,   2,      1,      do_ping,
+       "send ICMP ECHO_REQUEST to network host",
+       "pingAddress"
+);
+#endif
+
 #if defined(CONFIG_CMD_TFTPBOOT)
 U_BOOT_CMD(
        tftpboot,       3,      0,      do_tftpb,
include/net-lwip.h +1 -0
index 37744b0e2cd..9aa371e962c 100644
@@ -17,5 +17,6 @@ struct netif *net_lwip_get_netif(void);
 int net_lwip_rx(struct udevice *udev, struct netif *netif);
 
 int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
+int do_ping(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 
 #endif /* __NET_LWIP_H__ */
net/lwip/Makefile +1 -0
index 4e92a101ddb..b5af37a9b18 100644
@@ -2,4 +2,5 @@ ccflags-y += -I$(srctree)/lib/lwip/lwip/src/include -I$(srctree)/lib/lwip/u-boot
 
 obj-$(CONFIG_$(SPL_)DM_ETH) += net-lwip.o
 obj-$(CONFIG_CMD_DHCP) += dhcp.o
+obj-$(CONFIG_CMD_PING) += ping.o
 obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
net/lwip/ping.c new file +177 -1
new file mode 100644
index 00000000000..8dafa25959f
@@ -0,0 +1,177 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* Copyright (C) 2024 Linaro Ltd. */
+
+#include <command.h>
+#include <console.h>
+#include <dm/device.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <lwip/icmp.h>
+#include <lwip/inet_chksum.h>
+#include <lwip/raw.h>
+#include <lwip/timeouts.h>
+#include <net.h>
+#include <time.h>
+
+#define PING_DELAY_MS 1000
+#define PING_COUNT 5
+/* Ping identifier - must fit on a u16_t */
+#define PING_ID 0xAFAF
+
+struct ping_ctx {
+       ip_addr_t target;
+       struct raw_pcb *pcb;
+       struct icmp_echo_hdr *iecho;
+       uint16_t seq_num;
+       bool alive;
+};
+
+static u8_t ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p,
+                     const ip_addr_t *addr)
+{
+       struct ping_ctx *ctx = arg;
+       struct icmp_echo_hdr *iecho = ctx->iecho;
+
+       if (addr->addr != ctx->target.addr)
+               return 0;
+
+       if ((p->tot_len >= (IP_HLEN + sizeof(struct icmp_echo_hdr))) &&
+           pbuf_remove_header(p, IP_HLEN) == 0) {
+               iecho = (struct icmp_echo_hdr *)p->payload;
+
+               if ((iecho->id == PING_ID) &&
+                   (iecho->seqno == lwip_htons(ctx->seq_num))) {
+                       ctx->alive = true;
+                       printf("host %s is alive\n", ipaddr_ntoa(addr));
+                       pbuf_free(p);
+                       return 1; /* eat the packet */
+               }
+               /* not eaten, restore original packet */
+               pbuf_add_header(p, IP_HLEN);
+       }
+
+       return 0; /* don't eat the packet */
+}
+
+static int ping_raw_init(struct ping_ctx *ctx)
+{
+       ctx->pcb = raw_new(IP_PROTO_ICMP);
+       if (!ctx->pcb)
+               return -ENOMEM;
+
+       raw_recv(ctx->pcb, ping_recv, ctx);
+       raw_bind(ctx->pcb, IP_ADDR_ANY);
+
+       return 0;
+}
+
+static void ping_raw_stop(struct ping_ctx *ctx)
+{
+       if (ctx->pcb)
+               raw_remove(ctx->pcb);
+}
+
+static void ping_prepare_echo(struct ping_ctx *ctx)
+{
+       struct icmp_echo_hdr *iecho = ctx->iecho;
+
+       ICMPH_TYPE_SET(iecho, ICMP_ECHO);
+       ICMPH_CODE_SET(iecho, 0);
+       iecho->chksum = 0;
+       iecho->id = PING_ID;
+       iecho->seqno = lwip_htons(ctx->seq_num);
+
+       iecho->chksum = inet_chksum(iecho, sizeof(*iecho));
+}
+
+static void ping_send_icmp(struct ping_ctx *ctx)
+{
+       struct pbuf *p;
+       size_t ping_size = sizeof(struct icmp_echo_hdr);
+
+       p = pbuf_alloc(PBUF_IP, (u16_t)ping_size, PBUF_RAM);
+       if (!p)
+               return;
+
+       if ((p->len == p->tot_len) && !p->next) {
+               ctx->iecho = (struct icmp_echo_hdr *)p->payload;
+               ping_prepare_echo(ctx);
+               raw_sendto(ctx->pcb, p, &ctx->target);
+       }
+
+       pbuf_free(p);
+}
+
+static void ping_send(void *arg)
+{
+       struct ping_ctx *ctx = arg;
+
+       ctx->seq_num++;
+       if (ctx->seq_num <= PING_COUNT) {
+               ping_send_icmp(ctx);
+               sys_timeout(PING_DELAY_MS, ping_send, ctx);
+       }
+}
+
+static int ping_loop(struct udevice *udev, const ip_addr_t* addr)
+{
+       struct ping_ctx ctx = {};
+       struct netif *netif;
+       int ret;
+
+       netif = net_lwip_new_netif(udev);
+       if (!netif)
+               return CMD_RET_FAILURE;
+
+       printf("Using %s device\n", udev->name);
+
+       ret = ping_raw_init(&ctx);
+       if (ret < 0) {
+               net_lwip_remove_netif(netif);
+               return ret;
+       }
+
+       ctx.target = *addr;
+
+       ping_send(&ctx);
+
+       do {
+               sys_check_timeouts();
+               net_lwip_rx(udev, netif);
+               if (ctx.alive)
+                       break;
+               if (ctrlc()) {
+                       printf("\nAbort\n");
+                       break;
+               }
+       } while (ctx.seq_num <= PING_COUNT);
+
+       sys_untimeout(ping_send, &ctx);
+       ping_raw_stop(&ctx);
+
+       net_lwip_remove_netif(netif);
+
+       if (ctx.alive)
+               return 0;
+
+       printf("ping failed; host %s is not alive\n", ipaddr_ntoa(addr));
+       return -1;
+}
+
+int do_ping(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+{
+       ip_addr_t addr;
+
+       if (argc < 2)
+               return CMD_RET_USAGE;
+
+       if (!ipaddr_aton(argv[1], &addr))
+               return CMD_RET_USAGE;
+
+       eth_set_current();
+
+       if (ping_loop(eth_get_dev(), &addr) < 0)
+               return CMD_RET_FAILURE;
+
+       return CMD_RET_SUCCESS;
+}
--
Quoted 2 lines

2.40.1

Acked-by on v12 8/21
#10 lore raw

Re: [PATCH v12 08/21] net: lwip: build lwIP

In reply to Jerome Forissier
Quoted 330 lines · Jerome Forissier

Build the lwIP library when NET_LWIP is enabled. The following files are adaptation layers written specially for U-Boot:

lib/lwip/u-boot/arch/cc.h
lib/lwip/u-boot/arch/sys_arch.h (empty)
lib/lwip/u-boot/limits.h (empty)
lib/lwip/u-boot/lwipopts.h

They were initially contributed by Maxim in a previous RFC patch series.

The lwIP stack needs to be added as a Git subtree with the following command:

 $ git subtree add --squash --prefix lib/lwip/lwip \
   https://github.com/lwip-tcpip/lwip.git  STABLE-2_2_0_RELEASE
---
 lib/Makefile                    |   2 +
 lib/lwip/Makefile               |  55 +++++++++++
 lib/lwip/u-boot/arch/cc.h       |  45 +++++++++
 lib/lwip/u-boot/arch/sys_arch.h |   0
 lib/lwip/u-boot/limits.h        |   0
 lib/lwip/u-boot/lwipopts.h      | 157 ++++++++++++++++++++++++++++++++
 6 files changed, 259 insertions(+)
 create mode 100644 lib/lwip/Makefile
 create mode 100644 lib/lwip/u-boot/arch/cc.h
 create mode 100644 lib/lwip/u-boot/arch/sys_arch.h
 create mode 100644 lib/lwip/u-boot/limits.h
 create mode 100644 lib/lwip/u-boot/lwipopts.h
lib/Makefile +2 -0
index d300249f57c..00bfd11002a 100644
@@ -96,6 +96,8 @@ obj-$(CONFIG_LIBAVB) += libavb/
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += libfdt/
 obj-$(CONFIG_$(SPL_TPL_)OF_REAL) += fdtdec_common.o fdtdec.o
 
+obj-$(CONFIG_NET_LWIP) += lwip/
+
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16-ccitt.o
 obj-$(CONFIG_$(SPL_TPL_)HASH) += crc16-ccitt.o
lib/lwip/Makefile new file +55 -0
new file mode 100644
index 00000000000..dfcd700ca47
@@ -0,0 +1,55 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2024 Linaro Ltd.
+
+obj-y += \
+       lwip/src/api/api_lib.o \
+       lwip/src/api/api_msg.o \
+       lwip/src/api/err.o \
+       lwip/src/api/if_api.o \
+       lwip/src/api/netbuf.o \
+       lwip/src/api/netdb.o \
+       lwip/src/api/netifapi.o \
+       lwip/src/api/sockets.o \
+       lwip/src/api/tcpip.o \
+       lwip/src/apps/http/http_client.o \
+       lwip/src/apps/tftp/tftp.o \
+       lwip/src/core/altcp_alloc.o \
+       lwip/src/core/altcp.o \
+       lwip/src/core/altcp_tcp.o \
+       lwip/src/core/def.o \
+       lwip/src/core/dns.o \
+       lwip/src/core/inet_chksum.o \
+       lwip/src/core/init.o \
+       lwip/src/core/ip.o \
+       lwip/src/core/ipv4/acd.o \
+       lwip/src/core/ipv4/autoip.o \
+       lwip/src/core/ipv4/dhcp.o \
+       lwip/src/core/ipv4/etharp.o \
+       lwip/src/core/ipv4/icmp.o \
+       lwip/src/core/ipv4/igmp.o \
+       lwip/src/core/ipv4/ip4_addr.o \
+       lwip/src/core/ipv4/ip4.o \
+       lwip/src/core/ipv4/ip4_frag.o \
+       lwip/src/core/ipv6/dhcp6.o \
+       lwip/src/core/ipv6/ethip6.o \
+       lwip/src/core/ipv6/icmp6.o \
+       lwip/src/core/ipv6/inet6.o \
+       lwip/src/core/ipv6/ip6_addr.o \
+       lwip/src/core/ipv6/ip6.o \
+       lwip/src/core/ipv6/ip6_frag.o \
+       lwip/src/core/ipv6/mld6.o \
+       lwip/src/core/ipv6/nd6.o \
+       lwip/src/core/mem.o \
+       lwip/src/core/memp.o \
+       lwip/src/core/netif.o \
+       lwip/src/core/pbuf.o \
+       lwip/src/core/raw.o \
+       lwip/src/core/stats.o \
+       lwip/src/core/sys.o \
+       lwip/src/core/tcp.o \
+       lwip/src/core/tcp_in.o \
+       lwip/src/core/tcp_out.o \
+       lwip/src/core/timeouts.o \
+       lwip/src/core/udp.o \
+       lwip/src/netif/ethernet.o
lib/lwip/u-boot/arch/cc.h new file +45 -0
new file mode 100644
index 00000000000..563d3bfa98b
@@ -0,0 +1,45 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2023 Linaro Ltd. <[email protected]> */
+
+#ifndef LWIP_ARCH_CC_H
+#define LWIP_ARCH_CC_H
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <vsprintf.h>
+#include <rand.h>
+
+#define LWIP_ERRNO_INCLUDE <errno.h>
+
+#define LWIP_ERRNO_STDINCLUDE  1
+#define LWIP_NO_UNISTD_H 1
+#define LWIP_TIMEVAL_PRIVATE 1
+
+#ifdef CONFIG_LIB_RAND
+#define LWIP_RAND() ((u32_t)rand())
+#else
+#define LWIP_DNS_SECURE 0
+#endif
+
+/* different handling for unit test, normally not needed */
+#ifdef LWIP_NOASSERT_ON_ERROR
+#define LWIP_ERROR(message, expression, handler) do { if (!(expression)) { \
+                                               handler; }} while (0)
+#endif
+
+#define LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
+
+#define LWIP_PLATFORM_ASSERT(x) do {printf("Assertion \"%s\" failed at line %d in %s\n", \
+                                   x, __LINE__, __FILE__); } while (0)
+
+#define atoi(str) (int)dectoul(str, NULL)
+#define lwip_strnstr(a, b, c)  strstr(a, b)
+
+#define LWIP_ERR_T int
+#define LWIP_CONST_CAST(target_type, val) ((target_type)((uintptr_t)val))
+
+#if defined(CONFIG_SYS_BIG_ENDIAN)
+#define BYTE_ORDER BIG_ENDIAN
+#endif
+
+#endif /* LWIP_ARCH_CC_H */
lib/lwip/u-boot/arch/sys_arch.h new file +0 -0
new file mode 100644
index 00000000000..e69de29bb2d
lib/lwip/u-boot/limits.h new file +0 -0
new file mode 100644
index 00000000000..e69de29bb2d
lib/lwip/u-boot/lwipopts.h new file +157 -1
new file mode 100644
index 00000000000..9d618625fac
@@ -0,0 +1,157 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+/* Copyright (C) 2023 Linaro Ltd. <[email protected]> */
+
+#ifndef LWIP_UBOOT_LWIPOPTS_H
+#define LWIP_UBOOT_LWIPOPTS_H
+
+#if defined(CONFIG_LWIP_DEBUG)
+#define LWIP_DEBUG 1
+#define LWIP_DBG_MIN_LEVEL              LWIP_DBG_LEVEL_ALL
+#define LWIP_DBG_TYPES_ON               LWIP_DBG_ON
+#define ETHARP_DEBUG                    LWIP_DBG_ON
+#define NETIF_DEBUG                     LWIP_DBG_ON
+#define PBUF_DEBUG                      LWIP_DBG_OFF
+#define API_LIB_DEBUG                   LWIP_DBG_ON
+#define API_MSG_DEBUG                   LWIP_DBG_OFF
+#define SOCKETS_DEBUG                   LWIP_DBG_OFF
+#define ICMP_DEBUG                      LWIP_DBG_OFF
+#define IGMP_DEBUG                      LWIP_DBG_OFF
+#define INET_DEBUG                      LWIP_DBG_OFF
+#define IP_DEBUG                        LWIP_DBG_ON
+#define IP_REASS_DEBUG                  LWIP_DBG_OFF
+#define RAW_DEBUG                       LWIP_DBG_OFF
+#define MEM_DEBUG                       LWIP_DBG_OFF
+#define MEMP_DEBUG                      LWIP_DBG_OFF
+#define SYS_DEBUG                       LWIP_DBG_OFF
+#define TIMERS_DEBUG                    LWIP_DBG_ON
+#define TCP_DEBUG                       LWIP_DBG_OFF
+#define TCP_INPUT_DEBUG                 LWIP_DBG_OFF
+#define TCP_FR_DEBUG                    LWIP_DBG_OFF
+#define TCP_RTO_DEBUG                   LWIP_DBG_OFF
+#define TCP_CWND_DEBUG                  LWIP_DBG_OFF
+#define TCP_WND_DEBUG                   LWIP_DBG_OFF
+#define TCP_OUTPUT_DEBUG                LWIP_DBG_OFF
+#define TCP_RST_DEBUG                   LWIP_DBG_OFF
+#define TCP_QLEN_DEBUG                  LWIP_DBG_OFF
+#define UDP_DEBUG                       LWIP_DBG_OFF
+#define TCPIP_DEBUG                     LWIP_DBG_OFF
+#define SLIP_DEBUG                      LWIP_DBG_OFF
+#define DHCP_DEBUG                      LWIP_DBG_ON
+#define AUTOIP_DEBUG                    LWIP_DBG_ON
+#define DNS_DEBUG                       LWIP_DBG_ON
+#define IP6_DEBUG                       LWIP_DBG_OFF
+#define DHCP6_DEBUG                     LWIP_DBG_OFF
+#endif
+
+#define LWIP_TESTMODE                   0
+
+#if !defined(CONFIG_LWIP_ASSERT)
+#define LWIP_NOASSERT 1
+#define LWIP_ASSERT(message, assertion)
+#endif
+
+#include "lwip/debug.h"
+
+#define SYS_LIGHTWEIGHT_PROT            0
+#define NO_SYS                          1
+
+#define LWIP_IPV4                      1
+#define LWIP_IPV6                      0
+
+#define MEM_ALIGNMENT                   8
+
+#define MEMP_NUM_TCP_SEG                16
+#define PBUF_POOL_SIZE                  8
+
+#define LWIP_ARP                        1
+#define ARP_TABLE_SIZE                  4
+#define ARP_QUEUEING                    1
+
+#define IP_FORWARD                      0
+#define IP_OPTIONS_ALLOWED              1
+#define IP_REASSEMBLY                   0
+#define IP_FRAG                         0
+#define IP_REASS_MAXAGE                 3
+#define IP_REASS_MAX_PBUFS              4
+#define IP_FRAG_USES_STATIC_BUF         0
+
+#define IP_DEFAULT_TTL                  255
+
+#define LWIP_ICMP                       0
+
+#if defined(CONFIG_PROT_RAW_LWIP)
+#define LWIP_RAW                        1
+#else
+#define LWIP_RAW                       0
+#endif
+
+#if defined(CONFIG_PROT_DHCP_LWIP)
+#define LWIP_DHCP                       1
+#define LWIP_DHCP_BOOTP_FILE           1
+#else
+#define LWIP_DHCP                      0
+#endif
+
+#define LWIP_DHCP_DOES_ACD_CHECK       0
+
+#define LWIP_AUTOIP                     0
+
+#define LWIP_SNMP                       0
+
+#define LWIP_IGMP                       0
+
+#if defined(CONFIG_PROT_DNS_LWIP)
+#define LWIP_DNS                        1
+#define DNS_TABLE_SIZE                  1
+#else
+#define LWIP_DNS                        0
+#endif
+
+#if defined(CONFIG_PROT_UDP_LWIP)
+#define LWIP_UDP                        1
+#else
+#define LWIP_UDP                        0
+#endif
+
+#if defined(CONFIG_PROT_TCP_LWIP)
+#define LWIP_TCP                        1
+#define TCP_MSS                         1460
+#define TCP_WND                         CONFIG_LWIP_TCP_WND
+#define LWIP_WND_SCALE                  1
+#define TCP_RCV_SCALE                   0x7
+#define TCP_SND_BUF                     (2 * TCP_MSS)
+#ifdef CONFIG_PROT_TCP_SACK_LWIP
+#define LWIP_TCP_SACK_OUT               1
+#endif
+#else
+#define LWIP_TCP                        0
+#endif
+
+#define LWIP_LISTEN_BACKLOG             0
+
+#define PBUF_LINK_HLEN                  14
+#define PBUF_POOL_BUFSIZE               LWIP_MEM_ALIGN_SIZE(TCP_MSS + 40 + PBUF_LINK_HLEN)
+
+#define LWIP_HAVE_LOOPIF                0
+
+#define LWIP_NETCONN                    0
+#define LWIP_DISABLE_MEMP_SANITY_CHECKS 1
+
+#define LWIP_SOCKET                     0
+#define SO_REUSE                        0
+
+#define LWIP_STATS                      0
+
+#define PPP_SUPPORT                     0
+
+#define LWIP_TCPIP_CORE_LOCKING                0
+
+#define LWIP_NETIF_LOOPBACK            0
+
+/* use malloc instead of pool */
+#define MEMP_MEM_MALLOC                 1
+#define MEMP_MEM_INIT                  1
+#define MEM_LIBC_MALLOC                        1
+
+#endif /* LWIP_UBOOT_LWIPOPTS_H */
--
Quoted 2 lines

2.40.1

Acked-by on v12 13/21
#17 lore raw

Re: [PATCH v12 13/21] net: lwip: add dns command

In reply to Jerome Forissier
Quoted 216 lines · Jerome Forissier

Add CMD_DNS when NET_LWIP is enabled to provide the dns command using lwIP.

---
 cmd/Kconfig        |  11 ++--
 cmd/net-lwip.c     |   8 +++
 include/net-lwip.h |   1 +
 net/lwip/Makefile  |   1 +
 net/lwip/dns.c     | 127 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 143 insertions(+), 5 deletions(-)
 create mode 100644 net/lwip/dns.c
cmd/Kconfig +6 -5
index 132835e43f8..6a3920a162b 100644
@@ -2042,11 +2042,6 @@ config CMD_SNTP
        help
          Synchronize RTC via network
 
-config CMD_DNS
-       bool "dns"
-       help
-         Lookup the IP of a hostname
-
 config CMD_LINK_LOCAL
        bool "linklocal"
        select LIB_RAND
@@ -2094,6 +2089,12 @@ config CMD_DHCP
        help
          Boot image via network using DHCP/TFTP protocol
 
+config CMD_DNS
+       bool "dns"
+       select PROT_DNS_LWIP if NET_LWIP
+       help
+         Lookup the IP of a hostname
+
 config CMD_MII
        bool "mii"
        imply CMD_MDIO
cmd/net-lwip.c +8 -0
index feed719beef..c021da6a674 100644
@@ -27,3 +27,11 @@ U_BOOT_CMD(
        "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 #endif
+
+#if defined(CONFIG_CMD_DNS)
+U_BOOT_CMD(
+       dns,    3,      1,      do_dns,
+       "lookup the IP of a hostname",
+       "hostname [envvar]"
+);
+#endif
include/net-lwip.h +1 -0
index 9aa371e962c..ff9d03b23e8 100644
@@ -17,6 +17,7 @@ struct netif *net_lwip_get_netif(void);
 int net_lwip_rx(struct udevice *udev, struct netif *netif);
 
 int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
+int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ping(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 
 #endif /* __NET_LWIP_H__ */
net/lwip/Makefile +1 -0
index b5af37a9b18..645d8a8c457 100644
@@ -2,5 +2,6 @@ ccflags-y += -I$(srctree)/lib/lwip/lwip/src/include -I$(srctree)/lib/lwip/u-boot
 
 obj-$(CONFIG_$(SPL_)DM_ETH) += net-lwip.o
 obj-$(CONFIG_CMD_DHCP) += dhcp.o
+obj-$(CONFIG_CMD_DNS) += dns.o
 obj-$(CONFIG_CMD_PING) += ping.o
 obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
net/lwip/dns.c new file +127 -1
new file mode 100644
index 00000000000..4b937feaee1
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* Copyright (C) 2024 Linaro Ltd. */
+
+#include <command.h>
+#include <console.h>
+#include <lwip/dns.h>
+#include <lwip/timeouts.h>
+#include <net.h>
+#include <time.h>
+
+#define DNS_RESEND_MS 1000
+#define DNS_TIMEOUT_MS 10000
+
+struct dns_cb_arg {
+       ip_addr_t host_ipaddr;
+       const char *var;
+       bool done;
+};
+
+static void do_dns_tmr(void *arg)
+{
+       dns_tmr();
+}
+
+static void dns_cb(const char *name, const ip_addr_t *ipaddr, void *arg)
+{
+       struct dns_cb_arg *dns_cb_arg = arg;
+       char *ipstr = ip4addr_ntoa(ipaddr);
+
+       dns_cb_arg->done = true;
+
+       if (!ipaddr) {
+               printf("DNS: host not found\n");
+               dns_cb_arg->host_ipaddr.addr = 0;
+               return;
+       }
+
+       if (dns_cb_arg->var)
+               env_set(dns_cb_arg->var, ipstr);
+
+       printf("%s\n", ipstr);
+}
+
+static int dns_loop(struct udevice *udev, const char *name, const char *var)
+{
+       struct dns_cb_arg dns_cb_arg = { };
+       bool has_server = false;
+       struct netif *netif;
+       ip_addr_t ipaddr;
+       ip_addr_t ns;
+       ulong start;
+       char *nsenv;
+       int ret;
+
+       dns_cb_arg.var = var;
+
+       netif = net_lwip_new_netif(udev);
+       if (!netif)
+               return -1;
+
+       dns_init();
+
+       nsenv = env_get("dnsip");
+       if (nsenv && ipaddr_aton(nsenv, &ns)) {
+               dns_setserver(0, &ns);
+               has_server = true;
+       }
+
+       nsenv = env_get("dnsip2");
+       if (nsenv && ipaddr_aton(nsenv, &ns)) {
+               dns_setserver(1, &ns);
+               has_server = true;
+       }
+
+       if (!has_server) {
+               log_err("No valid name server (dnsip/dnsip2)\n");
+               net_lwip_remove_netif(netif);
+               return CMD_RET_FAILURE;
+       }
+
+       dns_cb_arg.done = false;
+
+       ret = dns_gethostbyname(name, &ipaddr, dns_cb, &dns_cb_arg);
+
+       if (ret == ERR_OK) {
+               dns_cb(name, &ipaddr, &dns_cb_arg);
+       } else if (ret == ERR_INPROGRESS) {
+               start = get_timer(0);
+               sys_timeout(DNS_RESEND_MS, do_dns_tmr, NULL);
+               do {
+                       net_lwip_rx(udev, netif);
+                       if (dns_cb_arg.done)
+                               break;
+                       sys_check_timeouts();
+                       if (ctrlc()) {
+                               printf("\nAbort\n");
+                               break;
+                       }
+               } while (get_timer(start) < DNS_TIMEOUT_MS);
+               sys_untimeout(do_dns_tmr, NULL);
+       }
+
+       net_lwip_remove_netif(netif);
+
+       if (dns_cb_arg.done && dns_cb_arg.host_ipaddr.addr != 0)
+               return CMD_RET_SUCCESS;
+
+       return CMD_RET_FAILURE;
+}
+
+int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+{
+       char *name;
+       char *var = NULL;
+
+       if (argc == 1 || argc > 3)
+               return CMD_RET_USAGE;
+
+       name = argv[1];
+
+       if (argc == 3)
+               var = argv[2];
+
+       eth_set_current();
+
+       return dns_loop(eth_get_dev(), name, var);
+}
--
Quoted 2 lines

2.40.1

Acked-by on v12 5/21
#6 lore raw

Re: [PATCH v12 05/21] net: introduce alternative implementation as net/lwip/

In reply to Jerome Forissier
Quoted 1,971 lines · Jerome Forissier

Prepare the introduction of the lwIP (lightweight IP) TCP/IP stack by adding a new net/lwip/ directory and the NET_LWIP symbol. Network support is either NO_NET, NET (legacy stack) or NET_LWIP. Subsequent commits will introduce the lwIP code, re-work the NETDEVICE integration and port some of the NET commands and features to lwIP.

SPL_NET cannot be enabled when NET_LWIP=y. SPL_NET pulls some symbols that are part of NET (such as arp_init(), arp_timeout_check(), arp_receive(), net_arp_wait_packet_ip()). lwIP support in SPL may be added later.

Similarly, DFU_TFTP and FASTBOOT are not compatible with NET_LWIP because of dependencies on net_loop(), tftp_timeout_ms, tftp_timeout_count_max and other NET things. Let's add a dependency on !NET_LWIP for now.

SANDBOX can select NET_LWIP but doing so will currently disable the eth dm tests as well as the wget tests which have strong dependencies on the NET code.

Other adjustments to Kconfig files are made to fix "unmet direct dependencies detected" for USB_FUNCTION_SDP and CMD_FASTBOOT when the default networking stack is set to NET_LWIP ("default NET_LWIP" instead of "default NET" in Kconfig).

The networking stack is now a choice between NO_NET, NET and NET_LWIP. Therefore '# CONFIG_NET is not set' should be 'CONFIG_NO_NET=y'. Adjust the defconfigs accordingly.

---
 Kconfig                                       | 29 +++++++++
 Makefile                                      |  2 +-
 boot/Kconfig                                  |  4 +-
 cmd/Kconfig                                   |  1 +
 common/Kconfig                                |  2 +-
 common/spl/Kconfig                            |  1 +
 configs/LicheePi_Zero_defconfig               |  2 +-
 configs/M5249EVB_defconfig                    |  2 +-
 configs/am335x_pdu001_defconfig               |  2 +-
 configs/am62ax_evm_r5_defconfig               |  2 +-
 configs/am62px_evm_r5_defconfig               |  2 +-
 configs/am62x_beagleplay_r5_defconfig         |  2 +-
 configs/amcore_defconfig                      |  2 +-
 configs/amd_versal2_mini_defconfig            |  2 +-
 configs/amd_versal2_mini_emmc_defconfig       |  2 +-
 configs/amd_versal2_mini_ospi_defconfig       |  2 +-
 configs/amd_versal2_mini_qspi_defconfig       |  2 +-
 configs/anbernic-rgxx3-rk3566_defconfig       |  2 +-
 configs/ap143_defconfig                       |  2 +-
 configs/ap152_defconfig                       |  2 +-
 configs/apple_m1_defconfig                    |  2 +-
 configs/astro_mcf5373l_defconfig              |  2 +-
 configs/at91sam9rlek_dataflash_defconfig      |  2 +-
 configs/at91sam9rlek_mmc_defconfig            |  2 +-
 configs/at91sam9rlek_nandflash_defconfig      |  2 +-
 configs/bcm7260_defconfig                     |  2 +-
 configs/bcm7445_defconfig                     |  2 +-
 configs/bcm968380gerg_ram_defconfig           |  2 +-
 configs/bcmns_defconfig                       |  2 +-
 configs/chromebook_samus_tpl_defconfig        |  2 +-
 configs/cortina_presidio-asic-base_defconfig  |  2 +-
 configs/cortina_presidio-asic-pnand_defconfig |  2 +-
 configs/durian_defconfig                      |  2 +-
 configs/e850-96_defconfig                     |  2 +-
 configs/ea-lpc3250devkitv2_defconfig          |  2 +-
 configs/efi-x86_app32_defconfig               |  2 +-
 configs/efi-x86_app64_defconfig               |  2 +-
 configs/emsdp_defconfig                       |  2 +-
 configs/evb-px5_defconfig                     |  2 +-
 configs/generic-rk3568_defconfig              |  2 +-
 configs/generic-rk3588_defconfig              |  2 +-
 configs/hc2910_2aghd05_defconfig              |  2 +-
 configs/igep00x0_defconfig                    |  2 +-
 configs/imx6q_bosch_acc_defconfig             |  2 +-
 configs/imx6ulz_smm_m2_defconfig              |  2 +-
 configs/iot_devkit_defconfig                  |  2 +-
 configs/j722s_evm_r5_defconfig                |  2 +-
 configs/legoev3_defconfig                     |  2 +-
 configs/mk808_defconfig                       |  2 +-
 configs/mx23evk_defconfig                     |  2 +-
 configs/mx28evk_defconfig                     |  2 +-
 configs/mx6memcal_defconfig                   |  2 +-
 configs/mx6ulz_14x14_evk_defconfig            |  2 +-
 configs/mx7ulp_com_defconfig                  |  2 +-
 configs/mx7ulp_evk_defconfig                  |  2 +-
 configs/mx7ulp_evk_plugin_defconfig           |  2 +-
 configs/netgear_cg3100d_ram_defconfig         |  2 +-
 configs/nsim_700_defconfig                    |  2 +-
 configs/nsim_700be_defconfig                  |  2 +-
 configs/nsim_hs38be_defconfig                 |  2 +-
 configs/openpiton_riscv64_defconfig           |  2 +-
 configs/openpiton_riscv64_spl_defconfig       |  2 +-
 configs/origen_defconfig                      |  2 +-
 configs/pe2201_defconfig                      |  2 +-
 configs/pinecube_defconfig                    |  2 +-
 configs/pm9261_defconfig                      |  2 +-
 configs/s5p4418_nanopi2_defconfig             |  2 +-
 configs/s5p_goni_defconfig                    |  2 +-
 configs/s5pc210_universal_defconfig           |  2 +-
 configs/sama5d27_giantboard_defconfig         |  2 +-
 configs/sama5d29_curiosity_mmc1_defconfig     |  2 +-
 configs/sama5d29_curiosity_mmc_defconfig      |  2 +-
 .../sama5d29_curiosity_qspiflash_defconfig    |  2 +-
 configs/sama7g54_curiosity_mmc_defconfig      |  2 +-
 .../sama7g54_curiosity_nandflash_defconfig    |  2 +-
 .../sama7g54_curiosity_qspiflash_defconfig    |  2 +-
 configs/sipeed_maix_bitm_defconfig            |  2 +-
 configs/sipeed_maix_smode_defconfig           |  2 +-
 configs/stemmy_defconfig                      |  2 +-
 configs/stm32f429-discovery_defconfig         |  2 +-
 configs/stm32f429-evaluation_defconfig        |  2 +-
 configs/stm32f469-discovery_defconfig         |  2 +-
 configs/stm32h743-disco_defconfig             |  2 +-
 configs/stm32h743-eval_defconfig              |  2 +-
 configs/stm32h750-art-pi_defconfig            |  2 +-
 configs/stm32mp25_defconfig                   |  2 +-
 configs/stmark2_defconfig                     |  2 +-
 configs/th1520_lpi4a_defconfig                |  2 +-
 configs/thunderx_88xx_defconfig               |  2 +-
 configs/tools-only_defconfig                  |  2 +-
 configs/topic_miami_defconfig                 |  2 +-
 configs/topic_miamilite_defconfig             |  2 +-
 configs/topic_miamiplus_defconfig             |  2 +-
 configs/total_compute_defconfig               |  2 +-
 configs/trats2_defconfig                      |  2 +-
 configs/trats_defconfig                       |  2 +-
 configs/xenguest_arm64_defconfig              |  2 +-
 configs/xenguest_arm64_virtio_defconfig       |  2 +-
 configs/xilinx_versal_mini_defconfig          |  2 +-
 configs/xilinx_versal_mini_emmc0_defconfig    |  2 +-
 configs/xilinx_versal_mini_emmc1_defconfig    |  2 +-
 configs/xilinx_versal_mini_ospi_defconfig     |  2 +-
 configs/xilinx_versal_mini_qspi_defconfig     |  2 +-
 configs/xilinx_versal_net_mini_defconfig      |  2 +-
 configs/xilinx_versal_net_mini_emmc_defconfig |  2 +-
 configs/xilinx_versal_net_mini_ospi_defconfig |  2 +-
 configs/xilinx_versal_net_mini_qspi_defconfig |  2 +-
 configs/xilinx_zynqmp_mini_defconfig          |  2 +-
 configs/xilinx_zynqmp_mini_emmc0_defconfig    |  2 +-
 configs/xilinx_zynqmp_mini_emmc1_defconfig    |  2 +-
 configs/xilinx_zynqmp_mini_nand_defconfig     |  2 +-
 .../xilinx_zynqmp_mini_nand_single_defconfig  |  2 +-
 configs/xilinx_zynqmp_mini_qspi_defconfig     |  2 +-
 configs/zynq_cse_nand_defconfig               |  2 +-
 configs/zynq_cse_nor_defconfig                |  2 +-
 configs/zynq_cse_qspi_defconfig               |  2 +-
 drivers/dfu/Kconfig                           |  1 +
 drivers/fastboot/Kconfig                      |  1 +
 drivers/net/Kconfig                           |  3 +
 drivers/net/phy/Kconfig                       |  2 +-
 drivers/usb/gadget/Kconfig                    |  2 +-
 net/Kconfig                                   | 61 ++++++++++---------
 net/Makefile                                  |  4 ++
 net/lwip/Kconfig                              | 49 +++++++++++++++
 test/cmd/Makefile                             |  2 +
 test/dm/Makefile                              |  2 +
 126 files changed, 241 insertions(+), 145 deletions(-)
 create mode 100644 net/lwip/Kconfig
Kconfig +29 -0
index 74e8ce5edfd..a206d1f8124 100644
@@ -758,8 +758,37 @@ source "dts/Kconfig"
 
 source "env/Kconfig"
 
+menu Networking
+
+choice
+       prompt "Networking stack"
+       default NET
+
+config NO_NET
+       bool "No networking support"
+
+config NET
+       bool "Legacy U-Boot networking stack"
+       imply NETDEVICES
+
+config NET_LWIP
+       bool "Use lwIP for networking stack"
+       imply NETDEVICES
+       help
+         Include networking support based on the lwIP (lightweight IP)
+         TCP/IP stack (https://nongnu.org/lwip). This is a replacement for
+         the default U-Boot network stack and applications located in net/
+         and enabled via CONFIG_NET as well as other pieces of code that
+         depend on CONFIG_NET (such as cmd/net.c enabled via CONFIG_CMD_NET).
+         Therefore the two symbols CONFIG_NET and CONFIG_NET_LWIP are mutually
+         exclusive.
+
+endchoice
+
 source "net/Kconfig"
 
+endmenu
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"
Makefile +1 -1
index da32324647b..75344ade751 100644
@@ -859,7 +859,7 @@ libs-$(CONFIG_OF_EMBED) += dts/
 libs-y += env/
 libs-y += lib/
 libs-y += fs/
-libs-y += net/
+libs-$(filter y,$(CONFIG_NET) $(CONFIG_NET_LWIP)) += net/
 libs-y += disk/
 libs-y += drivers/
 libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/
boot/Kconfig +3 -1
index 925afe06a19..1d50a83a2d2 100644
@@ -503,7 +503,8 @@ config BOOTMETH_ANDROID
        select ANDROID_AB
        select ANDROID_BOOT_IMAGE
        select CMD_BCB
-       select CMD_FASTBOOT
+       imply CMD_FASTBOOT
+       imply FASTBOOT if !NET_LWIP
        select PARTITION_TYPE_GUID
        select PARTITION_UUIDS
        help
@@ -559,6 +560,7 @@ config BOOTMETH_EXTLINUX_PXE
 config BOOTMETH_EFILOADER
        bool "Bootdev support for EFI boot"
        depends on EFI_BINARY_EXEC
+       imply CMD_TFTPBOOT if CMD_NET
        default y
        help
          Enables support for EFI boot using bootdevs. This makes the
cmd/Kconfig +1 -0
index dd33266cec7..49409ee9843 100644
@@ -1668,6 +1668,7 @@ config CMD_USB
 
 config CMD_USB_SDP
        bool "sdp"
+       depends on USB_GADGET_DOWNLOAD
        select USB_FUNCTION_SDP
        help
          Enables the command "sdp" which is used to have U-Boot emulating the
common/Kconfig +1 -1
index 957de0c5c02..0339b9e4c84 100644
@@ -424,7 +424,7 @@ config LOGF_FUNC_PAD
 
 config LOG_SYSLOG
        bool "Log output to syslog server"
-       depends on NET
+       depends on NET || NET_LWIP
        help
          Enables a log driver which broadcasts log records via UDP port 514
          to syslog servers.
common/spl/Kconfig +1 -0
index 2baf2ba7ccb..9a27eabd741 100644
@@ -1083,6 +1083,7 @@ config SPL_DM_SPI_FLASH
 
 config SPL_NET
        bool "Support networking"
+       depends on !NET_LWIP
        help
          Enable support for network devices (such as Ethernet) in SPL.
          This permits SPL to load U-Boot over a network link rather than
configs/LicheePi_Zero_defconfig +1 -1
index 009384eaf1b..c37c49ccbb1 100644
@@ -5,4 +5,4 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN8I_V3S=y
 CONFIG_DRAM_CLK=360
 # CONFIG_HAS_ARMV7_SECURE_BASE is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
configs/M5249EVB_defconfig +1 -1
index eac85b9c2d5..ed1446d81cb 100644
@@ -22,7 +22,7 @@ CONFIG_CMD_MX_CYCLIC=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/am335x_pdu001_defconfig +1 -1
index 54da31f45f7..09753fdbd06 100644
@@ -42,7 +42,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_OF_TRANSLATE=y
configs/am62ax_evm_r5_defconfig +1 -1
index 2fe6c49b80f..f386875a89f 100644
@@ -66,7 +66,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=1
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_REGMAP=y
configs/am62px_evm_r5_defconfig +1 -1
index 0cdbd30a760..5fed277d59d 100644
@@ -70,7 +70,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=1
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_DEVICE_REMOVE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/am62x_beagleplay_r5_defconfig +1 -1
index 0038747155e..9daee2a38bb 100644
@@ -67,7 +67,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_SPL_MULTI_DTB_FIT=y
 CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_REGMAP=y
configs/amcore_defconfig +1 -1
index f1f5201b30a..94c5379590d 100644
@@ -33,7 +33,7 @@ CONFIG_CMD_DIAG=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="AMCORE"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/amd_versal2_mini_defconfig +1 -1
index d4760e40223..ec1921aac39 100644
@@ -62,7 +62,7 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/amd_versal2_mini_emmc_defconfig +1 -1
index d2de379d07c..6d4b261606f 100644
@@ -54,7 +54,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
configs/amd_versal2_mini_ospi_defconfig +1 -1
index 22a8bfa8511..6c394432f5b 100644
@@ -56,7 +56,7 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/amd_versal2_mini_qspi_defconfig +1 -1
index de404b0f658..5c770a7530a 100644
@@ -56,7 +56,7 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/anbernic-rgxx3-rk3566_defconfig +1 -1
index 83337d68cc0..4dcf18e22ca 100644
@@ -42,7 +42,7 @@ CONFIG_OF_LIVE=y
 # CONFIG_OF_UPSTREAM is not set
 CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SPL_SYSCON=y
configs/ap143_defconfig +1 -1
index 9d503bdf61f..9083bf293f5 100644
@@ -46,7 +46,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-boot),64k(u-boot-env),6336k
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_ENV_SPI_MAX_HZ=25000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/ap152_defconfig +1 -1
index d830a85be69..0864bf46d54 100644
@@ -46,7 +46,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-boot),64k(u-boot-env),6336k
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_ENV_SPI_MAX_HZ=25000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/apple_m1_defconfig +1 -1
index 6a5affcaca9..2d685da8c9e 100644
@@ -11,7 +11,7 @@ CONFIG_SYS_PBSIZE=276
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_CMD_SELECT_FONT=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_APPLE_SPI_KEYB=y
 # CONFIG_MMC is not set
configs/astro_mcf5373l_defconfig +1 -1
index d1942c28971..8dd369d68a1 100644
@@ -27,7 +27,7 @@ CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_JFFS2=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_FPGA_ALTERA=y
 CONFIG_FPGA_CYCLON2=y
 CONFIG_FPGA_XILINX=y
configs/at91sam9rlek_dataflash_defconfig +1 -1
index 141e83fe5fd..9ebe2de1f2c 100644
@@ -41,7 +41,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GPIO=y
configs/at91sam9rlek_mmc_defconfig +1 -1
index d497d59a073..0fef493164e 100644
@@ -39,7 +39,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GPIO=y
configs/at91sam9rlek_nandflash_defconfig +1 -1
index 1bcdab8e5aa..c40e99817b9 100644
@@ -40,7 +40,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GPIO=y
configs/bcm7260_defconfig +1 -1
index aeb1f907199..ed026e58617 100644
@@ -36,7 +36,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCMSTB=y
 CONFIG_MTD=y
configs/bcm7445_defconfig +1 -1
index 03012056fbb..07294451100 100644
@@ -38,7 +38,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCMSTB=y
 CONFIG_MTD=y
configs/bcm968380gerg_ram_defconfig +1 -1
index 6c119eb42a6..053c459e05c 100644
@@ -41,7 +41,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
configs/bcmns_defconfig +1 -1
index 989017b96d9..c53c6fffbc4 100644
@@ -29,7 +29,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="NS"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
configs/chromebook_samus_tpl_defconfig +1 -1
index 1be57560f89..075e3f192a3 100644
@@ -74,7 +74,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
configs/cortina_presidio-asic-base_defconfig +1 -1
index 0cb33996fe7..d779e7d8e58 100644
@@ -32,7 +32,7 @@ CONFIG_CMD_TIMER=y
 CONFIG_CMD_SMC=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIVE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CORTINA_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_DM_SERIAL=y
configs/cortina_presidio-asic-pnand_defconfig +1 -1
index 093874d3023..cdb9681b32b 100644
@@ -33,7 +33,7 @@ CONFIG_CMD_TIMER=y
 CONFIG_CMD_SMC=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIVE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CORTINA_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
configs/durian_defconfig +1 -1
index 7765fe3a6a2..ea1d37e9db6 100644
@@ -28,7 +28,7 @@ CONFIG_SYS_PROMPT="durian#"
 CONFIG_CMD_PCI=y
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 # CONFIG_MMC is not set
configs/e850-96_defconfig +1 -1
index e5d90996234..5797c6cb1f9 100644
@@ -20,7 +20,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PART=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_RNG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK_EXYNOS850=y
 CONFIG_MMC_DW=y
 CONFIG_SOC_SAMSUNG=y
configs/ea-lpc3250devkitv2_defconfig +1 -1
index af9fc5f2f5c..c3af7afced1 100644
@@ -25,7 +25,7 @@ CONFIG_SYS_PROMPT="EA-LPC3250v2=> "
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_OF_CONTROL=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_LPC32XX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_LPC32XX=y
configs/efi-x86_app32_defconfig +1 -1
index 0025e56b5d7..c730945f4f9 100644
@@ -36,7 +36,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_GZIP is not set
configs/efi-x86_app64_defconfig +1 -1
index 1cc50b689c9..1831fb2d5a7 100644
@@ -40,7 +40,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CONSOLE_SCROLL_LINES=5
configs/emsdp_defconfig +1 -1
index efa5eecad0d..376862ad300 100644
@@ -30,7 +30,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="app.bin"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MMC=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_SNPS=y
configs/evb-px5_defconfig +1 -1
index 48f5b90a7dc..b08714437fd 100644
@@ -57,7 +57,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent"
 CONFIG_TPL_OF_PLATDATA=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_TPL_DM=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
configs/generic-rk3568_defconfig +1 -1
index 9b9eab6bad1..1d06f3411fe 100644
@@ -41,7 +41,7 @@ CONFIG_OF_LIVE=y
 # CONFIG_OF_UPSTREAM is not set
 CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SPL_SYSCON=y
configs/generic-rk3588_defconfig +1 -1
index f22277f935d..ebe883ed597 100644
@@ -35,7 +35,7 @@ CONFIG_OF_LIVE=y
 # CONFIG_OF_UPSTREAM is not set
 CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SPL_SYSCON=y
configs/hc2910_2aghd05_defconfig +1 -1
index d06f922ba57..d7cc7d18ed8 100644
@@ -37,7 +37,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
 # CONFIG_INPUT is not set
configs/igep00x0_defconfig +1 -1
index f1d9bb34aba..51c825d3fbe 100644
@@ -60,7 +60,7 @@ CONFIG_ENV_UBI_VOLUME="config"
 CONFIG_ENV_UBI_VOLUME_REDUND="config_r"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
configs/imx6q_bosch_acc_defconfig +1 -1
index 354b73752ad..a46b3250b2e 100644
@@ -82,7 +82,7 @@ CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_ENV_WRITEABLE_LIST=y
 CONFIG_ENV_ACCESS_IGNORE_FORCE=y
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
configs/imx6ulz_smm_m2_defconfig +1 -1
index 93ead4c373b..c2adff17abf 100644
@@ -42,7 +42,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
configs/iot_devkit_defconfig +1 -1
index ba275d04a11..5b7e131c9ac 100644
@@ -34,7 +34,7 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="app.bin"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MMC=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_SNPS=y
configs/j722s_evm_r5_defconfig +1 -1
index 74fbe52e588..e6a573d599d 100644
@@ -70,7 +70,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=1
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_DEVICE_REMOVE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/legoev3_defconfig +1 -1
index 34ef3493cac..60b7a84205c 100644
@@ -44,7 +44,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DAVINCI=y
configs/mk808_defconfig +1 -1
index 0610b51748e..dc9b12e5d8c 100644
@@ -68,7 +68,7 @@ CONFIG_OF_DTB_PROPS_REMOVE=y
 CONFIG_SPL_OF_PLATDATA=y
 CONFIG_TPL_OF_PLATDATA=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_TPL_DM=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
configs/mx23evk_defconfig +1 -1
index 793ba6add55..6152d930e3a 100644
@@ -41,7 +41,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_PINCTRL=y
configs/mx28evk_defconfig +1 -1
index a94d34d2c4c..951d506cec2 100644
@@ -47,7 +47,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_MXS_GPIO=y
 CONFIG_MMC_MXS=y
configs/mx6memcal_defconfig +1 -1
index 0c98c685565..bfde8b0cfb3 100644
@@ -39,7 +39,7 @@ CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 # CONFIG_MMC is not set
 CONFIG_FSL_USDHC=y
configs/mx6ulz_14x14_evk_defconfig +1 -1
index d57b47ef47a..2c13dd4dbc3 100644
@@ -36,7 +36,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
configs/mx7ulp_com_defconfig +1 -1
index eba57dd5fb1..a49cb2a728f 100644
@@ -33,7 +33,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
configs/mx7ulp_evk_defconfig +1 -1
index 262ee671fa0..12f13112b63 100644
@@ -33,7 +33,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
configs/mx7ulp_evk_plugin_defconfig +1 -1
index dc9fc50e150..8e05d394335 100644
@@ -31,7 +31,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
configs/netgear_cg3100d_ram_defconfig +1 -1
index 352b98fc0a5..377cc26f937 100644
@@ -39,7 +39,7 @@ CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_SPI=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
configs/nsim_700_defconfig +1 -1
index a46d2ee232a..d50e85a93fa 100644
@@ -25,7 +25,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
configs/nsim_700be_defconfig +1 -1
index 8dc31819fa1..4832195f6b4 100644
@@ -26,7 +26,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
configs/nsim_hs38be_defconfig +1 -1
index 5f21b31c84a..67de123d16b 100644
@@ -27,7 +27,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
configs/openpiton_riscv64_defconfig +1 -1
index a47214b0a42..1e693c621eb 100644
@@ -62,7 +62,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 # CONFIG_DOS_PARTITION is not set
 CONFIG_OF_EMBED=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CPU=y
 CONFIG_MMC=y
 # CONFIG_MMC_WRITE is not set
configs/openpiton_riscv64_spl_defconfig +1 -1
index d2eb891d69e..09054d93047 100644
@@ -78,7 +78,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 # CONFIG_DOS_PARTITION is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CPU=y
 CONFIG_MMC=y
 # CONFIG_MMC_WRITE is not set
configs/origen_defconfig +1 -1
index 9fd7bc103c7..c6cc17a0e03 100644
@@ -41,7 +41,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
 CONFIG_MMC_DW=y
configs/pe2201_defconfig +1 -1
index c28ceac0d45..72f6274ec41 100644
@@ -27,7 +27,7 @@ CONFIG_CMD_DM=y
 CONFIG_CMD_PCI=y
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 # CONFIG_MMC is not set
configs/pinecube_defconfig +1 -1
index 7cc0a862949..7567a6aa739 100644
@@ -9,7 +9,7 @@ CONFIG_DRAM_ODT_EN=y
 CONFIG_I2C0_ENABLE=y
 # CONFIG_HAS_ARMV7_SECURE_BASE is not set
 CONFIG_SPL_I2C=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x7f
configs/pm9261_defconfig +1 -1
index 9f4d434f3e2..026c6de3109 100644
@@ -37,7 +37,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:256k(u-boot)ro,64k(u-boot-env)
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_FLASH=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GPIO=y
configs/s5p4418_nanopi2_defconfig +1 -1
index 23862090df7..548963c933f 100644
@@ -49,7 +49,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_MMC_ENV_DEV=2
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_NEXELL=y
 CONFIG_MMC_DW=y
configs/s5p_goni_defconfig +1 -1
index 4316510541c..084e19e1258 100644
@@ -44,7 +44,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
 CONFIG_DM_I2C_GPIO=y
configs/s5pc210_universal_defconfig +1 -1
index 1607a31ce09..190ec961b97 100644
@@ -41,7 +41,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
 CONFIG_SYS_I2C_S3C24X0=y
configs/sama5d27_giantboard_defconfig +1 -1
index 4b29891d7d6..7cde865a12b 100644
@@ -64,7 +64,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
 CONFIG_ENV_IS_IN_FAT=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_CLK=y
configs/sama5d29_curiosity_mmc1_defconfig +1 -1
index 25ff38c94f3..c8976eec02d 100644
@@ -72,7 +72,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA5D29"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_UTMI=y
configs/sama5d29_curiosity_mmc_defconfig +1 -1
index e691839d1b9..7fe1a5b7552 100644
@@ -71,7 +71,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA5D29"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_UTMI=y
configs/sama5d29_curiosity_qspiflash_defconfig +1 -1
index f340423a46f..fd3551131db 100644
@@ -71,7 +71,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA5D29"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_UTMI=y
configs/sama7g54_curiosity_mmc_defconfig +1 -1
index 41c18452f9e..fec883e3c17 100644
@@ -75,7 +75,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA7G54"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_CCF=y
 CONFIG_CLK_AT91=y
configs/sama7g54_curiosity_nandflash_defconfig +1 -1
index 59e8189287b..7a4cdb0d2ab 100644
@@ -73,7 +73,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA7G54"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_CCF=y
 CONFIG_CLK_AT91=y
configs/sama7g54_curiosity_qspiflash_defconfig +1 -1
index 20cd7143cb8..adf5f558e2e 100644
@@ -74,7 +74,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="SAMA7G54"
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 CONFIG_CLK_CCF=y
 CONFIG_CLK_AT91=y
configs/sipeed_maix_bitm_defconfig +1 -1
index 0d74d63786d..b2e21c7d7ae 100644
@@ -19,7 +19,7 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi3:0"
 CONFIG_MTDPARTS_DEFAULT="nor0:1M(u-boot),0x1000@0xfff000(env)"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK_K210_SET_RATE=y
 # CONFIG_INPUT is not set
 CONFIG_FS_EXT4=y
configs/sipeed_maix_smode_defconfig +1 -1
index 4af6e3428ba..d838b252d53 100644
@@ -20,7 +20,7 @@ CONFIG_SYS_PBSIZE=276
 CONFIG_HUSH_PARSER=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi3:0"
 CONFIG_MTDPARTS_DEFAULT="nor0:1M(u-boot),0x1000@0xfff000(env)"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_INPUT is not set
 CONFIG_FS_EXT4=y
 CONFIG_FS_FAT=y
configs/stemmy_defconfig +1 -1
index 88e76087a69..631ccababf1 100644
@@ -29,7 +29,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PART=y
 CONFIG_CMD_GETTIME=y
 CONFIG_EFI_PARTITION=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x18100000
 CONFIG_FASTBOOT_FLASH=y
configs/stm32f429-discovery_defconfig +1 -1
index 5199e542208..77889336147 100644
@@ -27,7 +27,7 @@ CONFIG_CMD_IMLS=y
 CONFIG_CMD_TIMER=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_FLASH=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
configs/stm32f429-evaluation_defconfig +1 -1
index 412533e64f4..2fa8dc9faad 100644
@@ -25,7 +25,7 @@ CONFIG_CMD_TIMER=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
configs/stm32f469-discovery_defconfig +1 -1
index 93420cb5bb1..98399416fa5 100644
@@ -26,7 +26,7 @@ CONFIG_CMD_TIMER=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
configs/stm32h743-disco_defconfig +1 -1
index 376edc271a1..40fc9383aee 100644
@@ -30,6 +30,6 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_STM32_SDMMC2=y
 # CONFIG_PINCTRL_FULL is not set
configs/stm32h743-eval_defconfig +1 -1
index c249c4dd3d4..953e67e75bb 100644
@@ -30,6 +30,6 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_STM32_SDMMC2=y
 # CONFIG_PINCTRL_FULL is not set
configs/stm32h750-art-pi_defconfig +1 -1
index d66f440fdb7..4ca2d30e44c 100644
@@ -36,7 +36,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_DMA=y
 CONFIG_STM32_SDMMC2=y
 # CONFIG_PINCTRL_FULL is not set
configs/stm32mp25_defconfig +1 -1
index 85e6830d74e..d3f0c088157 100644
@@ -32,7 +32,7 @@ CONFIG_CMD_TIMER=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_LOG=y
 CONFIG_OF_LIVE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_GPIO_HOG=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_STM32F7=y
configs/stmark2_defconfig +1 -1
index f43a24c5b5e..79b21acd032 100644
@@ -39,7 +39,7 @@ CONFIG_ENV_SPI_CS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="stmark2"
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_FSL=y
 CONFIG_MTD=y
configs/th1520_lpi4a_defconfig +1 -1
index 98bcb220392..a57cedbfd11 100644
@@ -59,7 +59,7 @@ CONFIG_CMD_BOOTMENU=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_BLOCK_CACHE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/thunderx_88xx_defconfig +1 -1
index 3cc04afe69b..24ad84bd114 100644
@@ -33,7 +33,7 @@ CONFIG_SYS_PROMPT="ThunderX_88XX> "
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_MMC is not set
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
configs/tools-only_defconfig +1 -1
index 29554be7a65..8925e37e02a 100644
@@ -23,7 +23,7 @@ CONFIG_CMD_EXTENSION=n
 CONFIG_CMD_DATE=n
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_NET=n
+CONFIG_NO_NET=y
 CONFIG_ACPIGEN=n
 CONFIG_AXI=y
 CONFIG_AXI_SANDBOX=y
configs/topic_miami_defconfig +1 -1
index accdfe9a2ab..039ac710b38 100644
@@ -52,7 +52,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
configs/topic_miamilite_defconfig +1 -1
index 1c65f6ef632..b53f3a7150e 100644
@@ -52,7 +52,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
configs/topic_miamiplus_defconfig +1 -1
index 53bf0afd4d1..ba7f248db3b 100644
@@ -52,7 +52,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
configs/total_compute_defconfig +1 -1
index 5f21d2e367a..b3d2e5c88a6 100644
@@ -43,7 +43,7 @@ CONFIG_CMD_AVB=y
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_CLK=y
 # CONFIG_MMC_WRITE is not set
 CONFIG_ARM_PL180_MMCI=y
configs/trats2_defconfig +1 -1
index 3796aed1a93..f4afd373653 100644
@@ -43,7 +43,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
 CONFIG_DM_I2C_GPIO=y
configs/trats_defconfig +1 -1
index 91ad6b52297..14849d0e691 100644
@@ -42,7 +42,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
 CONFIG_DM_I2C_GPIO=y
configs/xenguest_arm64_defconfig +1 -1
index 64e8eb2d81f..e9a5219a7c4 100644
@@ -37,7 +37,7 @@ CONFIG_CMD_PVBLOCK=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_MMC is not set
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_DM_SERIAL=y
configs/xenguest_arm64_virtio_defconfig +1 -1
index b5e9b390683..acf131fc837 100644
@@ -42,7 +42,7 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_PARTITION_TYPE_GUID=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_MMC is not set
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_REGION_MULTI_ENTRY=y
configs/xilinx_versal_mini_defconfig +1 -1
index 229a38dc134..7388a787386 100644
@@ -58,7 +58,7 @@ CONFIG_SYS_ALT_MEMTEST=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_SLEEP is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_MMC is not set
 CONFIG_ARM_DCC=y
configs/xilinx_versal_mini_emmc0_defconfig +1 -1
index 8cd24f4ef81..a36e40dfbb3 100644
@@ -56,7 +56,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/xilinx_versal_mini_emmc1_defconfig +1 -1
index e868d476db5..3ae2115212a 100644
@@ -56,7 +56,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/xilinx_versal_mini_ospi_defconfig +1 -1
index eecbc12f809..d0ea2b6aebd 100644
@@ -52,7 +52,7 @@ CONFIG_SYS_PROMPT="Versal> "
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_MMC is not set
 CONFIG_MTD=y
configs/xilinx_versal_mini_qspi_defconfig +1 -1
index 3c0adcde34e..ef6eec075d0 100644
@@ -54,7 +54,7 @@ CONFIG_SYS_PROMPT="Versal> "
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/xilinx_versal_net_mini_defconfig +1 -1
index ba656c9441f..1640dfaff9e 100644
@@ -62,7 +62,7 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/xilinx_versal_net_mini_emmc_defconfig +1 -1
index 61b0b2a1c97..4c6159a4df1 100644
@@ -51,7 +51,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
configs/xilinx_versal_net_mini_ospi_defconfig +1 -1
index 6dc82bc0d96..071eeb8197b 100644
@@ -51,7 +51,7 @@ CONFIG_SYS_PROMPT="Versal NET> "
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_MMC is not set
 CONFIG_MTD=y
configs/xilinx_versal_net_mini_qspi_defconfig +1 -1
index 8d05d99a627..227c45df28c 100644
@@ -53,7 +53,7 @@ CONFIG_SYS_PROMPT="Versal NET> "
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
configs/xilinx_zynqmp_mini_defconfig +1 -1
index 1e76692e4da..7aab69c9e46 100644
@@ -54,7 +54,7 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_DM_MAILBOX is not set
 # CONFIG_MMC is not set
configs/xilinx_zynqmp_mini_emmc0_defconfig +1 -1
index 391b6f4207c..c56b1e830d6 100644
@@ -65,7 +65,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_DM_MAILBOX is not set
configs/xilinx_zynqmp_mini_emmc1_defconfig +1 -1
index 132210bee62..a8dbf0056da 100644
@@ -65,7 +65,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_DM_MAILBOX is not set
configs/xilinx_zynqmp_mini_nand_defconfig +1 -1
index 1de6b00923d..ba8f02c5b11 100644
@@ -49,7 +49,7 @@ CONFIG_CLOCKS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_DM_MAILBOX is not set
 # CONFIG_MMC is not set
configs/xilinx_zynqmp_mini_nand_single_defconfig +1 -1
index 8c67786f68d..a8a0055f2e5 100644
@@ -49,7 +49,7 @@ CONFIG_CLOCKS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_DM_MAILBOX is not set
 # CONFIG_MMC is not set
configs/xilinx_zynqmp_mini_qspi_defconfig +1 -1
index 1a2dafe4738..c08b10c6944 100644
@@ -68,7 +68,7 @@ CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_FIRMWARE is not set
configs/zynq_cse_nand_defconfig +1 -1
index d95e69712b0..80852f3507d 100644
@@ -70,7 +70,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_MMC is not set
configs/zynq_cse_nor_defconfig +1 -1
index fbec4a6ab25..326e4e3f7d1 100644
@@ -70,7 +70,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_MMC is not set
configs/zynq_cse_qspi_defconfig +1 -1
index 53c7edf8bb7..cd84df1e290 100644
@@ -79,7 +79,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
+CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_MMC is not set
drivers/dfu/Kconfig +1 -0
index aadd7e8cf7f..604386bb734 100644
@@ -20,6 +20,7 @@ config DFU_WRITE_ALT
 config DFU_TFTP
        bool "DFU via TFTP"
        depends on NETDEVICES
+       depends on !NET_LWIP
        select UPDATE_COMMON
        select DFU_OVER_TFTP
        help
drivers/fastboot/Kconfig +1 -0
index 70207573de2..1eb460f5a02 100644
@@ -1,5 +1,6 @@
 menu "Fastboot support"
        depends on CMDLINE
+       depends on !NET_LWIP
 
 config FASTBOOT
        bool
drivers/net/Kconfig +3 -0
index 2f39ec05ac7..9c042808b44 100644
@@ -48,6 +48,7 @@ config DM_DSA
        bool "Enable Driver Model for DSA switches"
        depends on DM_MDIO
        depends on PHY_FIXED
+       depends on !NET_LWIP
        help
          Enable driver model for DSA switches
 
@@ -342,6 +343,7 @@ config ESSEDMA
 
 config ETH_SANDBOX
        depends on SANDBOX
+       depends on NET
        default y
        bool "Sandbox: Mocked Ethernet driver"
        help
@@ -363,6 +365,7 @@ config ETH_SANDBOX_LWIP
 
 config ETH_SANDBOX_RAW
        depends on SANDBOX
+       depends on NET
        default y
        bool "Sandbox: Bridge to Linux Raw Sockets"
        help
drivers/net/phy/Kconfig +1 -1
index a9efc509814..13e73810ad6 100644
@@ -11,7 +11,7 @@ config MV88E6352_SWITCH
 
 menuconfig PHYLIB
        bool "Ethernet PHY (physical media interface) support"
-       depends on NET
+       depends on NET || NET_LWIP
        help
          Enable Ethernet PHY (physical media interface) support.
 
drivers/usb/gadget/Kconfig +1 -1
index 1694ad03183..010084ef7f3 100644
@@ -233,7 +233,7 @@ endif # USB_GADGET_DOWNLOAD
 
 config USB_ETHER
        bool "USB Ethernet Gadget"
-       depends on NET
+       depends on NET || NET_LWIP
        default y if ARCH_SUNXI && USB_MUSB_GADGET
        help
          Creates an Ethernet network device through a USB peripheral
net/Kconfig +31 -30
index 7cb80b880a9..16a9de47e94 100644
@@ -2,11 +2,6 @@
 # Network configuration
 #
 
-menuconfig NET
-       bool "Networking support"
-       default y
-       imply NETDEVICES
-
 if NET
 
 config ARP_TIMEOUT
@@ -26,15 +21,6 @@ config PROT_UDP
          Enable a generic udp framework that allows defining a custom
          handler for udp protocol.
 
-config BOOTDEV_ETH
-       bool "Enable bootdev for ethernet"
-       depends on BOOTSTD
-       default y
-       help
-         Provide a bootdev for ethernet so that is it possible to boot
-         an operationg system over the network, using the PXE (Preboot
-         Execution Environment) protocol.
-
 config BOOTP_SEND_HOSTNAME
        bool "Send hostname to DNS server"
        help
@@ -45,15 +31,6 @@ config BOOTP_SEND_HOSTNAME
          of the "hostname" environment variable is passed as
          option 12 to the DHCP server.
 
-config NET_RANDOM_ETHADDR
-       bool "Random ethaddr if unset"
-       help
-         Selecting this will allow the Ethernet interface to function even
-         when the ethaddr variable for that interface is unset.  In this case,
-         a random MAC address in the locally administered address space is
-         generated. It will be saved to the appropriate environment variable,
-         too.
-
 config NETCONSOLE
        bool "NetConsole support"
        help
@@ -255,11 +232,35 @@ config IPV6
 
 endif   # if NET
 
+source "net/lwip/Kconfig"
+
+if NET || NET_LWIP
+
+config BOOTDEV_ETH
+       bool "Enable bootdev for ethernet"
+       depends on BOOTSTD
+       default y
+       help
+         Provide a bootdev for ethernet so that is it possible to boot
+         an operating system over the network, using the PXE (Preboot
+         Execution Environment) protocol.
+
+config NET_RANDOM_ETHADDR
+       bool "Random ethaddr if unset"
+       help
+         Selecting this will allow the Ethernet interface to function even
+         when the ethaddr variable for that interface is unset.  In this case,
+         a random MAC address in the locally administered address space is
+         generated. It will be saved to the appropriate environment variable,
+         too.
+
+endif   # if NET || NET_LWIP
+
 config SYS_RX_ETH_BUFFER
-       int "Number of receive packet buffers"
-       default 4
-       help
-         Defines the number of Ethernet receive buffers. On some Ethernet
-         controllers it is recommended to set this value to 8 or even higher,
-         since all buffers can be full shortly after enabling the interface on
-         high Ethernet traffic.
+        int "Number of receive packet buffers"
+        default 4
+        help
+          Defines the number of Ethernet receive buffers. On some Ethernet
+          controllers it is recommended to set this value to 8 or even higher,
+          since all buffers can be full shortly after enabling the interface on
+          high Ethernet traffic.
net/Makefile +4 -0
index 64ab7ec740a..70eec8caf0d 100644
@@ -5,6 +5,8 @@
 
 #ccflags-y += -DDEBUG
 
+ifeq ($(CONFIG_NET),y)
+
 obj-$(CONFIG_NET)      += arp.o
 obj-$(CONFIG_CMD_BOOTP) += bootp.o
 obj-$(CONFIG_CMD_CDP)  += cdp.o
@@ -38,3 +40,5 @@ obj-$(CONFIG_CMD_WGET) += wget.o
 # sprintf(buf, index ? "foo%d" : "foo", index)
 # and this is intentional usage.
 CFLAGS_eth_common.o += -Wno-format-extra-args
+
+endif
net/lwip/Kconfig new file +49 -0
new file mode 100644
index 00000000000..8a67de4cf33
@@ -0,0 +1,49 @@
+#
+# Network configuration (with lwIP stack)
+#
+
+if NET_LWIP
+
+config LWIP_DEBUG
+       bool "Enable debug traces in the lwIP library"
+
+config LWIP_ASSERT
+       bool "Enable assertions in the lwIP library"
+
+config PROT_DHCP_LWIP
+       bool
+       select PROT_UDP_LWIP
+
+config PROT_DNS_LWIP
+       bool
+       select PROT_UDP_LWIP
+
+config PROT_RAW_LWIP
+       bool
+
+config PROT_TCP_LWIP
+       bool
+
+config PROT_TCP_SACK_LWIP
+       bool "TCP SACK support"
+       depends on PROT_TCP_LWIP
+       default y
+       help
+         TCP protocol with selective acknowledgements. Improves
+         file transfer speed in wget.
+
+config PROT_UDP_LWIP
+       bool
+
+config LWIP_TCP_WND
+       int "Value of TCP_WND"
+       default 8000 if ARCH_QEMU
+       default 3000000
+       help
+         Default value for TCP_WND in the lwIP configuration
+         Lower values result in slower wget transfer speeds in
+         general, especially when the latency on the network is high,
+         but QEMU with "-net user" needs no more than a few KB or the
+         transfer will stall and eventually time out.
+
+endif # NET_LWIP
test/cmd/Makefile +2 -0
index 8f2134998ad..dbee9b26405 100644
@@ -30,7 +30,9 @@ ifdef CONFIG_SANDBOX
 obj-$(CONFIG_CMD_MBR) += mbr.o
 obj-$(CONFIG_CMD_READ) += rw.o
 obj-$(CONFIG_CMD_SETEXPR) += setexpr.o
+ifdef CONFIG_NET
 obj-$(CONFIG_CMD_WGET) += wget.o
+endif
 obj-$(CONFIG_ARM_FFA_TRANSPORT) += armffa.o
 endif
 obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o
test/dm/Makefile +2 -1
index c12589d487c..03952441278 100644
@@ -48,7 +48,9 @@ obj-$(CONFIG_VIDEO_MIPI_DSI) += dsi_host.o
 obj-$(CONFIG_DM_DSA) += dsa.o
 obj-$(CONFIG_ECDSA_VERIFY) += ecdsa.o
 obj-$(CONFIG_EFI_MEDIA_SANDBOX) += efi_media.o
+ifdef CONFIG_NET
 obj-$(CONFIG_DM_ETH) += eth.o
+endif
 obj-$(CONFIG_EXTCON) += extcon.o
 ifneq ($(CONFIG_EFI_PARTITION),)
 obj-$(CONFIG_FASTBOOT_FLASH_MMC) += fastboot.o
--
Quoted 2 lines

2.40.1

#30 lore raw
In reply to Jerome Forissier
Quoted 19 lines · Jerome Forissier

This is a rework of a patch series by Maxim Uvarov: "net/lwip: add lwip library for the network stack" [1]. The goal is to introduce the lwIP TCP/IP stack [2] [3] as an alternative to the current implementation in net/, selectable with Kconfig, and ultimately keep only lwIP if possible. Some reasons for doing so are:
- Make the support of HTTPS in the wget command easier. Javier T. and Raymond M. (CC'd) have some additional lwIP and Mbed TLS patches to do so. With that it becomes possible to fetch and launch a distro installer such as Debian etc. using a secure, authenticated connection directly from the U-Boot shell. Several use cases:
* Authentication: prevent MITM attack (third party replacing the
binary with a different one)
* Confidentiality: prevent third parties from grabbing a copy of the
image as it is being downloaded
* Allow connection to servers that do not support plain HTTP anymore
(this is becoming more and more common on the Internet these days)
- Possibly benefit from additional features implemented in lwIP
- Less code to maintain in U-Boot

Quoted 5 lines

Prior to applying this series, the lwIP stack needs to be added as a Git subtree with the following command:

 $ git subtree add --squash --prefix lib/lwip/lwip \
   https://github.com/lwip-tcpip/lwip.git  STABLE-2_2_0_RELEASE 

Can you please rebase on top of current master and repost? For some
reason after I add the subtree and go for a b4 shazam on the series I
get:
Applying: net: lwip: tftp: bind to TFTP port only when in server mode
Using index info to reconstruct a base tree...
A lib/lwip/lwip/src/apps/tftp/tftp.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): lib/lwip/lwip/src/apps/tftp/tftp.c deleted in HEAD and modified in net: lwip: tftp: bind to TFTP port only when in server mode. Version net: lwip: tftp: bind to TFTP port only when in server mode of lib/lwip/lwip/src/apps/tftp/tftp.c left in tree. Patch failed at 0010 net: lwip: tftp: bind to TFTP port only when in server mode
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
error: Failed to merge in the changes.

Signature · 1 line
Tom