Introduce the lwIP network stack
Subsystems (12)
v8 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASE
Notes
1. A number of features are currently incompatible with NET_LWIP: SANDBOX, DFU_TFTP, FASTBOOT, SPL_NET, CMD_PXE. 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, a new QEMU configuration is introduced (qemu_arm64_lwip_defconfig) which is the same as qemu_arm64_defconfig but with NET_LWIP and CMD_*_LWIP enabled. Tests are added to test/py/tests/test_net.py for that configuration.
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.
[1] https://lore.kernel.org/all/[email protected]/
[2] https://www.nongnu.org/lwip/
[3] https://en.wikipedia.org/wiki/LwIP
Jerome Forissier (22):
flash: prefix error codes with FL_
net: wget: removed unused function wget_success()
net: wget: allow EFI boot
net: introduce alternative implementation as net-lwip/
configs: replace '# CONFIG_NET is not set' with CONFIG_NO_NET=y
net: fec_mxc_init(): do not ignore return status of fec_open()
net: split include/net.h into net{,-common,-legacy,-lwip}.h
net: eth-uclass: add function eth_start_udev()
net-lwip: build lwIP
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: 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
lwip: tftp: add support of blksize option to client
net-lwip: add TFTP_BLOCKSIZE
CI: add qemu_arm64_lwip to the test matrix
test/py: add HTTP (wget) test for the EFI loader
MAINTAINERS: net-lwip: add myself as a maintainer
Jonathan Humphreys (1):
net-lwip: lwIP wget supports user defined port in the uri, so allow
it.
.azure-pipelines.yml | 7 + Kconfig | 30 + MAINTAINERS | 11 + Makefile | 4 +- board/cobra5272/flash.c | 26 +- board/engicam/imx8mp/icore_mx8mp.c | 2 +- board/freescale/m5253demo/flash.c | 6 +- .../imx8mp_debix_model_a.c | 2 +- board/ti/am335x/board.c | 3 +- board/xilinx/common/board.c | 3 +- boot/Kconfig | 4 +- cmd/Kconfig | 129 ++- 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/flash.c | 44 +- 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/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/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 | 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/mtd/altera_qspi.c | 4 +- drivers/mtd/cfi_flash.c | 36 +- drivers/net/Kconfig | 3 +- drivers/net/fec_mxc.c | 3 +- drivers/net/phy/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 2 +- include/flash.h | 20 +- include/net-common.h | 432 ++++++++ include/net-legacy.h | 613 ++++++++++++ include/net-lwip.h | 37 + include/net.h | 943 +----------------- lib/Makefile | 2 + lib/lwip/Makefile | 55 + lib/lwip/lwip/src/apps/tftp/tftp.c | 94 +- .../lwip/src/include/lwip/apps/tftp_client.h | 1 + lib/lwip/u-boot/arch/cc.h | 43 + 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 | 19 +- net/eth-uclass.c | 38 +- net/lwip/Kconfig | 34 + net/lwip/Makefile | 8 + net/lwip/dhcp.c | 136 +++ net/lwip/dns.c | 127 +++ net/lwip/eth_internal.h | 35 + net/lwip/net-lwip.c | 292 ++++++ net/lwip/ping.c | 177 ++++ net/lwip/tftp.c | 282 ++++++ net/lwip/wget.c | 355 +++++++ net/wget.c | 11 +- test/py/tests/test_efi_loader.py | 52 +- 165 files changed, 3495 insertions(+), 1388 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 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
Signature · 1 line
2.40.1
PATCH v8 2/23 net: wget: removed unused function wget_success()
wget_success() is used nowhere so remove it.
--- net/wget.c | 7 ------- 1 file changed, 7 deletions(-)
net/wget.c +0 -7
@@ -199,13 +199,6 @@ void wget_fail(char *error_message, unsigned int tcp_seq_num,wget_send (action, tcp_seq_num, tcp_ack_num,0 ); } -void wget_success (u8 action,unsigned int tcp_seq_num, -unsigned int tcp_ack_num,int len,int packets) -{ -printf ("Packets received %d, Transfer Successful\n" , packets); -wget_send (action, tcp_seq_num, tcp_ack_num, len); -} -/* * Interfaces of U-BOOT */
Signature · 1 line
2.40.1
PATCH v8 1/23 flash: prefix error codes with FL_
In reply to Jerome ForissierPrefix the flash status codes (ERR_*) with FL_ in order to avoid clashes with third-party libraries. Case in point: including the lwIP library header file <lwip/err.h> which defines err_enum_t as an enum with values being ERR_*.
--- board/cobra5272/flash.c | 26 +++++++++--------- board/freescale/m5253demo/flash.c | 6 ++--- common/flash.c | 44 +++++++++++++++---------------- drivers/mtd/cfi_flash.c | 36 ++++++++++++------------- include/flash.h | 20 +++++++------- 5 files changed, 66 insertions(+), 66 deletions(-)
board/cobra5272/flash.c +13 -13
@@ -135,22 +135,22 @@ int flash_erase(flash_info_t *info, int s_first, int s_last) {ulong result;int iflag, cflag, prot, sect; -int rc =ERR_OK ; +int rc =FL_ERR_OK ;int chip1;ulong start;/* first look for protection bits */ if (info->flash_id ==FLASH_UNKNOWN ) -return ERR_UNKNOWN_FLASH_TYPE ; +return FL_ERR_UNKNOWN_FLASH_TYPE ;if ((s_first <0 ) || (s_first > s_last)) { -return ERR_INVAL ; +return FL_ERR_INVAL ; }if ((info->flash_id &FLASH_VENDMASK ) != (AMD_MANUFACT &FLASH_VENDMASK )) { -return ERR_UNKNOWN_FLASH_VENDOR ; +return FL_ERR_UNKNOWN_FLASH_VENDOR ; } prot =0 ;
@@ -160,7 +160,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last) } }if (prot) -return ERR_PROTECTED ; +return FL_ERR_PROTECTED ;/* * Disable interrupts which might cause a timeout
@@ -217,11 +217,11 @@ int flash_erase(flash_info_t *info, int s_first, int s_last)MEM_FLASH_ADDR1 =CMD_READ_ARRAY ;if (chip1 ==ERR ) { - rc =ERR_PROG_ERROR ; + rc =FL_ERR_PROG_ERROR ; goto outahere; }if (chip1 ==TMO ) { - rc =ERR_TIMEOUT ; + rc =FL_ERR_TIMEOUT ; goto outahere; }
@@ -252,7 +252,7 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) {volatile u16 *addr = (volatile u16 *) dest;ulong result; -int rc =ERR_OK ; +int rc =FL_ERR_OK ;int cflag, iflag;int chip1;ulong start;
@@ -262,7 +262,7 @@ static int write_word(flash_info_t *info, ulong dest, ulong data)*/ result = *addr;if ((result & data) != data) -return ERR_NOT_ERASED ; +return FL_ERR_NOT_ERASED ;/* * Disable interrupts which might cause a timeout
@@ -302,7 +302,7 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) *addr =CMD_READ_ARRAY ;if (chip1 ==ERR || *addr != data) - rc =ERR_PROG_ERROR ; + rc =FL_ERR_PROG_ERROR ;if (iflag)enable_interrupts ();
@@ -320,13 +320,13 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)if (addr &1 ) {printf ("unaligned destination not supported\n" ); -return ERR_ALIGN ; +return FL_ERR_ALIGN ; }#if 0 if (cnt &1 ) {printf ("odd transfer sizes not supported\n" ); -return ERR_ALIGN ; +return FL_ERR_ALIGN ; }#endif
@@ -364,5 +364,5 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) cnt -=1 ; } -return ERR_OK ; +return FL_ERR_OK ; }
board/freescale/m5253demo/flash.c +3 -3
@@ -72,7 +72,7 @@ int flash_get_offsets(ulong base, flash_info_t * info) } } -return ERR_OK ; +return FL_ERR_OK ; }void flash_print_info (flash_info_t * info)
@@ -369,9 +369,9 @@ int write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt) }if (cnt ==0 ) -return ERR_OK ; +return FL_ERR_OK ; -return ERR_OK ; +return FL_ERR_OK ; }/*-----------------------------------------------------------------------
common/flash.c +22 -22
97 lines not on this page · raw message
drivers/mtd/cfi_flash.c +18 -18
@@ -593,11 +593,11 @@ static int flash_status_check(flash_info_t *info, flash_sect_t sector, flash_read_long(info, sector, 0));flash_write_cmd (info, sector,0 , info->cmd_reset);udelay (1 ); -return ERR_TIMEOUT ; +return FL_ERR_TIMEOUT ; }udelay (1 );/* also triggers watchdog */ } -return ERR_OK ; +return FL_ERR_OK ; }/*-----------------------------------------------------------------------
@@ -616,9 +616,9 @@ static int flash_full_status_check(flash_info_t *info, flash_sect_t sector,case CFI_CMDSET_INTEL_PROG_REGIONS :case CFI_CMDSET_INTEL_EXTENDED :case CFI_CMDSET_INTEL_STANDARD : -if (retcode ==ERR_OK && +if (retcode ==FL_ERR_OK && !flash_isset (info, sector,0 ,FLASH_STATUS_DONE )) { - retcode =ERR_INVAL ; + retcode =FL_ERR_INVAL ;printf ("Flash %s error at address %lx\n" , prompt, info->start[sector]); if (flash_isset(info, sector, 0, FLASH_STATUS_ECLBS |
@@ -627,14 +627,14 @@ static int flash_full_status_check(flash_info_t *info, flash_sect_t sector, }else if (flash_isset (info, sector,0 ,FLASH_STATUS_ECLBS )) {puts ("Block Erase Error.\n" ); - retcode =ERR_NOT_ERASED ; + retcode =FL_ERR_NOT_ERASED ; }else if (flash_isset (info, sector,0 ,FLASH_STATUS_PSLBS )) {puts ("Locking Error\n" ); }if (flash_isset (info, sector,0 ,FLASH_STATUS_DPS )) {puts ("Block locked.\n" ); - retcode =ERR_PROTECTED ; + retcode =FL_ERR_PROTECTED ; }if (flash_isset (info, sector,0 ,FLASH_STATUS_VPENS ))puts ("Vpp Low Error.\n" );
@@ -702,12 +702,12 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,if (get_timer (start) > tout) {printf ("Flash %s timeout at address %lx data %lx\n" , prompt, (ulong )dst, (ulong )flash_read8 (dst)); -return ERR_TIMEOUT ; +return FL_ERR_TIMEOUT ; } udelay(1); /* also triggers watchdog */ }#endif /* CONFIG_SYS_CFI_FLASH_STATUS_POLL */ -return ERR_OK ; +return FL_ERR_OK ; }/*-----------------------------------------------------------------------
@@ -810,7 +810,7 @@ static int flash_write_cfiword(flash_info_t *info, ulong dest, cfiword_t cword)break ; }if (!flag) -return ERR_NOT_ERASED ; +return FL_ERR_NOT_ERASED ;/* Disable interrupts which might cause a timeout here */ flag =disable_interrupts ();
@@ -899,7 +899,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, shift =3 ;break ;default : - retcode =ERR_INVAL ; + retcode =FL_ERR_INVAL ; goto out_unmap; }
@@ -930,7 +930,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, } }if (!flag) { - retcode =ERR_NOT_ERASED ; + retcode =FL_ERR_NOT_ERASED ; goto out_unmap; }
@@ -950,7 +950,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, retcode =flash_status_check (info, sector, info->buffer_write_tout,"write to buffer" ); -if (retcode ==ERR_OK ) { +if (retcode ==FL_ERR_OK ) {/* reduce the number of loops by the width of * the port */
@@ -975,7 +975,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, src +=8 , dst +=8 ;break ;default : - retcode =ERR_INVAL ; + retcode =FL_ERR_INVAL ; goto out_unmap; } }
@@ -1025,7 +1025,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, }break ;default : - retcode =ERR_INVAL ; + retcode =FL_ERR_INVAL ; goto out_unmap; }
@@ -1043,7 +1043,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp,default :debug ("Unknown Command Set\n" ); - retcode =ERR_INVAL ; + retcode =FL_ERR_INVAL ;break ; }
@@ -1389,7 +1389,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)if (i > cnt) i = cnt; rc =flash_write_cfibuffer (info, wp, src, i); -if (rc !=ERR_OK ) +if (rc !=FL_ERR_OK )return rc; i -= i & (info->portwidth -1 ); wp += i;
@@ -1398,7 +1398,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)FLASH_SHOW_PROGRESS (scale, dots, digit, i);/* Only check every once in a while */ if ((cnt &0xFFFF ) < buffered_size &&ctrlc ()) - return ERR_ABORTED; + return FL_ERR_ABORTED; }#else while (cnt >= info->portwidth) {
@@ -1413,7 +1413,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)FLASH_SHOW_PROGRESS (scale, dots, digit, info->portwidth);/* Only check every once in a while */ if ((cnt &0xFFFF ) < info->portwidth &&ctrlc ()) - return ERR_ABORTED; + return FL_ERR_ABORTED; }#endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */
include/flash.h +10 -10
@@ -127,16 +127,16 @@ void flash_perror(int err);/*----------------------------------------------------------------------- * return codes from flash_write(): */ -#define ERR_OK 0 -#define ERR_TIMEOUT 1 -#define ERR_NOT_ERASED 2 -#define ERR_PROTECTED 4 -#define ERR_INVAL 8 -#define ERR_ALIGN 16 -#define ERR_UNKNOWN_FLASH_VENDOR 32 -#define ERR_UNKNOWN_FLASH_TYPE 64 -#define ERR_PROG_ERROR 128 -#define ERR_ABORTED 256 +#define FL_ERR_OK 0 +#define FL_ERR_TIMEOUT 1 +#define FL_ERR_NOT_ERASED 2 +#define FL_ERR_PROTECTED 4 +#define FL_ERR_INVAL 8 +#define FL_ERR_ALIGN 16 +#define FL_ERR_UNKNOWN_FLASH_VENDOR 32 +#define FL_ERR_UNKNOWN_FLASH_TYPE 64 +#define FL_ERR_PROG_ERROR 128 +#define FL_ERR_ABORTED 256/*----------------------------------------------------------------------- * Protection Flags for flash_protect():
Signature · 1 line
2.40.1
PATCH v8 3/23 net: wget: allow EFI boot
In reply to Jerome Forissierwget followed by bootefi currently fails as follows:
U-Boot> wget 200000 192.168.0.30:helloworld.efi
Waiting for Ethernet connection... done.
HTTP/1.0 200 OK
Packets received 13, Transfer Successful
Bytes transferred = 12720 (31b0 hex)
U-Boot> bootefi 200000
No UEFI binary known at 200000
U-Boot>
Fix the problem by adding the missing efi_set_bootdev() call.
--- net/wget.c | 4 ++++ 1 file changed, 4 insertions(+)
net/wget.c +4 -0
@@ -8,6 +8,7 @@#include <command.h> #include <display_options.h> #include <env.h> +#include <efi_loader.h> #include <image.h> #include <lmb.h> #include <mapmem.h>
@@ -429,6 +430,9 @@ static void wget_handler(uchar *pkt, u16 dport,case WGET_TRANSFERRED :printf ("Packets received %d, Transfer Successful\n" , packets);net_set_state (wget_loop_state); +efi_set_bootdev ("Net" ,"" , image_url, +map_sysmem (image_load_addr,0 ), + net_boot_file_size);break ; } }
Signature · 1 line
2.40.1
PATCH v8 6/23 net: fec_mxc_init(): do not ignore return status of fec_open()
In reply to Jerome ForissierThe fec_mxc_init() function currently always returns 0. This does not allow the callers to detect when for instance the PHY initialization failed due to the port being unconnected. Fix that by returning the status of fec_open().
--- drivers/net/fec_mxc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/fec_mxc.c +1 -2
@@ -615,8 +615,7 @@ static int fecmxc_init(struct udevice *dev)if (fec->xcv_type !=SEVENWIRE )miiphy_restart_aneg (dev);#endif -fec_open (dev); -return 0 ; +return fec_open (dev); }/**
Signature · 1 line
2.40.1
PATCH v8 8/23 net: eth-uclass: add function eth_start_udev()
In reply to Jerome ForissierAdd a function to start a given network device, and update eth_init() to use it.
--- drivers/mtd/altera_qspi.c | 4 ++-- include/net-common.h | 1 + net/eth-uclass.c | 38 +++++++++++++++++++++++++------------- 3 files changed, 28 insertions(+), 15 deletions(-)
drivers/mtd/altera_qspi.c +2 -2
@@ -96,7 +96,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last) ret =mtd_erase (mtd, &instr);flash_set_verbose (0 );if (ret) -return ERR_PROTECTED ; +return FL_ERR_PROTECTED ;puts (" done\n" );return 0 ;
@@ -114,7 +114,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) ret =mtd_write (mtd, to, cnt, &retlen, src);if (ret) -return ERR_PROTECTED ; +return FL_ERR_PROTECTED ;return 0 ; }
include/net-common.h +1 -0
@@ -148,6 +148,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);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
@@ -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 ) { + priv->state =ETH_STATE_ACTIVE ; + priv->running = true; + ret =0 ; + } + +return ret; +} +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 + goto end;debug ("FAIL\n" ); }else {
Signature · 1 line
2.40.1
PATCH v8 7/23 net: split include/net.h into net{, -common, -legacy, -lwip}.h
In reply to Jerome ForissierMake net.h a wrapper which includes net-common.h and either net-legacy.h or net-lwip.h based on NET_LWIP.
--- Makefile | 4 +- include/net-common.h | 431 ++++++++++++++++++++ include/net-legacy.h | 613 ++++++++++++++++++++++++++++ include/net-lwip.h | 14 + include/net.h | 943 +------------------------------------------ 5 files changed, 1065 insertions(+), 940 deletions(-) create mode 100644 include/net-common.h create mode 100644 include/net-legacy.h create mode 100644 include/net-lwip.h
Makefile +3 -1
@@ -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 +431 -0
431 lines not on this page · raw message
include/net-legacy.h new file +613 -0
613 lines not on this page · raw message
include/net-lwip.h new file +14 -0
@@ -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
Signature · 1 line
2.40.1
PATCH v8 9/23 net-lwip: build lwIP
In reply to Jerome ForissierBuild 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.
--- lib/Makefile | 2 + lib/lwip/Makefile | 55 +++++++++++ lib/lwip/u-boot/arch/cc.h | 43 +++++++++ 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, 257 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
@@ -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 +43 -0
43 lines not on this page · raw message
lib/lwip/u-boot/arch/sys_arch.h new file +0 -0
lib/lwip/u-boot/limits.h new file +0 -0
lib/lwip/u-boot/lwipopts.h new file +157 -0
157 lines not on this page · raw message
Signature · 1 line
2.40.1
PATCH v8 11/23 net-lwip: add TFTP support and tftpboot command
In reply to Jerome ForissierImplement 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 ++ net/lwip/dhcp.c | 11 +- net/lwip/tftp.c | 275 +++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 291 insertions(+), 6 deletions(-)
cmd/Kconfig +1 -2
@@ -2108,10 +2108,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
@@ -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
net/lwip/dhcp.c +10 -1
@@ -116,11 +116,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/tftp.c +272 -3
282 lines not on this page · raw message
Signature · 1 line
2.40.1
PATCH v8 12/23 net-lwip: add ping command
In reply to Jerome ForissierAdd 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
@@ -2000,11 +2000,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
@@ -2105,6 +2100,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
@@ -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
@@ -13,5 +13,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
@@ -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
PATCH v8 13/23 net-lwip: add dns command
In reply to Jerome ForissierAdd 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
@@ -2018,11 +2018,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
@@ -2077,6 +2072,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
@@ -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
@@ -13,6 +13,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
@@ -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
PATCH v8 14/23 net: split cmd/net.c into cmd/net.c and cmd/net-common.c
In reply to Jerome ForissierExtract 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
@@ -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
PATCH v8 15/23 net-lwip: add wget command
In reply to Jerome ForissierAdd 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 | 16 +- cmd/net-lwip.c | 8 + include/net-lwip.h | 18 +++ net/lwip/Makefile | 1 + net/lwip/wget.c | 361 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 397 insertions(+), 7 deletions(-) create mode 100644 net/lwip/wget.c
cmd/Kconfig +9 -7
@@ -1993,13 +1993,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 - 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
@@ -2114,6 +2107,15 @@ config CMD_TFTPBOOT help tftpboot - load file via network using TFTP protocol +config CMD_WGET + bool "wget" + 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 endif # if NET || NET_LWIP
cmd/net-lwip.c +8 -0
@@ -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
@@ -12,8 +12,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
@@ -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 +361 -0
361 lines not on this page · raw message
Signature · 1 line
2.40.1
PATCH v8 16/23 net-lwip: lwIP wget supports user defined port in the uri, so allow it.
In reply to Jerome ForissierFrom: Jonathan Humphreys <[email protected]>
--- net/lwip/wget.c | 6 ------ 1 file changed, 6 deletions(-)
net/lwip/wget.c +0 -6
@@ -347,12 +347,6 @@ bool wget_validate_uri(char *uri) ret = false; goto out; } - s =strchr (authority,':' ); -if (s) { -log_err ("user defined port is not supported\n" ); - ret = false; - goto out; - } out:free (str_copy);
Signature · 1 line
2.40.1
PATCH v8 17/23 cmd: bdinfo: enable -e when CONFIG_CMD_NET_LWIP=y
In reply to Jerome ForissierSupport "bdinfo -e" when lwIP is selected.
--- cmd/bdinfo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
cmd/bdinfo.c +3 -2
@@ -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));bdinfo_print_num_l ("new_fdt" , (ulong )map_to_sysmem (gd->new_fdt));
@@ -197,7 +197,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
PATCH v8 18/23 configs: add qemu_arm64_lwip_defconfig
In reply to Jerome ForissierAdd 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
@@ -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
PATCH v8 19/23 lwip: tftp: add support of blksize option to client
In reply to Jerome ForissierThe 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.
--- 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
@@ -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 6enum 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 *addrsend_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 *addrclose_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 ;
@@ -493,6 +563,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
@@ -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
PATCH v8 20/23 net-lwip: add TFTP_BLOCKSIZE
In reply to Jerome ForissierAdd 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
@@ -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
@@ -138,6 +138,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
PATCH v8 21/23 CI: add qemu_arm64_lwip to the test matrix
In reply to Jerome ForissierBuild 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 +++++++ 1 file changed, 7 insertions(+)
.azure-pipelines.yml +7 -0
@@ -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"
Signature · 1 line
2.40.1
PATCH v8 22/23 test/py: add HTTP (wget) test for the EFI loader
In reply to Jerome ForissierAdd a test to test_efi_loader.py similar to the TFTP test but for HTTP with the wget command.
--- test/py/tests/test_efi_loader.py | 52 +++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 15 deletions(-)
test/py/tests/test_efi_loader.py +37 -15
@@ -50,6 +50,8 @@ env__efi_loader_helloworld_file = { import pytest import u_boot_utils +PROTO_TFTP, PROTO_HTTP = range(0, 2) + net_set_up = False def test_efi_pre_commands(u_boot_console):
@@ -110,10 +112,10 @@ def test_efi_setup_static(u_boot_console): global net_set_up net_set_up = True -def fetch_tftp_file(u_boot_console, env_conf): - """Grab an env described file via TFTP and return its address +def fetch_file(u_boot_console, env_conf, proto): + """Grab an env described file via TFTP or HTTP and return its address - A file as described by an env config <env_conf> is downloaded from the TFTP + A file as described by an env config <env_conf> is downloaded from the server. The address to that file is returned. """ if not net_set_up:
@@ -128,7 +130,13 @@ def fetch_tftp_file(u_boot_console, env_conf): addr = u_boot_utils.find_ram_base(u_boot_console) fn = f['fn'] - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) + if proto == PROTO_TFTP: + cmd = 'tftpboot' + elif proto == PROTO_HTTP: + cmd = 'wget' + else: + assert False + output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn)) expected_text = 'Bytes transferred = ' sz = f.get('size', None) if sz:
@@ -147,16 +155,8 @@ def fetch_tftp_file(u_boot_console, env_conf): return addr [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') -def test_efi_helloworld_net(u_boot_console): - """Run the helloworld.efi binary via TFTP. - - The helloworld.efi file is downloaded from the TFTP server and is executed - using the fallback device tree at $fdtcontroladdr. - """ - - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_helloworld_file') +def do_test_efi_helloworld_net(u_boot_console, proto): + addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file', proto) output = u_boot_console.run_command('bootefi %x' % addr) expected_text = 'Hello, world'
@@ -164,6 +164,28 @@ def test_efi_helloworld_net(u_boot_console): expected_text = '## Application failed' assert expected_text not in output [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_tftp(u_boot_console): + """Run the helloworld.efi binary via TFTP. + + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP); + [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_http(u_boot_console): + """Run the helloworld.efi binary via HTTP. + + The helloworld.efi file is downloaded from the HTTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_HTTP); + @pytest.mark.buildconfigspec('cmd_bootefi_hello') def test_efi_helloworld_builtin(u_boot_console): """Run the builtin helloworld.efi binary.
@@ -185,7 +207,7 @@ def test_efi_grub_net(u_boot_console): executed. """ - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_grub_file') + addr = fetch_file(u_boot_console, 'env__efi_loader_grub_file', PROTO_TFTP) u_boot_console.run_command('bootefi %x' % addr, wait_for_prompt=False)
Signature · 1 line
2.40.1
PATCH v8 23/23 MAINTAINERS: net-lwip: add myself as a maintainer
In reply to Jerome ForissierAdd myself as a maintainer for the lwIP network stack integration code and network commands. The library code itself (i.e., most files under lib/lwip/ except README, Makefile and integration files in u-boot) is unmodified from upstream and therefore does not need a maintainer.
--- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+)
MAINTAINERS +11 -0
@@ -1343,6 +1343,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: include/net-lwip.h +F: lib/lwip/Makefile +F: lib/lwip/README +F: lib/lwip/u-boot/ +F: net/lwip/ + NIOS M: Thomas Chou <[email protected]> S: Maintained
Signature · 1 line
2.40.1
PATCH v8 4/23 net: introduce alternative implementation as net-lwip/
In reply to Jerome ForissierPrepare 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.
As for SANDBOX, NET_LWIP cannot be used either because of strong assumptions on the network stack. Make NET_LWIP depend on !SANDBOX so that the NET_LWIP alternative is not visible in make menuconfig when sandbox_defconfig is used.
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).
--- Kconfig | 30 +++++++++++++++++++ boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 2 +- common/spl/Kconfig | 1 + drivers/dfu/Kconfig | 1 + drivers/fastboot/Kconfig | 1 + drivers/net/Kconfig | 1 + drivers/net/phy/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 2 +- net/Kconfig | 61 +++++++++++++++++++------------------- net/Makefile | 4 +++ net/lwip/Kconfig | 34 +++++++++++++++++++++ 13 files changed, 108 insertions(+), 33 deletions(-) create mode 100644 net/lwip/Kconfig
Kconfig +30 -0
@@ -745,8 +745,38 @@ 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 + depends on !SANDBOX + 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"
boot/Kconfig +1 -0
@@ -502,6 +502,7 @@ config BOOTMETH_ANDROID select ANDROID_BOOT_IMAGE select CMD_BCB select CMD_FASTBOOT + select FASTBOOT select PARTITION_TYPE_GUID select PARTITION_UUIDS help
cmd/Kconfig +1 -0
@@ -1644,6 +1644,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
@@ -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
@@ -1063,6 +1063,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
drivers/dfu/Kconfig +1 -0
@@ -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
@@ -1,5 +1,6 @@ menu "Fastboot support" depends on CMDLINE + depends on !NET_LWIP config FASTBOOT bool
drivers/net/Kconfig +1 -0
@@ -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
drivers/net/phy/Kconfig +1 -1
@@ -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
@@ -224,7 +224,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
@@ -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 +34 -0
@@ -0,0 +1,34 @@ +# +# Network configuration (with lwIP stack) +# + +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
Signature · 1 line
2.40.1
PATCH v8 5/23 configs: replace '# CONFIG_NET is not set' with CONFIG_NO_NET=y
In reply to Jerome ForissierThe parent patch has made the networking stack a choice between NO_NET, NET and NET_LWIP. Therefore '# CONFIG_NET is not set' is now 'CONFIG_NO_NET=y'. Adjust the defconfigs accordingly. Note that this patch is intended to be folded in but is kept separate separate for now to make review easier.
--- 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/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/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 +- configs/sama5d29_curiosity_qspiflash_defconfig | 2 +- configs/sama7g54_curiosity_mmc_defconfig | 2 +- configs/sama7g54_curiosity_nandflash_defconfig | 2 +- configs/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 +- configs/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 +- 105 files changed, 105 insertions(+), 105 deletions(-)
configs/LicheePi_Zero_defconfig +1 -1
@@ -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
@@ -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
@@ -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
@@ -67,7 +67,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
@@ -71,7 +71,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
@@ -68,7 +68,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
@@ -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/anbernic-rgxx3-rk3566_defconfig +1 -1
@@ -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_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -35,7 +35,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
@@ -37,7 +37,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
@@ -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
@@ -28,7 +28,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
@@ -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
@@ -31,7 +31,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
@@ -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_MTD=y
configs/durian_defconfig +1 -1
@@ -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
@@ -12,7 +12,7 @@ CONFIG_SYS_LOAD_ADDR=0x80000000 # CONFIG_AUTOBOOT is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_CMD_RNG=y -# CONFIG_NET is not set +CONFIG_NO_NET=y CONFIG_CLK_EXYNOS850=y # CONFIG_MMC is not set CONFIG_SOC_SAMSUNG=y
configs/ea-lpc3250devkitv2_defconfig +1 -1
@@ -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
@@ -35,7 +35,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
@@ -38,7 +38,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
@@ -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
@@ -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
@@ -40,7 +40,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
@@ -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
@@ -36,7 +36,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
@@ -66,7 +66,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
@@ -80,7 +80,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
@@ -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
@@ -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/legoev3_defconfig +1 -1
@@ -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
@@ -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
@@ -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
@@ -48,7 +48,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
@@ -38,7 +38,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -61,7 +61,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
@@ -77,7 +77,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -70,7 +70,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
@@ -69,7 +69,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
@@ -69,7 +69,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
@@ -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/sama7g54_curiosity_nandflash_defconfig +1 -1
@@ -72,7 +72,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
@@ -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/sipeed_maix_bitm_defconfig +1 -1
@@ -17,7 +17,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_SF_DEFAULT_BUS=3
configs/sipeed_maix_smode_defconfig +1 -1
@@ -18,7 +18,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_SF_DEFAULT_BUS=3 CONFIG_FS_EXT4=y
configs/stemmy_defconfig +1 -1
@@ -28,7 +28,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -31,7 +31,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
@@ -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
@@ -58,7 +58,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
@@ -32,7 +32,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
@@ -22,7 +22,7 @@ CONFIG_BOOTCOMMAND="run distro_bootcmd" # CONFIG_CMD_DATE is not set CONFIG_OF_CONTROL=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -# CONFIG_NET is not set +CONFIG_NO_NET=y # CONFIG_ACPIGEN is not set CONFIG_AXI=y CONFIG_AXI_SANDBOX=y
configs/topic_miami_defconfig +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -57,7 +57,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
@@ -55,7 +55,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
@@ -55,7 +55,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
@@ -51,7 +51,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
@@ -53,7 +53,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
@@ -61,7 +61,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
@@ -50,7 +50,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
@@ -50,7 +50,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
@@ -52,7 +52,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
@@ -53,7 +53,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
@@ -64,7 +64,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
@@ -64,7 +64,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
@@ -48,7 +48,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
@@ -48,7 +48,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
@@ -67,7 +67,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
@@ -69,7 +69,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
@@ -69,7 +69,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
@@ -78,7 +78,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
Signature · 1 line
2.40.1
PATCH v8 10/23 net-lwip: add DHCP support and dhcp commmand
In reply to Jerome ForissierAdd 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().
--- 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 | 3 +- cmd/Kconfig | 91 +++--- 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-lwip.h | 3 + lib/tiny-printf.c | 3 +- net/Makefile | 15 +- net/lwip/Makefile | 5 + net/lwip/dhcp.c | 127 ++++++++ net/lwip/eth_internal.h | 35 +++ net/lwip/net-lwip.c | 292 ++++++++++++++++++ net/lwip/tftp.c | 11 + 20 files changed, 569 insertions(+), 55 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
@@ -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
@@ -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
@@ -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
@@ -495,7 +495,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++) {
boot/Kconfig +2 -1
@@ -380,7 +380,7 @@ config BOOT_DEFAULTS_CMDS select CMD_PART if PARTITIONS select CMD_DHCP if CMD_NET select CMD_PING if CMD_NET - select CMD_PXE if CMD_NET + select CMD_PXE if (CMD_NET && !NET_LWIP) select CMD_BOOTI if ARM64 select CMD_BOOTZ if ARM && !ARM64 imply CMD_MII if NET
@@ -558,6 +558,7 @@ config BOOTMETH_EXTLINUX_PXE config BOOTMETH_EFILOADER bool "Bootdev support for EFI boot" depends on EFI_BINARY_EXEC + select CMD_TFTPBOOT if CMD_NET default y help Enables support for EFI boot using bootdevs. This makes the
cmd/Kconfig +53 -38
138 lines not on this page · raw message
cmd/Makefile +5 -1
@@ -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
@@ -130,7 +130,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
@@ -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
@@ -471,7 +471,7 @@ static int initr_status_led(void) }#endif -#ifdef CONFIG_CMD_NET +#if defined(CONFIG_CMD_NET )static int initr_net (void ) {puts ("Net: " );
@@ -726,7 +726,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
@@ -418,7 +418,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
@@ -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-lwip.h +3 -0
@@ -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
@@ -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 +10 -5
@@ -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
@@ -42,3 +37,13 @@ obj-$(CONFIG_CMD_WGET) += wget.o 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 +endif + +obj-$(CONFIG_NET_LWIP) += lwip/
net/lwip/Makefile new file +5 -0
@@ -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 +127 -0
127 lines not on this page · raw message
net/lwip/eth_internal.h new file +35 -0
@@ -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 +292 -0
292 lines not on this page · raw message
net/lwip/tftp.c new file +11 -0
@@ -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
Re: [PATCH v8 22/23] test/py: add HTTP (wget) test for the EFI loader
In reply to Jerome ForissierQuoted 5 lines · Jerome Forissier
Add a test to
test_efi_loader.pysimilar to the TFTP test but for HTTP with the wget command.Suggested-by Tom Rini <[email protected]>Signed-off-by Jerome Forissier <[email protected]>
[snip]
Quoted 3 lines
[email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def
test_efi_helloworld_net_tftp(u_boot_console):
This should also depend on cmd_tftpboot (existing bug).
test/py/tests/test_efi_loader.py def test_efi_helloworld_net(u_boot_console): · line 180
Quoted 11 lines
test/py/tests/test_efi_loader.py +11
-0+ """Run the helloworld.efi binary via TFTP. + + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP); + [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_http(u_boot_console):
Then this needs to depend on cmd_wget as well. Kicking my local build scripts to add wget and moving on...
Signature · 1 line
Tom
Re: [PATCH v8 22/23] test/py: add HTTP (wget) test for the EFI loader
In reply to Jerome ForissierQuoted 100 lines · Jerome Forissier
Add a test to
test_efi_loader.pysimilar to the TFTP test but for HTTP with the wget command.Suggested-by Tom Rini <[email protected]>Signed-off-by Jerome Forissier <[email protected]>--- test/py/tests/test_efi_loader.py | 52 +++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 15 deletions(-)test/py/tests/test_efi_loader.py +36
-14@@ -50,6 +50,8 @@ env__efi_loader_helloworld_file = { import pytest import u_boot_utils +PROTO_TFTP, PROTO_HTTP = range(0, 2) + net_set_up = False def test_efi_pre_commands(u_boot_console):@@ -110,10 +112,10 @@ def test_efi_setup_static(u_boot_console): global net_set_up net_set_up = True -def fetch_tftp_file(u_boot_console, env_conf): - """Grab an env described file via TFTP and return its address +def fetch_file(u_boot_console, env_conf, proto): + """Grab an env described file via TFTP or HTTP and return its address - A file as described by an env config <env_conf> is downloaded from the TFTP + A file as described by an env config <env_conf> is downloaded from the server. The address to that file is returned. """ if not net_set_up:@@ -128,7 +130,13 @@ def fetch_tftp_file(u_boot_console, env_conf): addr = u_boot_utils.find_ram_base(u_boot_console) fn = f['fn'] - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) + if proto == PROTO_TFTP: + cmd = 'tftpboot' + elif proto == PROTO_HTTP: + cmd = 'wget' + else: + assert False + output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn)) expected_text = 'Bytes transferred = ' sz = f.get('size', None) if sz:@@ -147,16 +155,8 @@ def fetch_tftp_file(u_boot_console, env_conf): return addr [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') -def test_efi_helloworld_net(u_boot_console): - """Run the helloworld.efi binary via TFTP. - - The helloworld.efi file is downloaded from the TFTP server and is executed - using the fallback device tree at $fdtcontroladdr. - """ - - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_helloworld_file') +def do_test_efi_helloworld_net(u_boot_console, proto): + addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file', proto) output = u_boot_console.run_command('bootefi %x' % addr) expected_text = 'Hello, world'@@ -164,6 +164,28 @@ def test_efi_helloworld_net(u_boot_console): expected_text = '## Application failed' assert expected_text not in output [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_tftp(u_boot_console): + """Run the helloworld.efi binary via TFTP. + + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP); + [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_http(u_boot_console): + """Run the helloworld.efi binary via HTTP. + + The helloworld.efi file is downloaded from the HTTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_HTTP); + @pytest.mark.buildconfigspec('cmd_bootefi_hello') def test_efi_helloworld_builtin(u_boot_console): """Run the builtin helloworld.efi binary.
test/py/tests/test_efi_loader.py def test_efi_grub_net(u_boot_console): · line 212
Quoted 7 lines
test/py/tests/test_efi_loader.py +1
-1@@ -185,7 +207,7 @@ def test_efi_grub_net(u_boot_console): executed. """ - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_grub_file') + addr = fetch_file(u_boot_console, 'env__efi_loader_grub_file', PROTO_TFTP) u_boot_console.run_command('bootefi %x' % addr, wait_for_prompt=False)
Looking at this now that I've added wget to my Pi builds, erm:
U-Boot> wget 200000 EFI/arm64/helloworld.efi
That's not going to work. That's what works fine for a tftp server. I think the test is going to need to require some http specific configuration added (and I'll locally start firing off the python trivial http server or something, for tests).
Signature · 1 line
Tom
Re: [PATCH v8 06/23] net: fec_mxc_init(): do not ignore return status of fec_open()
In reply to Jerome ForissierQuoted 7 lines · Jerome Forissier
The
fec_mxc_init()function currently always returns 0. This does not allow the callers to detect when for instance the PHY initialization failed due to the port being unconnected. Fix that by returning the status offec_open().Signed-off-by Jerome Forissier <[email protected]>
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 withKconfig, 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 4 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASE
For v9, I think it would be good to do a CI run with NET_LWIP default and seeing what fails from that too. There's a few problems still leading to a lot of failures, in that case. Thanks.
Signature · 1 line
Tom
Jerome Forissier
AppliedRe: [PATCH v8 06/23] net: fec_mxc_init(): do not ignore return status of fec_open()
In reply to Fabio EstevamQuoted 11 lines · Fabio Estevam
Quoted 7 lines · Jerome Forissier
The
fec_mxc_init()function currently always returns 0. This does not allow the callers to detect when for instance the PHY initialization failed due to the port being unconnected. Fix that by returning the status offec_open().Signed-off-by Jerome Forissier <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied, thanks.
Re: [PATCH v8 22/23] test/py: add HTTP (wget) test for the EFI loader
In reply to Tom RiniQuoted 112 lines · Tom Rini
Quoted 100 lines · Jerome Forissier
Add a test to
test_efi_loader.pysimilar to the TFTP test but for HTTP with the wget command.Suggested-by Tom Rini <[email protected]>Signed-off-by Jerome Forissier <[email protected]>--- test/py/tests/test_efi_loader.py | 52 +++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 15 deletions(-)test/py/tests/test_efi_loader.py +36
-14@@ -50,6 +50,8 @@ env__efi_loader_helloworld_file = { import pytest import u_boot_utils +PROTO_TFTP, PROTO_HTTP = range(0, 2) + net_set_up = False def test_efi_pre_commands(u_boot_console):@@ -110,10 +112,10 @@ def test_efi_setup_static(u_boot_console): global net_set_up net_set_up = True -def fetch_tftp_file(u_boot_console, env_conf): - """Grab an env described file via TFTP and return its address +def fetch_file(u_boot_console, env_conf, proto): + """Grab an env described file via TFTP or HTTP and return its address - A file as described by an env config <env_conf> is downloaded from the TFTP + A file as described by an env config <env_conf> is downloaded from the server. The address to that file is returned. """ if not net_set_up:@@ -128,7 +130,13 @@ def fetch_tftp_file(u_boot_console, env_conf): addr = u_boot_utils.find_ram_base(u_boot_console) fn = f['fn'] - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) + if proto == PROTO_TFTP: + cmd = 'tftpboot' + elif proto == PROTO_HTTP: + cmd = 'wget' + else: + assert False + output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn)) expected_text = 'Bytes transferred = ' sz = f.get('size', None) if sz:@@ -147,16 +155,8 @@ def fetch_tftp_file(u_boot_console, env_conf): return addr [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') -def test_efi_helloworld_net(u_boot_console): - """Run the helloworld.efi binary via TFTP. - - The helloworld.efi file is downloaded from the TFTP server and is executed - using the fallback device tree at $fdtcontroladdr. - """ - - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_helloworld_file') +def do_test_efi_helloworld_net(u_boot_console, proto): + addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file', proto) output = u_boot_console.run_command('bootefi %x' % addr) expected_text = 'Hello, world'@@ -164,6 +164,28 @@ def test_efi_helloworld_net(u_boot_console): expected_text = '## Application failed' assert expected_text not in output [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_tftp(u_boot_console): + """Run the helloworld.efi binary via TFTP. + + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP); + [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_http(u_boot_console): + """Run the helloworld.efi binary via HTTP. + + The helloworld.efi file is downloaded from the HTTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_HTTP); + @pytest.mark.buildconfigspec('cmd_bootefi_hello') def test_efi_helloworld_builtin(u_boot_console): """Run the builtin helloworld.efi binary.test/py/tests/test_efi_loader.py def test_efi_grub_net(u_boot_console): · line 212
Quoted 7 lines
test/py/tests/test_efi_loader.py +1
-1@@ -185,7 +207,7 @@ def test_efi_grub_net(u_boot_console): executed. """ - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_grub_file') + addr = fetch_file(u_boot_console, 'env__efi_loader_grub_file', PROTO_TFTP) u_boot_console.run_command('bootefi %x' % addr, wait_for_prompt=False)Looking at this now that I've added wget to my Pi builds, erm:
U-Boot> wget 200000 EFI/arm64/helloworld.efi
Quoted 4 lines
That's not going to work. That's what works fine for a tftp server. I think the test is going to need to require some http specific configuration added (and I'll locally start firing off the python trivial http server or something, for tests).
It should work because 'wget <addr> <file>' is a valid syntax for the legacy wget as well as for the new one, now that I have added support for it. It takes the address of the http server from ${serverip}. Of course you need a http server listening on the same host as the tfp server, yes.
I have tested this on the RPi3.
Signature · 1 line
Jerome
Re: [PATCH v8 22/23] test/py: add HTTP (wget) test for the EFI loader
In reply to Tom RiniQuoted 5 lines · Tom Rini
Quoted 3 lines · Jerome Forissier
Add a test to
test_efi_loader.pysimilar to the TFTP test but for HTTP with the wget command.
Quoted 8 lines
Quoted 2 lines
Suggested-by Tom Rini <[email protected]>Signed-off-by Jerome Forissier <[email protected]>[snip]
Quoted 3 lines
[email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def
test_efi_helloworld_net_tftp(u_boot_console):This should also depend on
cmd_tftpboot(existing bug).
Patch added to v9.
Quoted 5 lines
Quoted 5 lines
test/py/tests/test_efi_loader.py +5
-0+ """Run the helloworld.efi binary via TFTP. + + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """
Quoted 8 lines
test/py/tests/test_efi_loader.py def test_efi_helloworld_net(u_boot_console): · line 180
Quoted 6 lines
test/py/tests/test_efi_loader.py +6
-0+ + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP); + [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_http(u_boot_console):Then this needs to depend on
cmd_wgetas well.
Right. Fixed in v9.
Quoted 2 lines
Kicking my local build
scripts to add wget and moving on...
Thanks for testing!
Signature · 1 line
Jerome
Tom Rini
Tested-byRe: [PATCH v8 22/23] test/py: add HTTP (wget) test for the EFI loader
In reply to Jerome ForissierQuoted 120 lines · Jerome Forissier
Quoted 112 lines · Tom Rini
Quoted 100 lines · Jerome Forissier
Add a test to
test_efi_loader.pysimilar to the TFTP test but for HTTP with the wget command.Suggested-by Tom Rini <[email protected]>Signed-off-by Jerome Forissier <[email protected]>--- test/py/tests/test_efi_loader.py | 52 +++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 15 deletions(-)test/py/tests/test_efi_loader.py +36
-14@@ -50,6 +50,8 @@ env__efi_loader_helloworld_file = { import pytest import u_boot_utils +PROTO_TFTP, PROTO_HTTP = range(0, 2) + net_set_up = False def test_efi_pre_commands(u_boot_console):@@ -110,10 +112,10 @@ def test_efi_setup_static(u_boot_console): global net_set_up net_set_up = True -def fetch_tftp_file(u_boot_console, env_conf): - """Grab an env described file via TFTP and return its address +def fetch_file(u_boot_console, env_conf, proto): + """Grab an env described file via TFTP or HTTP and return its address - A file as described by an env config <env_conf> is downloaded from the TFTP + A file as described by an env config <env_conf> is downloaded from the server. The address to that file is returned. """ if not net_set_up:@@ -128,7 +130,13 @@ def fetch_tftp_file(u_boot_console, env_conf): addr = u_boot_utils.find_ram_base(u_boot_console) fn = f['fn'] - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) + if proto == PROTO_TFTP: + cmd = 'tftpboot' + elif proto == PROTO_HTTP: + cmd = 'wget' + else: + assert False + output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn)) expected_text = 'Bytes transferred = ' sz = f.get('size', None) if sz:@@ -147,16 +155,8 @@ def fetch_tftp_file(u_boot_console, env_conf): return addr [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') -def test_efi_helloworld_net(u_boot_console): - """Run the helloworld.efi binary via TFTP. - - The helloworld.efi file is downloaded from the TFTP server and is executed - using the fallback device tree at $fdtcontroladdr. - """ - - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_helloworld_file') +def do_test_efi_helloworld_net(u_boot_console, proto): + addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file', proto) output = u_boot_console.run_command('bootefi %x' % addr) expected_text = 'Hello, world'@@ -164,6 +164,28 @@ def test_efi_helloworld_net(u_boot_console): expected_text = '## Application failed' assert expected_text not in output [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_tftp(u_boot_console): + """Run the helloworld.efi binary via TFTP. + + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP); + [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_http(u_boot_console): + """Run the helloworld.efi binary via HTTP. + + The helloworld.efi file is downloaded from the HTTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_HTTP); + @pytest.mark.buildconfigspec('cmd_bootefi_hello') def test_efi_helloworld_builtin(u_boot_console): """Run the builtin helloworld.efi binary.test/py/tests/test_efi_loader.py def test_efi_grub_net(u_boot_console): · line 212
Quoted 7 lines
test/py/tests/test_efi_loader.py +1
-1@@ -185,7 +207,7 @@ def test_efi_grub_net(u_boot_console): executed. """ - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_grub_file') + addr = fetch_file(u_boot_console, 'env__efi_loader_grub_file', PROTO_TFTP) u_boot_console.run_command('bootefi %x' % addr, wait_for_prompt=False)Looking at this now that I've added wget to my Pi builds, erm:
U-Boot> wget 200000 EFI/arm64/helloworld.efiQuoted 4 lines
That's not going to work. That's what works fine for a tftp server. I think the test is going to need to require some http specific configuration added (and I'll locally start firing off the python trivial http server or something, for tests).
Quoted 5 lines
It should work because 'wget <addr> <file>' is a valid syntax for the legacy wget as well as for the new one, now that I have added support for it. It takes the address of the http server from ${serverip}. Of course you need a http server listening on the same host as the tfp server, yes.
I have tested this on the RPi3.
Oh, neat, OK, thanks. The lack of error message was confusing, does lwIP wget say something when it fails to fetch? Throwing the trivial http server up lets me pass the test.
Signature · 1 line
Tom
Re: [PATCH v8 22/23] test/py: add HTTP (wget) test for the EFI loader
Quoted 121 lines · Tom Rini
Quoted 120 lines · Jerome Forissier
Quoted 116 lines · Tom Rini
Quoted 100 lines · Jerome Forissier
Add a test to
test_efi_loader.pysimilar to the TFTP test but for HTTP with the wget command.Suggested-by Tom Rini <[email protected]>Signed-off-by Jerome Forissier <[email protected]>--- test/py/tests/test_efi_loader.py | 52 +++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 15 deletions(-)test/py/tests/test_efi_loader.py +36
-14@@ -50,6 +50,8 @@ env__efi_loader_helloworld_file = { import pytest import u_boot_utils +PROTO_TFTP, PROTO_HTTP = range(0, 2) + net_set_up = False def test_efi_pre_commands(u_boot_console):@@ -110,10 +112,10 @@ def test_efi_setup_static(u_boot_console): global net_set_up net_set_up = True -def fetch_tftp_file(u_boot_console, env_conf): - """Grab an env described file via TFTP and return its address +def fetch_file(u_boot_console, env_conf, proto): + """Grab an env described file via TFTP or HTTP and return its address - A file as described by an env config <env_conf> is downloaded from the TFTP + A file as described by an env config <env_conf> is downloaded from the server. The address to that file is returned. """ if not net_set_up:@@ -128,7 +130,13 @@ def fetch_tftp_file(u_boot_console, env_conf): addr = u_boot_utils.find_ram_base(u_boot_console) fn = f['fn'] - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) + if proto == PROTO_TFTP: + cmd = 'tftpboot' + elif proto == PROTO_HTTP: + cmd = 'wget' + else: + assert False + output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn)) expected_text = 'Bytes transferred = ' sz = f.get('size', None) if sz:@@ -147,16 +155,8 @@ def fetch_tftp_file(u_boot_console, env_conf): return addr [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') -def test_efi_helloworld_net(u_boot_console): - """Run the helloworld.efi binary via TFTP. - - The helloworld.efi file is downloaded from the TFTP server and is executed - using the fallback device tree at $fdtcontroladdr. - """ - - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_helloworld_file') +def do_test_efi_helloworld_net(u_boot_console, proto): + addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file', proto) output = u_boot_console.run_command('bootefi %x' % addr) expected_text = 'Hello, world'@@ -164,6 +164,28 @@ def test_efi_helloworld_net(u_boot_console): expected_text = '## Application failed' assert expected_text not in output [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_tftp(u_boot_console): + """Run the helloworld.efi binary via TFTP. + + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP); + [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_http(u_boot_console): + """Run the helloworld.efi binary via HTTP. + + The helloworld.efi file is downloaded from the HTTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_HTTP); + @pytest.mark.buildconfigspec('cmd_bootefi_hello') def test_efi_helloworld_builtin(u_boot_console): """Run the builtin helloworld.efi binary.test/py/tests/test_efi_loader.py def test_efi_grub_net(u_boot_console): · line 212
Quoted 7 lines
test/py/tests/test_efi_loader.py +1
-1@@ -185,7 +207,7 @@ def test_efi_grub_net(u_boot_console): executed. """ - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_grub_file') + addr = fetch_file(u_boot_console, 'env__efi_loader_grub_file', PROTO_TFTP) u_boot_console.run_command('bootefi %x' % addr, wait_for_prompt=False)Looking at this now that I've added wget to my Pi builds, erm:
U-Boot> wget 200000 EFI/arm64/helloworld.efiThat's not going to work. That's what works fine for a tftp server. I think the test is going to need to require some http specific configuration added (and I'll locally start firing off the python trivial http server or something, for tests).
Quoted 8 lines
Quoted 5 lines
It should work because 'wget <addr> <file>' is a valid syntax for the legacy wget as well as for the new one, now that I have added support for it. It takes the address of the http server from ${serverip}. Of course you need a http server listening on the same host as the tfp server, yes.
I have tested this on the RPi3.Oh, neat, OK, thanks. The lack of error message was confusing, does lwIP wget say something when it fails to fetch?
Yes, it will print: "HTTP (client|server) error xxx". Typically:
"HTTP client error 4" -> TCP connection refused
"HTTP client error 5" -> TCP connection timeout
"HTTP server error 404" -> file not found
Quoted 3 lines
Throwing the trivial http
server up lets me pass the test.Tested-by Tom Rini <[email protected]>
Nice! T-b added. Thanks.
Signature · 1 line
Jerome
Re: [PATCH v8 22/23] test/py: add HTTP (wget) test for the EFI loader
In reply to Jerome ForissierQuoted 120 lines · Jerome Forissier
Quoted 112 lines · Tom Rini
Quoted 100 lines · Jerome Forissier
Add a test to
test_efi_loader.pysimilar to the TFTP test but for HTTP with the wget command.Suggested-by Tom Rini <[email protected]>Signed-off-by Jerome Forissier <[email protected]>--- test/py/tests/test_efi_loader.py | 52 +++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 15 deletions(-)test/py/tests/test_efi_loader.py +36
-14@@ -50,6 +50,8 @@ env__efi_loader_helloworld_file = { import pytest import u_boot_utils +PROTO_TFTP, PROTO_HTTP = range(0, 2) + net_set_up = False def test_efi_pre_commands(u_boot_console):@@ -110,10 +112,10 @@ def test_efi_setup_static(u_boot_console): global net_set_up net_set_up = True -def fetch_tftp_file(u_boot_console, env_conf): - """Grab an env described file via TFTP and return its address +def fetch_file(u_boot_console, env_conf, proto): + """Grab an env described file via TFTP or HTTP and return its address - A file as described by an env config <env_conf> is downloaded from the TFTP + A file as described by an env config <env_conf> is downloaded from the server. The address to that file is returned. """ if not net_set_up:@@ -128,7 +130,13 @@ def fetch_tftp_file(u_boot_console, env_conf): addr = u_boot_utils.find_ram_base(u_boot_console) fn = f['fn'] - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) + if proto == PROTO_TFTP: + cmd = 'tftpboot' + elif proto == PROTO_HTTP: + cmd = 'wget' + else: + assert False + output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn)) expected_text = 'Bytes transferred = ' sz = f.get('size', None) if sz:@@ -147,16 +155,8 @@ def fetch_tftp_file(u_boot_console, env_conf): return addr [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') -def test_efi_helloworld_net(u_boot_console): - """Run the helloworld.efi binary via TFTP. - - The helloworld.efi file is downloaded from the TFTP server and is executed - using the fallback device tree at $fdtcontroladdr. - """ - - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_helloworld_file') +def do_test_efi_helloworld_net(u_boot_console, proto): + addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file', proto) output = u_boot_console.run_command('bootefi %x' % addr) expected_text = 'Hello, world'@@ -164,6 +164,28 @@ def test_efi_helloworld_net(u_boot_console): expected_text = '## Application failed' assert expected_text not in output [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_tftp(u_boot_console): + """Run the helloworld.efi binary via TFTP. + + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP); + [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_http(u_boot_console): + """Run the helloworld.efi binary via HTTP. + + The helloworld.efi file is downloaded from the HTTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_HTTP); + @pytest.mark.buildconfigspec('cmd_bootefi_hello') def test_efi_helloworld_builtin(u_boot_console): """Run the builtin helloworld.efi binary.test/py/tests/test_efi_loader.py def test_efi_grub_net(u_boot_console): · line 212
Quoted 7 lines
test/py/tests/test_efi_loader.py +1
-1@@ -185,7 +207,7 @@ def test_efi_grub_net(u_boot_console): executed. """ - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_grub_file') + addr = fetch_file(u_boot_console, 'env__efi_loader_grub_file', PROTO_TFTP) u_boot_console.run_command('bootefi %x' % addr, wait_for_prompt=False)Looking at this now that I've added wget to my Pi builds, erm:
U-Boot> wget 200000 EFI/arm64/helloworld.efiQuoted 4 lines
That's not going to work. That's what works fine for a tftp server. I think the test is going to need to require some http specific configuration added (and I'll locally start firing off the python trivial http server or something, for tests).
Quoted 5 lines
It should work because 'wget <addr> <file>' is a valid syntax for the legacy wget as well as for the new one, now that I have added support for it. It takes the address of the http server from ${serverip}. Of course you need a http server listening on the same host as the tfp server, yes.
I have tested this on the RPi3.
OK, so problem. This is intermittent (first I saw it on rpi_3_32b built with clang (LLVM-17) and lwIP and the second was rpi_3_32b with gcc and lwIP):
========================================== FAILURES =========================================== ________________________________ test_efi_helloworld_net_http _________________________________ test/py/tests/test_efi_loader.py:187: in test_efi_helloworld_net_http
do_test_efi_helloworld_net(u_boot_console, PROTO_HTTP);
test/py/tests/test_efi_loader.py:159: in do_test_efi_helloworld_net
addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file', proto)
test/py/tests/test_efi_loader.py:139: in fetch_file
output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn))test/py/u_boot_console_base.py:288: in run_command
raise Exception('Bad pattern found on console: ' +
E Exception: Bad pattern found on console: error_please_reset
------------------------------------ Captured stdout call ------------------------------------- U-Boot> wget 200000 EFI/arm/helloworld.efi
2320 bytes transferred in 0 ms (### ERROR ### Please RESET the board ### =================================== short test summary info ===================================
My first guess is the "in 0 ms" leads to a divide by zero later on?
Signature · 1 line
Tom
Re: [PATCH v8 22/23] test/py: add HTTP (wget) test for the EFI loader
Quoted 145 lines · Tom Rini
Quoted 120 lines · Jerome Forissier
Quoted 112 lines · Tom Rini
Quoted 100 lines · Jerome Forissier
Add a test to
test_efi_loader.pysimilar to the TFTP test but for HTTP with the wget command.Suggested-by Tom Rini <[email protected]>Signed-off-by Jerome Forissier <[email protected]>--- test/py/tests/test_efi_loader.py | 52 +++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 15 deletions(-)test/py/tests/test_efi_loader.py +36
-14@@ -50,6 +50,8 @@ env__efi_loader_helloworld_file = { import pytest import u_boot_utils +PROTO_TFTP, PROTO_HTTP = range(0, 2) + net_set_up = False def test_efi_pre_commands(u_boot_console):@@ -110,10 +112,10 @@ def test_efi_setup_static(u_boot_console): global net_set_up net_set_up = True -def fetch_tftp_file(u_boot_console, env_conf): - """Grab an env described file via TFTP and return its address +def fetch_file(u_boot_console, env_conf, proto): + """Grab an env described file via TFTP or HTTP and return its address - A file as described by an env config <env_conf> is downloaded from the TFTP + A file as described by an env config <env_conf> is downloaded from the server. The address to that file is returned. """ if not net_set_up:@@ -128,7 +130,13 @@ def fetch_tftp_file(u_boot_console, env_conf): addr = u_boot_utils.find_ram_base(u_boot_console) fn = f['fn'] - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) + if proto == PROTO_TFTP: + cmd = 'tftpboot' + elif proto == PROTO_HTTP: + cmd = 'wget' + else: + assert False + output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn)) expected_text = 'Bytes transferred = ' sz = f.get('size', None) if sz:@@ -147,16 +155,8 @@ def fetch_tftp_file(u_boot_console, env_conf): return addr [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') -def test_efi_helloworld_net(u_boot_console): - """Run the helloworld.efi binary via TFTP. - - The helloworld.efi file is downloaded from the TFTP server and is executed - using the fallback device tree at $fdtcontroladdr. - """ - - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_helloworld_file') +def do_test_efi_helloworld_net(u_boot_console, proto): + addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file', proto) output = u_boot_console.run_command('bootefi %x' % addr) expected_text = 'Hello, world'@@ -164,6 +164,28 @@ def test_efi_helloworld_net(u_boot_console): expected_text = '## Application failed' assert expected_text not in output [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_tftp(u_boot_console): + """Run the helloworld.efi binary via TFTP. + + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP); + [email protected]('of_control') [email protected]('cmd_bootefi_hello_compile') +def test_efi_helloworld_net_http(u_boot_console): + """Run the helloworld.efi binary via HTTP. + + The helloworld.efi file is downloaded from the HTTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_HTTP); + @pytest.mark.buildconfigspec('cmd_bootefi_hello') def test_efi_helloworld_builtin(u_boot_console): """Run the builtin helloworld.efi binary.test/py/tests/test_efi_loader.py def test_efi_grub_net(u_boot_console): · line 212
Quoted 7 lines
test/py/tests/test_efi_loader.py +1
-1@@ -185,7 +207,7 @@ def test_efi_grub_net(u_boot_console): executed. """ - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_grub_file') + addr = fetch_file(u_boot_console, 'env__efi_loader_grub_file', PROTO_TFTP) u_boot_console.run_command('bootefi %x' % addr, wait_for_prompt=False)Looking at this now that I've added wget to my Pi builds, erm:
U-Boot> wget 200000 EFI/arm64/helloworld.efiQuoted 4 lines
That's not going to work. That's what works fine for a tftp server. I think the test is going to need to require some http specific configuration added (and I'll locally start firing off the python trivial http server or something, for tests).
Quoted 5 lines
It should work because 'wget <addr> <file>' is a valid syntax for the legacy wget as well as for the new one, now that I have added support for it. It takes the address of the http server from ${serverip}. Of course you need a http server listening on the same host as the tfp server, yes.
I have tested this on the RPi3.OK, so problem. This is intermittent (first I saw it on
rpi_3_32bbuilt with clang (LLVM-17) and lwIP and the second wasrpi_3_32bwith gcc and lwIP):
========================================== FAILURES =========================================== ________________________________test_efi_helloworld_net_http_________________________________test/py/tests/test_efi_loader.py:187: intest_efi_helloworld_net_httpdo_test_efi_helloworld_net(u_boot_console, PROTO_HTTP); test/py/tests/test_efi_loader.py:159: in do_test_efi_helloworld_net addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file', proto) test/py/tests/test_efi_loader.py:139: in fetch_file output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn))
test/py/u_boot_console_base.py:288: inrun_command
raise Exception('Bad pattern found on console: ' +
E Exception: Bad pattern found on console:error_please_reset
------------------------------------ Captured stdout call ------------------------------------- U-Boot> wget 200000 EFI/arm/helloworld.efi
2320 bytes transferred in 0 ms (### ERROR ### Please RESET the board ### =================================== short test summary info ===================================
Quoted 1 line
My first guess is the "in 0 ms" leads to a divide by zero later on?
Oops! Yes, that is clearly the reason. Fixed in v9.
Thanks,
Signature · 1 line
Jerome
Quoted 21 lines · Tom Rini
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 withKconfig, 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 8 lines
Quoted 4 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASEFor v9, I think it would be good to do a CI run with
NET_LWIPdefault and seeing what fails from that too. There's a few problems still leading to a lot of failures, in that case. Thanks.
I pushed my branch to GitHub [1] and there's a failure in the tools_only_macOS job [2]. Any idea what is going on? I tried twice and it failed twice :-/
Om my Linux machine, "make tools-only_config tools-only" works fine.
[1] https://github.com/u-boot/u-boot/pull/635
[2] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=9105&view=results
Thanks,
Signature · 1 line
Jerome
Quoted 33 lines · Jerome Forissier
Quoted 21 lines · Tom Rini
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 withKconfig, 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-BootQuoted 8 lines
Quoted 4 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASEFor v9, I think it would be good to do a CI run with
NET_LWIPdefault and seeing what fails from that too. There's a few problems still leading to a lot of failures, in that case. Thanks.
Quoted 8 lines
I pushed my branch to GitHub [1] and there's a failure in the
tools_only_macOSjob [2]. Any idea what is going on? I tried twice and it failed twice :-/
Om my Linux machine, "make tools-only_config tools-only" works fine.[1] https://github.com/u-boot/u-boot/pull/635
[2] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=9105&view=results
Alright so from [2] going to the job and then downloading the raw log (it's huge, firefox gets mad for me), scrolling down until it's not the git clone we see:
2024-08-08T14:36:30.0865130Z HOSTCC scripts/basic/fixdep 2024-08-08T14:36:30.8641660Z HOSTCC scripts/kconfig/conf.o 2024-08-08T14:36:30.9645180Z LEX scripts/kconfig/zconf.lex.c 2024-08-08T14:36:31.0545650Z YACC scripts/kconfig/zconf.tab.c 2024-08-08T14:36:33.2374910Z HOSTCC scripts/kconfig/zconf.tab.o 2024-08-08T14:36:34.9997050Z HOSTLD scripts/kconfig/conf 2024-08-08T14:36:36.5552790Z generated_defconfig:7:warning: unexpected data: # CONFIG_SANDBOX_ SDL is not set 2024-08-08T14:36:36.5666380Z generated_defconfig:12:warning: unexpected data: # CONFIG_BOOTSTD _FULL is not set 2024-08-08T14:36:36.5724560Z generated_defconfig:13:warning: unexpected data: # CONFIG_BOOTMET H_CROS is not set 2024-08-08T14:36:36.5742720Z generated_defconfig:14:warning: unexpected data: # CONFIG_BOOTMET H_VBE is not set 2024-08-08T14:36:36.5752700Z generated_defconfig:17:warning: unexpected data: # CONFIG_CMD_BOO TD is not set 2024-08-08T14:36:36.5772400Z generated_defconfig:18:warning: unexpected data: # CONFIG_CMD_BOO TM is not set 2024-08-08T14:36:36.5788060Z generated_defconfig:19:warning: unexpected data: # CONFIG_CMD_BOO TI is not set 2024-08-08T14:36:36.5792360Z generated_defconfig:20:warning: unexpected data: # CONFIG_CMD_ELF is not set 2024-08-08T14:36:36.5828400Z generated_defconfig:21:warning: unexpected data: # CONFIG_CMD_EXTENSION is not set 2024-08-08T14:36:36.5840470Z generated_defconfig:22:warning: unexpected data: # CONFIG_CMD_DAT E is not set 2024-08-08T14:36:36.5938540Z generated_defconfig:26:warning: unexpected data: # CONFIG_ACPIGEN is not set 2024-08-08T14:36:36.5974000Z generated_defconfig:35:warning: unexpected data: # CONFIG_VIRTIO_MMIO is not set 2024-08-08T14:36:36.5985430Z generated_defconfig:36:warning: unexpected data: # CONFIG_VIRTIO_PCI is not set 2024-08-08T14:36:36.6045140Z generated_defconfig:37:warning: unexpected data: # CONFIG_VIRTIO_SANDBOX is not set 2024-08-08T14:36:36.6053060Z generated_defconfig:38:warning: unexpected data: # CONFIG_GENERATE_ACPI_TABLE is not set 2024-08-08T14:36:36.6068760Z generated_defconfig:39:warning: unexpected data: # CONFIG_EFI_LOADER is not set 2024-08-08T14:36:36.6088140Z # 2024-08-08T14:36:36.6121560Z # configuration written to .config 2024-08-08T14:36:36.6130190Z # 2024-08-08T14:36:42.5830900Z scripts/kconfig/conf --syncconfig Kconfig 2024-08-08T14:36:43.9105630Z .config:284:warning: symbol value '' invalid for AVB_BUF_ADDR 2024-08-08T14:36:43.9121120Z .config:285:warning: symbol value '' invalid for AVB_BUF_SIZE 2024-08-08T14:36:43.9142940Z * 2024-08-08T14:36:43.9172380Z * Restart config... 2024-08-08T14:36:43.9257450Z * 2024-08-08T14:36:43.9288610Z * 2024-08-08T14:36:43.9332910Z * Security support 2024-08-08T14:36:43.9366750Z * 2024-08-08T14:36:43.9399770Z Build Android Verified Boot operations (AVB_VERIFY) [Y/n/?] y 2024-08-08T15:35:07.9280210Z ##[error]The Operation will be canceled. The next steps may not contain expected logs.
And indeed, most of that is "normal" if we look at a current build for tools-only on macOS. We're being hit by the fact that the host CC isn't gcc and is llvm and https://github.com/llvm/llvm-project/issues/78778
applies, I believe. Now how do we work around this? Hum...
If you go an change "# CONFIG_FOO is not set" to CONFIG_FOO=n in configs/tools-only_defconfig, I assume your build moves on? This is valid syntax and fixing a more generic issue we have on macOS today.
Signature · 1 line
Tom
Re: [PATCH v8 02/23] net: wget: removed unused function wget_success()
In reply to Jerome ForissierQuoted 27 lines · Jerome Forissier
wget_success()is used nowhere so remove it.Signed-off-by Jerome Forissier <[email protected]>--- net/wget.c | 7 ------- 1 file changed, 7 deletions(-)net/wget.c +0
-8@@ -199,13 +199,6 @@ void wget_fail(char *error_message, unsigned int tcp_seq_num,wget_send (action, tcp_seq_num, tcp_ack_num,0 ); } -void wget_success (u8 action,unsigned int tcp_seq_num, -unsigned int tcp_ack_num,int len,int packets) -{ -printf ("Packets received %d, Transfer Successful\n" , packets); -wget_send (action, tcp_seq_num, tcp_ack_num, len); -} -/* * Interfaces of U-BOOT */ --
Quoted 2 lines
2.40.1
Re: [PATCH v8 03/23] net: wget: allow EFI boot
In reply to Jerome ForissierQuoted 32 lines · Jerome Forissier
wget followed by bootefi currently fails as follows:
U-Boot> wget 200000 192.168.0.30:helloworld.efi
Waiting for Ethernet connection... done.
HTTP/1.0 200 OK
Packets received 13, Transfer Successful
Bytes transferred = 12720 (31b0 hex)
U-Boot> bootefi 200000
No UEFI binary known at 200000
U-Boot>Fix the problem by adding the missing
efi_set_bootdev()call.Signed-off-by Jerome Forissier <[email protected]>--- net/wget.c | 4 ++++ 1 file changed, 4 insertions(+)net/wget.c +1
-0@@ -8,6 +8,7 @@#include <command.h> #include <display_options.h> #include <env.h> +#include <efi_loader.h> #include <image.h> #include <lmb.h> #include <mapmem.h>
net/wget.c static void wget_handler(uchar *pkt, u16 dport, · line 435
Quoted 6 lines
net/wget.c +3
-0@@ -429,6 +430,9 @@ static void wget_handler(uchar *pkt, u16 dport,case WGET_TRANSFERRED :printf ("Packets received %d, Transfer Successful\n" , packets);net_set_state (wget_loop_state); +efi_set_bootdev ("Net" ,"" , image_url, +map_sysmem (image_load_addr,0 ), + net_boot_file_size);
Don't you need an unmap_sysmem() once this completes?
Thanks
/Ilias
Quoted 6 lines
net/wget.c +0
-1break ; } } --2.40.1
Re: [PATCH v8 03/23] net: wget: allow EFI boot
Quoted 34 lines · Ilias Apalodimas
Quoted 32 lines · Jerome Forissier
wget followed by bootefi currently fails as follows:
U-Boot> wget 200000 192.168.0.30:helloworld.efi
Waiting for Ethernet connection... done.
HTTP/1.0 200 OK
Packets received 13, Transfer Successful
Bytes transferred = 12720 (31b0 hex)
U-Boot> bootefi 200000
No UEFI binary known at 200000
U-Boot>Fix the problem by adding the missing
efi_set_bootdev()call.Signed-off-by Jerome Forissier <[email protected]>--- net/wget.c | 4 ++++ 1 file changed, 4 insertions(+)net/wget.c +1
-0@@ -8,6 +8,7 @@#include <command.h> #include <display_options.h> #include <env.h> +#include <efi_loader.h> #include <image.h> #include <lmb.h> #include <mapmem.h> @@ -429,6 +430,9 @@ static void wget_handler(uchar *pkt, u16 dport,
Quoted 8 lines
net/wget.c static void wget_handler(uchar *pkt, u16 dport, · line 435
Quoted 6 lines
net/wget.c +3
-0case WGET_TRANSFERRED :printf ("Packets received %d, Transfer Successful\n" , packets);net_set_state (wget_loop_state); +efi_set_bootdev ("Net" ,"" , image_url, +map_sysmem (image_load_addr,0 ), + net_boot_file_size);Don't you need an
unmap_sysmem()once this completes?
I wondered the same thing but where should the unmap call happen? This pattern exists in boot/bootmeth_efi.c, cmd/load.c, fs/fs.c and net/tftp.c. In this series I have blindly copied it into net/wget.c and net/lwip/wget.c and net/lwip/tftp.c as well. It seems it does somthing in the sandbox only so do we really care?
Thanks,
Signature · 1 line
Jerome
Quoted 9 lines
Thanks
/IliasQuoted 6 lines
net/wget.c +0
-1break ; } } --2.40.1
Quoted 93 lines · Tom Rini
Quoted 33 lines · Jerome Forissier
Quoted 21 lines · Tom Rini
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 withKconfig, 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-BootQuoted 8 lines
Quoted 4 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASEFor v9, I think it would be good to do a CI run with
NET_LWIPdefault and seeing what fails from that too. There's a few problems still leading to a lot of failures, in that case. Thanks.Quoted 8 lines
I pushed my branch to GitHub [1] and there's a failure in the
tools_only_macOSjob [2]. Any idea what is going on? I tried twice and it failed twice :-/
Om my Linux machine, "make tools-only_config tools-only" works fine.[1] https://github.com/u-boot/u-boot/pull/635
[2] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=9105&view=resultsAlright so from [2] going to the job and then downloading the raw log (it's huge, firefox gets mad for me), scrolling down until it's not the git clone we see:
2024-08-08T14:36:30.0865130Z HOSTCC scripts/basic/fixdep 2024-08-08T14:36:30.8641660Z HOSTCC scripts/kconfig/conf.o 2024-08-08T14:36:30.9645180Z LEX scripts/kconfig/zconf.lex.c 2024-08-08T14:36:31.0545650Z YACC scripts/kconfig/zconf.tab.c 2024-08-08T14:36:33.2374910Z HOSTCC scripts/kconfig/zconf.tab.o 2024-08-08T14:36:34.9997050Z HOSTLD scripts/kconfig/conf 2024-08-08T14:36:36.5552790Z generated_defconfig:7:warning: unexpected data: # CONFIG_SANDBOX_ SDL is not set 2024-08-08T14:36:36.5666380Z generated_defconfig:12:warning: unexpected data: # CONFIG_BOOTSTD _FULL is not set 2024-08-08T14:36:36.5724560Z generated_defconfig:13:warning: unexpected data: # CONFIG_BOOTMET H_CROS is not set 2024-08-08T14:36:36.5742720Z generated_defconfig:14:warning: unexpected data: # CONFIG_BOOTMET H_VBE is not set 2024-08-08T14:36:36.5752700Z generated_defconfig:17:warning: unexpected data: # CONFIG_CMD_BOO TD is not set 2024-08-08T14:36:36.5772400Z generated_defconfig:18:warning: unexpected data: # CONFIG_CMD_BOO TM is not set 2024-08-08T14:36:36.5788060Z generated_defconfig:19:warning: unexpected data: # CONFIG_CMD_BOO TI is not set 2024-08-08T14:36:36.5792360Z generated_defconfig:20:warning: unexpected data: # CONFIG_CMD_ELF is not set 2024-08-08T14:36:36.5828400Z generated_defconfig:21:warning: unexpected data: # CONFIG_CMD_EXTENSION is not set 2024-08-08T14:36:36.5840470Z generated_defconfig:22:warning: unexpected data: # CONFIG_CMD_DAT E is not set 2024-08-08T14:36:36.5938540Z generated_defconfig:26:warning: unexpected data: # CONFIG_ACPIGEN is not set 2024-08-08T14:36:36.5974000Z generated_defconfig:35:warning: unexpected data: # CONFIG_VIRTIO_MMIO is not set 2024-08-08T14:36:36.5985430Z generated_defconfig:36:warning: unexpected data: # CONFIG_VIRTIO_PCI is not set 2024-08-08T14:36:36.6045140Z generated_defconfig:37:warning: unexpected data: # CONFIG_VIRTIO_SANDBOX is not set 2024-08-08T14:36:36.6053060Z generated_defconfig:38:warning: unexpected data: # CONFIG_GENERATE_ACPI_TABLE is not set 2024-08-08T14:36:36.6068760Z generated_defconfig:39:warning: unexpected data: # CONFIG_EFI_LOADER is not set 2024-08-08T14:36:36.6088140Z # 2024-08-08T14:36:36.6121560Z # configuration written to .config 2024-08-08T14:36:36.6130190Z # 2024-08-08T14:36:42.5830900Z scripts/kconfig/conf --syncconfig Kconfig 2024-08-08T14:36:43.9105630Z .config:284:warning: symbol value '' invalid for AVB_BUF_ADDR 2024-08-08T14:36:43.9121120Z .config:285:warning: symbol value '' invalid for AVB_BUF_SIZE 2024-08-08T14:36:43.9142940Z * 2024-08-08T14:36:43.9172380Z * Restart config... 2024-08-08T14:36:43.9257450Z * 2024-08-08T14:36:43.9288610Z * 2024-08-08T14:36:43.9332910Z * Security support 2024-08-08T14:36:43.9366750Z * 2024-08-08T14:36:43.9399770Z Build Android Verified Boot operations (AVB_VERIFY) [Y/n/?] y 2024-08-08T15:35:07.9280210Z ##[error]The Operation will be canceled. The next steps may not contain expected logs.
Quoted 4 lines
And indeed, most of that is "normal" if we look at a current build for tools-only on macOS. We're being hit by the fact that the host CC isn't gcc and is llvm and https://github.com/llvm/llvm-project/issues/78778
applies, I believe. Now how do we work around this? Hum...
That's an "interesting" bug...
Quoted 2 lines
If you go an change "#
CONFIG_FOOis not set" toCONFIG_FOO=nin configs/tools-only_defconfig, I assume your build moves on?
Yep, it does.
Quoted 2 lines
This is
valid syntax and fixing a more generic issue we have on macOS today.
I am adding a new patch to v9: "configs: use syntax CONFIG_FOO=n in tools-only_defconfig". It means one extra step when syncing the defconfigs though... It is just a simple sed command but perhaps you have a better idea?
Thanks again for testing and for your help,
Signature · 1 line
Jerome
Quoted 101 lines · Jerome Forissier
Quoted 93 lines · Tom Rini
Quoted 33 lines · Jerome Forissier
Quoted 21 lines · Tom Rini
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 withKconfig, 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-BootQuoted 8 lines
Quoted 4 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASEFor v9, I think it would be good to do a CI run with
NET_LWIPdefault and seeing what fails from that too. There's a few problems still leading to a lot of failures, in that case. Thanks.Quoted 8 lines
I pushed my branch to GitHub [1] and there's a failure in the
tools_only_macOSjob [2]. Any idea what is going on? I tried twice and it failed twice :-/
Om my Linux machine, "make tools-only_config tools-only" works fine.[1] https://github.com/u-boot/u-boot/pull/635
[2] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=9105&view=resultsAlright so from [2] going to the job and then downloading the raw log (it's huge, firefox gets mad for me), scrolling down until it's not the git clone we see:
2024-08-08T14:36:30.0865130Z HOSTCC scripts/basic/fixdep 2024-08-08T14:36:30.8641660Z HOSTCC scripts/kconfig/conf.o 2024-08-08T14:36:30.9645180Z LEX scripts/kconfig/zconf.lex.c 2024-08-08T14:36:31.0545650Z YACC scripts/kconfig/zconf.tab.c 2024-08-08T14:36:33.2374910Z HOSTCC scripts/kconfig/zconf.tab.o 2024-08-08T14:36:34.9997050Z HOSTLD scripts/kconfig/conf 2024-08-08T14:36:36.5552790Z generated_defconfig:7:warning: unexpected data: # CONFIG_SANDBOX_ SDL is not set 2024-08-08T14:36:36.5666380Z generated_defconfig:12:warning: unexpected data: # CONFIG_BOOTSTD _FULL is not set 2024-08-08T14:36:36.5724560Z generated_defconfig:13:warning: unexpected data: # CONFIG_BOOTMET H_CROS is not set 2024-08-08T14:36:36.5742720Z generated_defconfig:14:warning: unexpected data: # CONFIG_BOOTMET H_VBE is not set 2024-08-08T14:36:36.5752700Z generated_defconfig:17:warning: unexpected data: # CONFIG_CMD_BOO TD is not set 2024-08-08T14:36:36.5772400Z generated_defconfig:18:warning: unexpected data: # CONFIG_CMD_BOO TM is not set 2024-08-08T14:36:36.5788060Z generated_defconfig:19:warning: unexpected data: # CONFIG_CMD_BOO TI is not set 2024-08-08T14:36:36.5792360Z generated_defconfig:20:warning: unexpected data: # CONFIG_CMD_ELF is not set 2024-08-08T14:36:36.5828400Z generated_defconfig:21:warning: unexpected data: # CONFIG_CMD_EXTENSION is not set 2024-08-08T14:36:36.5840470Z generated_defconfig:22:warning: unexpected data: # CONFIG_CMD_DAT E is not set 2024-08-08T14:36:36.5938540Z generated_defconfig:26:warning: unexpected data: # CONFIG_ACPIGEN is not set 2024-08-08T14:36:36.5974000Z generated_defconfig:35:warning: unexpected data: # CONFIG_VIRTIO_MMIO is not set 2024-08-08T14:36:36.5985430Z generated_defconfig:36:warning: unexpected data: # CONFIG_VIRTIO_PCI is not set 2024-08-08T14:36:36.6045140Z generated_defconfig:37:warning: unexpected data: # CONFIG_VIRTIO_SANDBOX is not set 2024-08-08T14:36:36.6053060Z generated_defconfig:38:warning: unexpected data: # CONFIG_GENERATE_ACPI_TABLE is not set 2024-08-08T14:36:36.6068760Z generated_defconfig:39:warning: unexpected data: # CONFIG_EFI_LOADER is not set 2024-08-08T14:36:36.6088140Z # 2024-08-08T14:36:36.6121560Z # configuration written to .config 2024-08-08T14:36:36.6130190Z # 2024-08-08T14:36:42.5830900Z scripts/kconfig/conf --syncconfig Kconfig 2024-08-08T14:36:43.9105630Z .config:284:warning: symbol value '' invalid for AVB_BUF_ADDR 2024-08-08T14:36:43.9121120Z .config:285:warning: symbol value '' invalid for AVB_BUF_SIZE 2024-08-08T14:36:43.9142940Z * 2024-08-08T14:36:43.9172380Z * Restart config... 2024-08-08T14:36:43.9257450Z * 2024-08-08T14:36:43.9288610Z * 2024-08-08T14:36:43.9332910Z * Security support 2024-08-08T14:36:43.9366750Z * 2024-08-08T14:36:43.9399770Z Build Android Verified Boot operations (AVB_VERIFY) [Y/n/?] y 2024-08-08T15:35:07.9280210Z ##[error]The Operation will be canceled. The next steps may not contain expected logs.Quoted 4 lines
And indeed, most of that is "normal" if we look at a current build for tools-only on macOS. We're being hit by the fact that the host CC isn't gcc and is llvm and https://github.com/llvm/llvm-project/issues/78778
applies, I believe. Now how do we work around this? Hum...
Quoted 6 lines
That's an "interesting" bug...
Quoted 2 lines
If you go an change "#
CONFIG_FOOis not set" toCONFIG_FOO=nin configs/tools-only_defconfig, I assume your build moves on?Yep, it does.
OK, good.
Quoted 7 lines
Quoted 2 lines
This is
valid syntax and fixing a more generic issue we have on macOS today.I am adding a new patch to v9: "configs: use syntax
CONFIG_FOO=nin tools-only_defconfig". It means one extra step when syncing the defconfigs though... It is just a simple sed command but perhaps you have a better idea?
This should be fine, there's already a number of configs I have to un-sync when I do a re-sync.
Quoted 1 line
Thanks again for testing and for your help,
You're welcome.
Tom
Quoted 21 lines · Tom Rini
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 withKconfig, 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 9 lines
Quoted 4 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASEFor v9, I think it would be good to do a CI run with
NET_LWIPdefault and seeing what fails from that too. There's a few problems still leading to a lot of failures, in that case. Thanks.
See here: https://github.com/u-boot/u-boot/pull/635
I fixed a number of issues, see the commit descriptions. As for the remaining ones:
- There is no http server in the CI so the wget test I added fails
- tftp is super slow in QEMU (~145 KiB/s) which causes timeouts. This is for two reasons: (1) the tftp windowsize option is not supported in lwIP (while the legacy NET does support it) so the sender waits for an ACK before sending a new packet; and (2) the latency is very high due to memcpy() being incredibly slow in QEMU (I am mainly referring to the memcpy() call in tftp_write() in net/lwip/tftp.c). I measured ~20-60 ms to copy a few hundred bytes (!) and if CONFIG_USE_ARCH_MEMCPY is enabled it is slightly better but not much (~15 ms). Also it seems the QEMU networking emulation is fragmenting the UDP packets because with CONFIG_TFTP_BLOCKSIZE=1468 the tftp_write() function never receives 1468 bytes but only a few hundreds at a time (max 544 bytes).
- The r2dplus_* tests fail for reasons I don't understand.
Thanks,
Signature · 1 line
Jerome
Quoted 34 lines · Jerome Forissier
Quoted 21 lines · Tom Rini
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 withKconfig, 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-BootQuoted 9 lines
Quoted 4 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASEFor v9, I think it would be good to do a CI run with
NET_LWIPdefault and seeing what fails from that too. There's a few problems still leading to a lot of failures, in that case. Thanks.
Quoted 5 lines
See here: https://github.com/u-boot/u-boot/pull/635
I fixed a number of issues, see the commit descriptions. As for the remaining ones:
- There is no http server in the CI so the wget test I added fails
Ah yes. So the test needs some enable-me type flag, like other tests that require external configuration.
Quoted 11 lines
- tftp is super slow in QEMU (~145 KiB/s) which causes timeouts. This is for two reasons: (1) the tftp windowsize option is not supported in lwIP (while the legacy NET does support it) so the sender waits for an ACK before sending a new packet; and (2) the latency is very high due to
memcpy()being incredibly slow in QEMU (I am mainly referring to thememcpy()call intftp_write()innet/lwip/tftp.c). I measured ~20-60 ms to copy a few hundred bytes (!) and ifCONFIG_USE_ARCH_MEMCPYis enabled it is slightly better but not much (~15 ms). Also it seems the QEMU networking emulation is fragmenting the UDP packets because withCONFIG_TFTP_BLOCKSIZE=1468thetftp_write()function never receives 1468 bytes but only a few hundreds at a time (max 544 bytes).
I thought you fixed that? Or was that only for on real hardware?
But also, some of those numbers sound unusually terrible to me. We can get some bad luck with the free instances, but, still. Are you sure there's nothing else going on?
Quoted 1 line
- The r2dplus_* tests fail for reasons I don't understand.
Consistently, too?
Signature · 1 line
Tom
Quoted 35 lines · Tom Rini
Quoted 34 lines · Jerome Forissier
Quoted 30 lines · Tom Rini
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 withKconfig, 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-BootQuoted 4 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASEFor v9, I think it would be good to do a CI run with
NET_LWIPdefault and seeing what fails from that too. There's a few problems still leading to a lot of failures, in that case. Thanks.
Quoted 8 lines
Quoted 5 lines
See here: https://github.com/u-boot/u-boot/pull/635
I fixed a number of issues, see the commit descriptions. As for the remaining ones:
- There is no http server in the CI so the wget test I added failsAh yes. So the test needs some enable-me type flag, like other tests that require external configuration.
Can you please suggest how to do that?
Quoted 12 lines
Quoted 11 lines
- tftp is super slow in QEMU (~145 KiB/s) which causes timeouts. This is for two reasons: (1) the tftp windowsize option is not supported in lwIP (while the legacy NET does support it) so the sender waits for an ACK before sending a new packet; and (2) the latency is very high due to
memcpy()being incredibly slow in QEMU (I am mainly referring to thememcpy()call intftp_write()innet/lwip/tftp.c). I measured ~20-60 ms to copy a few hundred bytes (!) and ifCONFIG_USE_ARCH_MEMCPYis enabled it is slightly better but not much (~15 ms). Also it seems the QEMU networking emulation is fragmenting the UDP packets because withCONFIG_TFTP_BLOCKSIZE=1468thetftp_write()function never receives 1468 bytes but only a few hundreds at a time (max 544 bytes).
Quoted 1 line
I thought you fixed that? Or was that only for on real hardware?
It works OK on real hardware...
Quoted 3 lines
But also, some of those numbers sound unusually terrible to me. We can get some bad luck with the free instances, but, still. Are you sure there's nothing else going on?
...and yes that's absolutely terrible. In fact I found something curious. With the following patch applied to provide a memcpy() speed test:
cmd/test.c +48 -0
@@ -7,6 +7,8 @@#include <command.h> #include <fs.h> #include <log.h> +#include <stdlib.h> +#include <time.h> #include <vsprintf.h> #define OP_INVALID 0
@@ -215,3 +217,49 @@ U_BOOT_CMD("do nothing, successfully" ,NULL ); + +static int do_mtest (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +ulong t0, delta; +void *src, *dst; +long sz; + +if (argc <2 ) { +printf ("Usage: %s <size_in_bytes> [dst [src]]\n" , argv[0 ]); +return 1 ; + } + sz =simple_strtol (argv[1 ],NULL ,10 ); +if (sz <0 ) { +printf ("%s: %s: invalid argument\n" , argv[0 ], argv[1 ]); +return 1 ; + } +if (argc >2 ) { + dst = (void *)hextoul (argv[2 ],NULL ); +if (argc >3 ) { + src = (void *)hextoul (argv[3 ],NULL ); + }else { + src =malloc (sz); + } + }else { + dst =malloc (sz); + src =malloc (sz); + } +if (!src || !dst) { +printf ("%s: out of memory or NULL address\n" , argv[0 ]); +return 1 ; + } +printf ("%ld bytes from 0x%p to 0x%p: " , sz, src, dst); + t0 =get_timer (0 ); +memcpy (dst, src, sz); + delta =get_timer (t0); +printf ("%ld ms\n" , delta); + +return 0 ; +} + +U_BOOT_CMD ( + mtest,CONFIG_SYS_MAXARGS ,0 , do_mtest, +"memcpy() speed test" , +NULL +);
I can see that there are ranges of memory that are very slow to *write* to (and the loadaddr used by the tftp test happens to fall in that range):
$ make qemu_arm64_defconfig $ make -j$(nproc) CROSS_COMPILE="ccache aarch64-linux-gnu-" $ qemu-system-aarch64 -M virt -nographic -cpu cortex-a57 -bios u-boot.bin
U-Boot 2024.10-rc1-00195-g35ce7016c9cb-dirty (Aug 19 2024 - 16:42:15 +0200) [...]
=> mtest
Usage: mtest <size_in_bytes> [dst [src]]
=> mtest 1000
1000 bytes from 0x00000000466baed0 to 0x00000000466baae0: 0 ms => mtest 1000 0x2000000 0x00000000466baed0
1000 bytes from 0x00000000466baed0 to 0x0000000002000000: 22 ms => mtest 1000 0x00000000466baed0 0x2000000
1000 bytes from 0x0000000002000000 to 0x00000000466baed0: 0 ms =>
Quoted 3 lines
Quoted 1 line
- The r2dplus_* tests fail for reasons I don't understand.
Consistently, too?
Yes.
Thanks,
Signature · 1 line
Jerome
Quoted 40 lines · Jerome Forissier
Quoted 37 lines · Tom Rini
Quoted 36 lines · Jerome Forissier
Quoted 21 lines · Tom Rini
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 withKconfig, 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-BootQuoted 9 lines
Quoted 4 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASEFor v9, I think it would be good to do a CI run with
NET_LWIPdefault and seeing what fails from that too. There's a few problems still leading to a lot of failures, in that case. Thanks.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
I fixed a number of issues, see the commit descriptions. As for the remaining ones:
- There is no http server in the CI so the wget test I added failsAh yes. So the test needs some enable-me type flag, like other tests that require external configuration.
Can you please suggest how to do that?
Well test/py/tests/test_net_boot.py for example.
Quoted 12 lines
Quoted 12 lines
Quoted 11 lines
- tftp is super slow in QEMU (~145 KiB/s) which causes timeouts. This is for two reasons: (1) the tftp windowsize option is not supported in lwIP (while the legacy NET does support it) so the sender waits for an ACK before sending a new packet; and (2) the latency is very high due to
memcpy()being incredibly slow in QEMU (I am mainly referring to thememcpy()call intftp_write()innet/lwip/tftp.c). I measured ~20-60 ms to copy a few hundred bytes (!) and ifCONFIG_USE_ARCH_MEMCPYis enabled it is slightly better but not much (~15 ms). Also it seems the QEMU networking emulation is fragmenting the UDP packets because withCONFIG_TFTP_BLOCKSIZE=1468thetftp_write()function never receives 1468 bytes but only a few hundreds at a time (max 544 bytes).
Quoted 3 lines
Quoted 1 line
I thought you fixed that? Or was that only for on real hardware?
It works OK on real hardware...
It should be fast enough here too.
Quoted 79 lines
Quoted 3 lines
But also, some of those numbers sound unusually terrible to me. We can get some bad luck with the free instances, but, still. Are you sure there's nothing else going on?
...and yes that's absolutely terrible. In fact I found something curious. With the following patch applied to provide a
memcpy()speed test:cmd/test.c +48
-0@@ -7,6 +7,8 @@#include <command.h> #include <fs.h> #include <log.h> +#include <stdlib.h> +#include <time.h> #include <vsprintf.h> #define OP_INVALID 0@@ -215,3 +217,49 @@ U_BOOT_CMD("do nothing, successfully" ,NULL ); + +static int do_mtest (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +ulong t0, delta; +void *src, *dst; +long sz; + +if (argc <2 ) { +printf ("Usage: %s <size_in_bytes> [dst [src]]\n" , argv[0 ]); +return 1 ; + } + sz =simple_strtol (argv[1 ],NULL ,10 ); +if (sz <0 ) { +printf ("%s: %s: invalid argument\n" , argv[0 ], argv[1 ]); +return 1 ; + } +if (argc >2 ) { + dst = (void *)hextoul (argv[2 ],NULL ); +if (argc >3 ) { + src = (void *)hextoul (argv[3 ],NULL ); + }else { + src =malloc (sz); + } + }else { + dst =malloc (sz); + src =malloc (sz); + } +if (!src || !dst) { +printf ("%s: out of memory or NULL address\n" , argv[0 ]); +return 1 ; + } +printf ("%ld bytes from 0x%p to 0x%p: " , sz, src, dst); + t0 =get_timer (0 ); +memcpy (dst, src, sz); + delta =get_timer (t0); +printf ("%ld ms\n" , delta); + +return 0 ; +} + +U_BOOT_CMD ( + mtest,CONFIG_SYS_MAXARGS ,0 , do_mtest, +"memcpy() speed test" , +NULL +);I can see that there are ranges of memory that are very slow to *write* to (and the loadaddr used by the tftp test happens to fall in that range):
$ make qemu_arm64_defconfig $ make -j$(nproc) CROSS_COMPILE="ccache aarch64-linux-gnu-" $ qemu-system-aarch64 -M virt -nographic -cpu cortex-a57 -bios u-boot.bin
Quoted 11 lines
U-Boot 2024.10-rc1-00195-g35ce7016c9cb-dirty (Aug 19 2024 - 16:42:15 +0200) [...]
=> mtest
Usage: mtest <size_in_bytes> [dst [src]]
=> mtest 1000
1000 bytes from0x00000000466baed0to0x00000000466baae0: 0 ms => mtest 10000x20000000x00000000466baed0
1000 bytes from0x00000000466baed0to0x0000000002000000: 22 ms => mtest 10000x00000000466baed00x2000000
1000 bytes from0x0000000002000000to0x00000000466baed0: 0 ms =>
This is all very strange. Can you investigate a bit please?
Signature · 1 line
Tom
Quoted 45 lines · Tom Rini
Quoted 44 lines · Jerome Forissier
Quoted 41 lines · Tom Rini
Quoted 39 lines · Jerome Forissier
Quoted 21 lines · Tom Rini
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 withKconfig, 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-BootQuoted 9 lines
Quoted 4 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://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASEFor v9, I think it would be good to do a CI run with
NET_LWIPdefault and seeing what fails from that too. There's a few problems still leading to a lot of failures, in that case. Thanks.See here: https://github.com/u-boot/u-boot/pull/635
I fixed a number of issues, see the commit descriptions. As for the remaining ones:
- There is no http server in the CI so the wget test I added fails
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Ah yes. So the test needs some enable-me type flag, like other tests that require external configuration.
Can you please suggest how to do that?
Well
test/py/tests/test_net_boot.pyfor example.
Thanks. I'm adding a skip variable for v9.
Quoted 97 lines
Quoted 12 lines
Quoted 12 lines
Quoted 11 lines
- tftp is super slow in QEMU (~145 KiB/s) which causes timeouts. This is for two reasons: (1) the tftp windowsize option is not supported in lwIP (while the legacy NET does support it) so the sender waits for an ACK before sending a new packet; and (2) the latency is very high due to
memcpy()being incredibly slow in QEMU (I am mainly referring to thememcpy()call intftp_write()innet/lwip/tftp.c). I measured ~20-60 ms to copy a few hundred bytes (!) and ifCONFIG_USE_ARCH_MEMCPYis enabled it is slightly better but not much (~15 ms). Also it seems the QEMU networking emulation is fragmenting the UDP packets because withCONFIG_TFTP_BLOCKSIZE=1468thetftp_write()function never receives 1468 bytes but only a few hundreds at a time (max 544 bytes).Quoted 3 lines
Quoted 1 line
I thought you fixed that? Or was that only for on real hardware?
It works OK on real hardware...
It should be fast enough here too.
Quoted 79 lines
Quoted 3 lines
But also, some of those numbers sound unusually terrible to me. We can get some bad luck with the free instances, but, still. Are you sure there's nothing else going on?
...and yes that's absolutely terrible. In fact I found something curious. With the following patch applied to provide a
memcpy()speed test:cmd/test.c +48
-0@@ -7,6 +7,8 @@#include <command.h> #include <fs.h> #include <log.h> +#include <stdlib.h> +#include <time.h> #include <vsprintf.h> #define OP_INVALID 0@@ -215,3 +217,49 @@ U_BOOT_CMD("do nothing, successfully" ,NULL ); + +static int do_mtest (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +ulong t0, delta; +void *src, *dst; +long sz; + +if (argc <2 ) { +printf ("Usage: %s <size_in_bytes> [dst [src]]\n" , argv[0 ]); +return 1 ; + } + sz =simple_strtol (argv[1 ],NULL ,10 ); +if (sz <0 ) { +printf ("%s: %s: invalid argument\n" , argv[0 ], argv[1 ]); +return 1 ; + } +if (argc >2 ) { + dst = (void *)hextoul (argv[2 ],NULL ); +if (argc >3 ) { + src = (void *)hextoul (argv[3 ],NULL ); + }else { + src =malloc (sz); + } + }else { + dst =malloc (sz); + src =malloc (sz); + } +if (!src || !dst) { +printf ("%s: out of memory or NULL address\n" , argv[0 ]); +return 1 ; + } +printf ("%ld bytes from 0x%p to 0x%p: " , sz, src, dst); + t0 =get_timer (0 ); +memcpy (dst, src, sz); + delta =get_timer (t0); +printf ("%ld ms\n" , delta); + +return 0 ; +} + +U_BOOT_CMD ( + mtest,CONFIG_SYS_MAXARGS ,0 , do_mtest, +"memcpy() speed test" , +NULL +);I can see that there are ranges of memory that are very slow to *write* to (and the loadaddr used by the tftp test happens to fall in that range):
$ make qemu_arm64_defconfig $ make -j$(nproc) CROSS_COMPILE="ccache aarch64-linux-gnu-" $ qemu-system-aarch64 -M virt -nographic -cpu cortex-a57 -bios u-boot.bin
Quoted 13 lines
Quoted 11 lines
U-Boot 2024.10-rc1-00195-g35ce7016c9cb-dirty (Aug 19 2024 - 16:42:15 +0200) [...]
=> mtest
Usage: mtest <size_in_bytes> [dst [src]]
=> mtest 1000
1000 bytes from0x00000000466baed0to0x00000000466baae0: 0 ms => mtest 10000x20000000x00000000466baed0
1000 bytes from0x00000000466baed0to0x0000000002000000: 22 ms => mtest 10000x00000000466baed00x2000000
1000 bytes from0x0000000002000000to0x00000000466baed0: 0 ms =>This is all very strange. Can you investigate a bit please?
OK, so this was actually a red herring :-/ For some reason I kept using address 2000000 for my tests and it happens to be memory-mapped I/O for the flash storage in QEMU. That's why it is so slow, but we don't care.
The qemu_arm64 failure in CI was actually caused by DHCP not setting ${serverip} so TFTP would fail afterwards. This is fixed in v9.
Fixed also are the r2dplus_i82557c and r2dplus_rtl8139 failures which were caused by calling free_pkt() with a length of zero, as well as the "dm_pci_phys_to_bus: invalid physical address" error on r2dplus_tulip (eth_init_rings() was called too late).
I am now runnig CI again. It should hopefully be all green. Stay tuned for v9 ;)
Thanks,
Signature · 1 line
Jerome