September 2024 - U-Boot

[PATCH 0/2] Bump new hush commits and fix old hush test behavior
by Francis Laniel 15 Sep '24

15 Sep '24

Hi! With this series, I bumped the new hush to get the latest commits from upstream. Also, I added back a reverted commit which goal was to fix a bad behavior in old hush test. I had to tweak a bit this commit, but everything worked both locally and in the CI [1]. Francis Laniel (1): cli: modern_hush: Add upstream commits up to 13 July 2024 Ion Agorria (1): test: hush: dollar: fix bugous behavior common/cli_hush_modern.c | 2 +- common/cli_hush_upstream.c | 150 ++++++++++++++++++++++++------------- test/hush/dollar.c | 31 +++----- 3 files changed, 110 insertions(+), 73 deletions(-) Best regards. --- [1]: https://github.com/u-boot/u-boot/runs/29350673974 -- 2.34.1

2 4

persistent environment
by Vincent Legoll 14 Sep '24

14 Sep '24

Hello, I'm struggling to setup u-boot to be able to save the environment. The board is Pine64 QuartzPro64. ATF is collabora's: https://gitlab.collabora.com/hardware-enablement/rockchip-3588/trusted-firm… collabora-enablement-tfa/master 44418fce30938ee483fbfc79cc32fde33753d1aa rkbin is https://github.com/rockchip-linux/rkbin.git master a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0 U-boot is: https://source.denx.de/u-boot/u-boot.git master 1630ff26cc960439b5949b80cfc604a2c8aa47dd export BL31=../trusted-firmware-a/build/rk3588/release/bl31/bl31.elf export ROCKCHIP_TPL=../rkbin/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_eyescan_v1.11.bin make quartzpro64-rk3588_defconfig make CROSS_COMPILE=aarch64-linux-gnu- SD card is GPT partitionned: Device Start End Sectors Size Type /dev/mmcblk1p1 64 16383 16320 8M Linux filesystem /dev/mmcblk1p2 16384 32767 16384 8M Linux filesystem /dev/mmcblk1p3 32768 65535 32768 16M Linux filesystem /dev/mmcblk1p4 65536 1114111 1048576 512M EFI System /dev/mmcblk1p5 1114112 8388607 7274496 3.5G Linux filesystem I put on: * mmcblk1p1: idbloader.img * mmcblk1p2: u-boot.itb environment should be on : mmcblk1p3 I tried to use: CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_SYS_MMC_ENV_PART=3 CONFIG_ENV_SIZE=0x1f000 CONFIG_ENV_OFFSET=0x3f8000 I tried to add: * USE_ENV_MMC_PARTITION I tried to change ENV_OFFSET to 0x0 I'm getting: Loading Environment from MMC... MMC partition switch failed *** Warning - MMC partition switch failed, using default environment [...] => env info env_valid = valid env_ready = true env_use_default = true => env erase Erasing Environment on MMC... MMC partition switch failed MMC partition switch failed Failed (1) => env select MMC Select Environment on MMC: OK => env select MMC 1:3 Select Environment on MMC: OK => env erase Erasing Environment on MMC... MMC partition switch failed MMC partition switch failed Failed (1) I've attached the config and a more complete serial console log. I'm probably doing something wrong, but I can't see it. I'd like some hints about how to get further. Thanks -- Vincent Legoll

2 3

[NEXT] Pull request efi-next-20241024
by Heinrich Schuchardt 13 Sep '24

13 Sep '24

Dear Tom, The following changes since commit 78d898eec080b02059c8dc09318b8761044fea85: Merge patch series "phycore-am62/4: Add more boot sources" (2024-09-10 14:56:12 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-next-20241024 for you to fetch changes up to 7de51622a2cf901e888d703a7bea33ad16645d3b: efi_loader: Put back copyright message (2024-09-12 17:36:27 +0200) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/22326 ---------------------------------------------------------------- Pull request efi-next-20241024 UEFI: * Use generated UUIDs in UEFI capsules: - efi: define struct efi_guid - lib: uuid: add UUID v5 support - efi: add a helper to generate dynamic UUIDs - doc: uefi: document dynamic UUID generation - sandbox: switch to dynamic UUIDs - lib: uuid: supporting building as part of host tools - include: export uuid.h - tools: mkeficapsule: use u-boot UUID library - tools: mkeficapsule: support generating dynamic GUIDs - test: lib/uuid: add unit tests for dynamic UUIDs - test: lib/uuid: add tests for UUID version/variant bits * Minor code clean-up - shorten efi_bootmgr_release_uridp_resource() - rename efi_bootmgr_image_return_notify - return the correct error in efi_bootmgr_release_uridp() - Kconfig: clean up the efi configuration status - Use puts() in cout so that console recording works - Put back copyright message in helloworld.c ---------------------------------------------------------------- Caleb Connolly (11): efi: define struct efi_guid lib: uuid: add UUID v5 support efi: add a helper to generate dynamic UUIDs doc: uefi: document dynamic UUID generation sandbox: switch to dynamic UUIDs lib: uuid: supporting building as part of host tools include: export uuid.h tools: mkeficapsule: use u-boot UUID library tools: mkeficapsule: support generating dynamic GUIDs test: lib/uuid: add unit tests for dynamic UUIDs test: lib/uuid: add tests for UUID version/variant bits Ilias Apalodimas (4): efi_loader: shorten efi_bootmgr_release_uridp_resource() efi_loader: rename efi_bootmgr_image_return_notify efi_loader: return the correct error in efi_bootmgr_release_uridp() Kconfig: clean up the efi configuration status Simon Glass (2): efi_loader: Use puts() in cout so that console recording works efi_loader: Put back copyright message arch/arm/mach-rockchip/board.c | 2 +- board/cobra5272/flash.c | 2 +- board/gardena/smart-gateway-mt7688/board.c | 2 +- board/sandbox/sandbox.c | 16 -- board/socrates/socrates.c | 2 +- board/xilinx/common/board.c | 2 +- boot/Kconfig | 2 + cmd/efi.c | 2 +- cmd/efi_common.c | 2 +- cmd/flash.c | 2 +- cmd/gpt.c | 2 +- cmd/nvedit_efi.c | 2 +- cmd/x86/hob.c | 2 +- common/flash.c | 2 +- disk/part_efi.c | 2 +- doc/develop/uefi/uefi.rst | 27 +++ doc/mkeficapsule.1 | 23 +++ drivers/firmware/arm-ffa/arm-ffa-uclass.c | 2 +- env/sf.c | 2 +- fs/btrfs/btrfs.c | 2 +- fs/btrfs/compat.h | 2 +- fs/btrfs/disk-io.c | 2 +- fs/ext4/ext4fs.c | 2 +- include/efi.h | 2 +- include/fwu.h | 2 +- include/part.h | 2 +- include/rkmtd.h | 2 +- include/sandbox_efi_capsule.h | 6 +- include/{ => u-boot}/uuid.h | 21 +- lib/Kconfig | 3 +- lib/acpi/acpi_dp.c | 2 +- lib/acpi/acpigen.c | 2 +- lib/efi/Kconfig | 5 + lib/efi/efi_app.c | 2 +- lib/efi_loader/Kconfig | 215 ++++++++++++--------- lib/efi_loader/efi_bootmgr.c | 28 +-- lib/efi_loader/efi_capsule.c | 1 + lib/efi_loader/efi_console.c | 2 +- lib/efi_loader/efi_device_path.c | 2 +- lib/efi_loader/efi_firmware.c | 55 +++++- lib/efi_loader/efi_variable.c | 2 +- lib/efi_loader/helloworld.c | 3 + lib/fwu_updates/fwu_mtd.c | 2 +- lib/uuid.c | 103 ++++++++-- lib/vsprintf.c | 2 +- net/bootp.c | 2 +- test/dm/acpi_dp.c | 2 +- test/dm/acpigen.c | 2 +- test/lib/uuid.c | 124 +++++++++++- .../test_efi_capsule/test_capsule_firmware_fit.py | 2 +- .../test_efi_capsule/test_capsule_firmware_raw.py | 8 +- .../test_capsule_firmware_signed_fit.py | 2 +- .../test_capsule_firmware_signed_raw.py | 4 +- test/py/tests/test_efi_capsule/version.dtso | 6 +- tools/Makefile | 8 +- tools/binman/etype/efi_capsule.py | 2 +- tools/binman/ftest.py | 2 +- tools/eficapsule.h | 2 +- tools/mkeficapsule.c | 208 +++++++++++++++----- 59 files changed, 692 insertions(+), 252 deletions(-) rename include/{ => u-boot}/uuid.h (90%)

2 1

[MASTER] Pull request doc-2024-10-rc4
by Heinrich Schuchardt 13 Sep '24

13 Sep '24

Hello Tom, The following changes since commit 5f044932413694475422d4b16607dfcf9aff8781: scripts/Makefile.lib: do not include CONFIG_DEVICE_TREE_INCLUDES in dtsi_include_list (2024-09-10 11:31:54 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/doc-2024-10-rc4 for you to fetch changes up to ff994a3c2ed0e8d233bcc6f0176ef21ea9c75009: binman: Update links for sending patches (2024-09-12 18:14:50 +0200) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/22327 ---------------------------------------------------------------- Pull request doc-2024-10-rc4 * doc/develop/sending_patches.rst: Clarify when to use which branch * doc/arch/m68k.rst: Update toolchain comment * doc/arch/mips.rst: Update toolchain list * doc: Update rST to not reference the old wiki * doc/mkeficapsule.1: Update homepage link * bootcount: Update to point to current documentation * binman: Update links for sending patches ---------------------------------------------------------------- Tom Rini (7): doc/develop/sending_patches.rst: Clarify when to use which branch doc/arch/m68k.rst: Update toolchain comment doc/arch/mips.rst: Update toolchain list doc: Update rST to not reference the old wiki doc/mkeficapsule.1: Update homepage link bootcount: Update to point to current documentation binman: Update links for sending patches doc/arch/m68k.rst | 6 +++--- doc/arch/mips.rst | 3 +-- doc/develop/process.rst | 5 ++--- doc/develop/sending_patches.rst | 14 ++++++++------ doc/develop/version.rst | 2 +- doc/device-tree-bindings/bootcount-syscon.txt | 2 +- doc/mkeficapsule.1 | 2 +- drivers/bootcount/Kconfig | 2 +- tools/binman/entries.rst | 2 +- tools/binman/etype/atf_fip.py | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-)

2 1

[PATCH v3] mtd: spi-nor: Fix chip erase timeout issue
by Ye Li 13 Sep '24

13 Sep '24

Chip erase support was added to spi_nor_erase, but the timeout for polling SR ready is not updated and still for sector erase. So the timeout value is not enough for chip erase on some NOR flash. Follow kernel implementation 09b6a377687b ("mtd: spi-nor: scale up timeout for full-chip erase") to set new timeout for chip erase. Fixes: b91a0822d752 ("mtd: spi-nor: Add CHIP_ERASE optimization") Signed-off-by: Ye Li <ye.li(a)nxp.com> --- Changes in v3: - Replace spi_nor_wait_till_ready Changes in v2: - use do_div for u64 - Keep the variables in reverse xmas-tree - Add kernel commit info drivers/mtd/spi/spi-nor-core.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index ce01d42cfe0f..1bddf7cf755f 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -45,6 +45,12 @@ #define DEFAULT_READY_WAIT_JIFFIES (40UL * HZ) +/* + * For full-chip erase, calibrated to a 2MB flash (M25P16); should be scaled up + * for larger flash + */ +#define CHIP_ERASE_2MB_READY_WAIT_JIFFIES (40UL * HZ) + #define ROUND_UP_TO(x, y) (((x) + (y) - 1) / (y) * (y)) struct sfdp_parameter_header { @@ -989,8 +995,10 @@ static int spi_nor_erase_sector(struct spi_nor *nor, u32 addr) */ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) { + unsigned long timeout = DEFAULT_READY_WAIT_JIFFIES; struct spi_nor *nor = mtd_to_spi_nor(mtd); bool addr_known = false; + u64 sz = mtd->size; u32 addr, len, rem; int ret, err; @@ -1028,6 +1036,14 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) if (len == mtd->size && !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) { ret = spi_nor_erase_chip(nor); + /* + * Scale the timeout linearly with the size of the flash, with + * a minimum calibrated to an old 2MB flash. We could try to + * pull these from CFI/SFDP, but these values should be good + * enough for now. + */ + do_div(sz, SZ_2M); + timeout = CHIP_ERASE_2MB_READY_WAIT_JIFFIES * max(1ULL, sz); } else { ret = spi_nor_erase_sector(nor, addr); } @@ -1037,7 +1053,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) addr += ret; len -= ret; - ret = spi_nor_wait_till_ready(nor); + ret = spi_nor_wait_till_ready_with_timeout(nor, timeout); if (ret) goto erase_err; } -- 2.7.4

2 1

[PATCH] dfu: fix Kconfig dependencies
by Jerome Forissier 13 Sep '24

13 Sep '24

Fix link errors caused by missing Kconfig dependencies: 1. DFU_OVER_USB compiles common/dfu.c which calls g_dnl_clear_detach() which is implemented in drivers/usb/gadget/g_dnl.c which needs USB_GADGET_DOWNLOAD. Test case: $ printf "CONFIG_USB_GADGET_DOWNLOAD=n\nCONFIG_USB_FUNCTION_FASTBOOT=n" \ >>configs/am62px_evm_a53_defconfig $ make am62px_evm_a53_defconfig $ make CROSS_COMPILE=aarch64-linux-gnu- [...] common/dfu.c:34:(.text.run_usb_dnl_gadget+0x68): undefined reference to `g_dnl_clear_detach [...] 2. With the above fixed, the same build causes: common/spl/spl_dfu.c:29:(.text.spl_dfu_cmd+0xb0): undefined reference to `run_usb_dnl_gadget' This is because SPL_DFU compiles common/spl/spl_dfu.c which calls run_usb_dnl_gadget() which is implemented in common/dfu.c which needs DFU_OVER_USB. Therefore add these dependencies to Kconfig. Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> --- drivers/dfu/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig index d034b501360..604386bb734 100644 --- a/drivers/dfu/Kconfig +++ b/drivers/dfu/Kconfig @@ -7,7 +7,7 @@ config DFU config DFU_OVER_USB bool select HASH - depends on USB_GADGET + depends on USB_GADGET_DOWNLOAD config DFU_OVER_TFTP bool diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 03fe3bca197..9921d3e0a77 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -323,6 +323,7 @@ config SPL_DFU bool "Support DFU (Device Firmware Upgrade) in SPL" select SPL_HASH select SPL_DFU_NO_RESET + depends on DFU_OVER_USB depends on SPL_RAM_SUPPORT help This feature enables the DFU (Device Firmware Upgrade) in SPL with -- 2.40.1

4 4

[PATCH v10 00/25] Introduce the lwIP network stack
by Jerome Forissier 13 Sep '24

13 Sep '24

This is a rework of a patch series by Maxim Uvarov: "net/lwip: add lwip library for the network stack" [1]. The goal is to introduce the lwIP TCP/IP stack [2] [3] as an alternative to the current implementation in net/, selectable with Kconfig, and ultimately keep only lwIP if possible. Some reasons for doing so are: - Make the support of HTTPS in the wget command easier. Javier T. and Raymond M. (CC'd) have some additional lwIP and Mbed TLS patches to do so. With that it becomes possible to fetch and launch a distro installer such as Debian etc. using a secure, authenticated connection directly from the U-Boot shell. Several use cases: * Authentication: prevent MITM attack (third party replacing the binary with a different one) * Confidentiality: prevent third parties from grabbing a copy of the image as it is being downloaded * Allow connection to servers that do not support plain HTTP anymore (this is becoming more and more common on the Internet these days) - Possibly benefit from additional features implemented in lwIP - Less code to maintain in U-Boot Prior to applying this series, the lwIP stack needs to be added as a Git subtree with the following command: $ git subtree add --squash --prefix lib/lwip/lwip \ https://github.com/lwip-tcpip/lwip.git STABLE-2_2_0_RELEASE Notes 1. A number of features are currently incompatible with NET_LWIP: 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 in CI, a new QEMU configuration is introduced (qemu_arm64_lwip_defconfig) which is the sameas qemu_arm64_defconfig but with NET_LWIP and CMD_*_LWIP enabled. Functional tests are added to test/py/tests/test_net.py for that configuration. In addition to that, this series has some [TESTING] patches which make NET_LWIP the default and opt-out the platforms that would fail CI otherwise (~130 of them out of ~1340, among which ~100 is because of PXE). [1] https://lore.kernel.org/all/20231127125726.3735-1-maxim.uvarov@linaro.org/ [2] https://www.nongnu.org/lwip/ [3] https://en.wikipedia.org/wiki/LwIP Changes in v10: - Rebase onto next - URL for lwIP changed in cover letter: using GitHub now since all tags have suddenly disappeared from the repository on gnu.org. - Post fixes as a separate series [1] or individual patches [2] [3] - Add "if NET_LWIP" to net/lwip/Kconfig to fix a kconfig warning when doing the full branch build with buildman ("[NEW]") - net/ is added to libs-y only when NET or NET_LWIP, not NO_NET - Apply review tags [1] http://patchwork.ozlabs.org/project/uboot/list/?series=422079 https://lists.denx.de/pipermail/u-boot/2024-September/563904.html [2] http://patchwork.ozlabs.org/project/uboot/list/?series=421962 [3] http://patchwork.ozlabs.org/project/uboot/list/?series=421959 Changes in v9: - Rebased onto master, reordered commits to put some fixes that are not strictly related to lwIP first. - New commit "test/py: test_efi_loader: add missing dependency on cmd_tftpboot" (Tom R.) - test_efi_loader.py: add missing dependency on cmd_wget (Tom R.) - wget: fix divide by zero when transfer takes less than 1ms (Tom R.) - New commit "configs: use syntax CONFIG_FOO=n in tools-only_defconfig" (Tom R.) - Make TCP_WND configurable (via CONFIG_LWIP_TCP_WND) because a large value is needed for good performance especially with latency but transfers stall in QEMU (-net user) when the value is larger than a few KB (Anton A., offlist) - Added [TESTING] commits to run CI with NET_LWIP enabled by default except for SANDBOX and platforms that enable PXE, and fixed a number of issues: * coreboot_defconfig: 'implicit declaration' warnings on ip_checksum_ok() and compute_ip_checksum() * Fix EFI net tests (bootefi selftest) by adding missing push_packed() call to net_process_received_packet() * qemu_arm64: fix test_efi_loader.py failures (skip HTTP test by default since it needs a HTTP server; fix a bug in the dhcp command which would not set the "serverip" variable) * QEMU CI tests for r2dplus_i82557c, r2dplus_rtl8139: Fixed receive errors due to calling free_pkt() with a length of zero. r2dplus_tulip: fixed "dm_pci_phys_to_bus: invalid physical address" caused by too late eth_init_rings(). With that the CI status is all GREEN: https://dev.azure.com/u-boot/u-boot/_build/results?buildId=9225&view=results Changes in v8: - Fix bootefi with tftp and wget. It would previously fail with an error message: "No UEFI binary known at 200000". Tested on Raspberry 3B+. Also fix the legacy wget. (Tom R.) - wget: add "Bytes transferred =" message and accept legacy syntax for better compatibility which also makes it easier to add a test to the test suite - wget: When no server name or address is supplied, use ${httpserverip} then ${serverip}. - wget: start the timer used for measuring throughput when the first data block is received. In other words: do not include DNS resolution and TCP connection time in measurement. It gives better numbers ;) but more importantly is how the legacy code works. - wget: handle non-200 result codes from the server as errors. - tftp: when no server name or ip is supplied, use ${tftpserverip} then fall back to ${serverip}. - New commit: "test/py: add HTTP (wget) test" - New commit: "net: wget: removed unused function wget_success()" - Change back all !CONFIG_IS_ENABLED(NO_NET) tests to (CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)) since the NO_NET case is wrong when CONFIG_SPL_BUILD or CONFIG_TPL_BUILD is defined (Tom R.) Changes in v7: - Rebased onto master - Updated binary size comparisons in this cover letter. Note that the increase for imx8mp_evk_defconfig was wrong due to a configuration error. Changes in v6: - Rebased on next - "flash: prefix error codes with FL_" Update drivers/mtd/altera_qspi.c too (Tom R.) - "net: introduce alternative implementation as net-lwip/" Introduce a "Networking" top-level menu in the main Kconfig. Avoids having a lot of network-related symbols on the first screen of menuconfig. The "Networking stack" choice as well as the applicable symbols (depending on the selected choice) are now all inside this "Networking" menu. (Michal S.) For PROT_DHCP_LWIP and PROT_DNS_LWIP, use "select" PROT_UDP_LWIP rather than "depends on". Move NET_RANDOM_ETHADDR to the common ('if NET || NET_LWIP') block. Move SYS_RX_ETH_BUFFER out of 'if NET || NET_LWIP' since it is used unguarded in some code (e.g., am62x_beagleplay_r5) (Tom R.). - "net: split include/net.h into net{,-common,-legacy,-lwip}.h" Move net_random_ethaddr() to net-common.h. - "net: eth-uclass: add function eth_start_udev()" Fix typo and apply Tom R.'s R-b. - "net-lwip: add DHCP support and dhcp commmand" Convert !CONFIG_IS_ENABLED(NET) to CONFIG_IS_ENABLED(NO_NET) in board/xilinx/common/board.c to fix an issue with device having no MAC address (thanks Michal S.). Do the same at other places (icore_mx8mp.c, imx8mp_debix_model_a.c, board/ti/am335x/board.c, tiny-printf.c). Move CMD_MII and CMD_MDIO into 'if NET || NET_LWIP'. - "net-lwip: add TFTP support and tftpboot command": Fix help string. - "net: split cmd/net.c into cmd/net.c and cmd/net-common.c": Apply Ilias' R-b. - "net-lwip: add TFTP_BLOCKSIZE" Apply Ilias' R-b. I moved the TFTP_BLOCKSIZE Kconfig into this commit where it belongs (it was previously in "net" split ... net.h"). Changes in v5: - Rebased on next - Refactor Kconfig options to avoid duplicates - Library functions use a more consistent naming (dhcp_loop(), ping_loop() etc.) and take a struct udevice * parameter (Heinrich S.) - Do not use net_process_receive_packet() for input anymore. Instead of calling eth_rx() which would invoke net_process_receive_packet(), we call a new net_lwip_rx(udev) function which invokes the device recv() and pushes the packets up the lwIP stack. Thus everything is tied to a udevice now. (Heinrich S.) - Add "configs: replace '# CONFIG_NET is not set' with CONFIG_NO_NET=y" (Tom R.) - tftp: unify display with legacy command: add throughput, 65 hashes per line, one every 10 blocks received (Tom R.) - Moved net-lwip/* to net/lwip/* (Simon G.) - Rename static function low_level_output() to linkoutput() since it is the name used in the lwIP netif struct. - Fixed off-by-one in parse_url() which could cause wget to fail when passed a URL with a host name (as opposed to a URL with an IP address). - Improved TFTP performance by adding support for the blksize option (patches "lwip: tftp: add support of blksize option to client" and "net-lwip: add TFTP_BLOCKSIZE) (Tom R.) - Add an optional port number to the tftp command for easier testing (syntax: tftp [[ip:[port:]]filename]) - wget: display an "unsupported URI" error if uri is not http:// (Jon H.) - Adjusted the lwIP TCP options in lib/lwip/u-boot/lwipopts.h for better performance, in particular TCP_WND. - Add "net: fec_mxc_init(): do not ignore return status of fec_open()" - Set the proper environment variables when DHCP succeeds (ipaddr%d etc.) and read the proper ones for the given device in new_netif(), allowing correct behavior when several adapters are available (tested on i.MX8M Plus). - Fix an alignment issue with outgoing packets (see the linkoutput() function). With that the i.MX8M Plus ENET1 interface works properly. (reported by Tim H.). - Add review tags Changes in v4: - Fixed the DHCP algorithm which was missing a sys_timeout() call in the "fine timer" callback. This should close the issue that Tom R. reported with his Raspberry Pi 3 (it does fix it on mine). - The DHCP exchange timeout is increased from 2 to 10 seconds - The DHCP exchange can be interrupted with Ctrl-C. - "net: introduce alternative implementation as net-lwip/": rework dependencies. A few symbols have 'depends on !NET_LWIP' and in addition 'NET_LWIP depends on !SANDBOX'. Sandbox, DSA and fastboot are unsupported, because they are deeply welded to the current stack. - All network commands (dns, ping, tftp and wget): * Get rid of global variables (Ilias A.) * Use printf() rather than log_info() - "net-lwip: add ping command": use packet count instead of timeout, fix code style (Ilias A.) - Add "net: split cmd/net.c into cmd/net.c and cmd/net-common.c" extracted from the wget patch (Ilias A.). - Add "net: split include/net.h into net{,-common,-legacy,-lwip}.h" (Ilias A.) - Add "flash: prefix error codes with FL_" which is required to avoid name clashes when splitting net.h - Reworked the initialization of the lwIP stack. One and only one network interface (struct netif) is added for the duration of the command that uses that interface. That's commit "net-lwip: add DHCP support and dhcp commmand". - Drop "test: dm: dsa, eth: disable tests when CONFIG_NET_LWIP=y", not needed now that NET_LWIP depend on !SANDBOX. - qemu_arm64_lwip_defconfig now enables CMD_DNS and CMD_WGET (so that all the supported network commands are available). Changes in v3: - Make NET_LWIP a Kconfig choice in patch "net: introduce alternative implementation as net-lwip/" (Tom R.) - Drop the patch introducing lwIP as a Git subtree and document the git command in the cover letter instead (Tom R.) - "net-lwip: add TFTP support and tftpboot command": use the same "Bytes transferred =" message as in the legacy implementation (Tom R., Maxim U.) - Drop "test/py: net: add _lwip variants of dhcp, ping and tftpboot tests" which is not needed anymore. - Add missing kfree() calls in cmd/net-common.c and fix the parsing of decimal address in net-lwip/wget.c (patch "net-lwip: add wget command") (Maxim U.) - "net-lwip: add ping command": drop the ICMP payload (Ilias A.). Set the sequence number to zero when entering ping_loop(). Changes in v2: ** Address comments from Ilias A. - "net-lwip: add wget command" Implement the wget_with_dns() function to do most of the wget work and call it from do_wget(). This allows to simplify patch "net-lwip: add support for EFI_HTTP_BOOT". - "net-lwip: import net command from cmd/net.c" Move a few functions from cmd/net.c to a new file cmd/net-common.c rather than duplicating then in cmd/net-lwip.c. - "net-lwip: add support for EFI_HTTP_BOOT" Since wget_with_dns() is now implemented in "net-lwip: add wget command", just enable the wget command when the lwIP stack is enabled and EFI_HTTP_BOOT is requested. ** Address comments from Tom R. - "net-lwip: add DHCP support and dhcp commmand", "net-lwip: add TFTP support and tftpboot command", "net-lwip: add ping command", "net-lwip: add dns command", "net-lwip: add wget command" Do not introduce new CMD_XXX_LWIP symbols and use existing CMD_XXX instead. - "configs: add qemu_arm64_lwip_defconfig" Use #include <configs/qemu_arm64_defconfig>. - "net-lwip: import lwIP library under lib/lwip" Patch removed and replaced by the introduction of a Git subtree: "Squashed 'lib/lwip/lwip/' content from commit 0a0452b2c3". Note that I have not yet addressed your comments on "test: dm: dsa, eth: disable tests when CONFIG_NET_LWIP=y"). I need some more time for that and I think running CI on this v2 will help better understand what is needed for v3. ** Miscellaneous improvements - "net: introduce alternative implementation as net-lwip/": * Make DFU_OVER_TFTP not DFU_TFTP incompatible with NET_LWIP. It seems quite natural to supplement "depends on NET" with "&& !NET_LWIP". * Make PROT_*_LWIP not visible by removing the Kconfig prompt. Jerome Forissier (24): Miscellaneous fixes net: introduce alternative implementation as net-lwip/ configs: replace '# CONFIG_NET is not set' with CONFIG_NO_NET=y net: split include/net.h into net{,-common,-legacy,-lwip}.h net: move copy_filename() to new file net/net-common.c 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 MAINTAINERS: net-lwip: add myself as a maintainer Kconfig: fix undefined symbols (g_dnl*) when NET_LWIP is default enabled configs: use syntax CONFIG_FOO=n in tools-only_defconfig [TESTING] configs: set CONFIG_NET=y for FTGMAC100 [TESTING] configs: set CONFIG_NET=y when PXE is enabled [TESTING] Kconfig: enable NET_LWIP by default except for SANDBOX Jonathan Humphreys (1): net-lwip: lwIP wget supports user defined port in the uri, so allow it. .azure-pipelines.yml | 7 + Kconfig | 31 + MAINTAINERS | 11 + Makefile | 8 +- arch/arm/mach-at91/include/mach/at91_common.h | 2 +- arch/arm/mach-at91/spl_at91.c | 2 +- arch/arm/mach-at91/spl_atmel.c | 2 +- arch/arm/mach-omap2/omap3/emac.c | 1 + .../atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 2 +- board/atmel/at91sam9n12ek/at91sam9n12ek.c | 2 +- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 2 +- .../atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 2 +- .../sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 2 +- board/atmel/sama5d2_icp/sama5d2_icp.c | 2 +- .../atmel/sama5d2_xplained/sama5d2_xplained.c | 2 +- .../atmel/sama5d3_xplained/sama5d3_xplained.c | 2 +- board/atmel/sama5d3xek/sama5d3xek.c | 2 +- .../atmel/sama5d4_xplained/sama5d4_xplained.c | 2 +- board/atmel/sama5d4ek/sama5d4ek.c | 2 +- board/cobra5272/flash.c | 26 +- .../conclusive/kstr-sama5d27/kstr-sama5d27.c | 2 +- board/engicam/imx8mp/icore_mx8mp.c | 2 +- board/freescale/m5253demo/flash.c | 6 +- board/gardena/smart-gateway-at91sam/spl.c | 2 +- .../imx8mp_debix_model_a.c | 2 +- board/siemens/corvus/board.c | 2 +- board/siemens/smartweb/smartweb.c | 2 +- board/siemens/taurus/taurus.c | 2 +- board/ti/am335x/board.c | 3 +- board/xilinx/common/board.c | 3 +- boot/Kconfig | 4 +- cmd/Kconfig | 131 +-- 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 | 3 +- 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/ad401_defconfig | 1 + configs/am335x_pdu001_defconfig | 2 +- configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_qspiboot_defconfig | 1 + configs/am43xx_evm_rtconly_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am43xx_hs_evm_defconfig | 1 + configs/am43xx_hs_evm_qspi_defconfig | 1 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/am57xx_hs_evm_usb_defconfig | 1 + configs/am62ax_evm_r5_defconfig | 2 +- configs/am62px_evm_r5_defconfig | 2 +- configs/am62x_beagleplay_r5_defconfig | 2 +- configs/amcore_defconfig | 2 +- configs/amd_versal2_mini_defconfig | 2 +- configs/amd_versal2_mini_emmc_defconfig | 2 +- configs/amd_versal2_mini_ospi_defconfig | 2 +- configs/amd_versal2_mini_qspi_defconfig | 2 +- configs/anbernic-rgxx3-rk3566_defconfig | 2 +- configs/ap143_defconfig | 2 +- configs/ap152_defconfig | 2 +- configs/apple_m1_defconfig | 2 +- configs/arndale_defconfig | 1 + configs/astro_mcf5373l_defconfig | 2 +- configs/at91sam9rlek_dataflash_defconfig | 2 +- configs/at91sam9rlek_mmc_defconfig | 2 +- configs/at91sam9rlek_nandflash_defconfig | 2 +- configs/bananapi-cm4-cm4io_defconfig | 1 + configs/bananapi-m2-pro_defconfig | 1 + configs/bananapi-m2s_defconfig | 1 + configs/bananapi-m5_defconfig | 1 + configs/bcm7260_defconfig | 2 +- configs/bcm7445_defconfig | 2 +- configs/bcm968380gerg_ram_defconfig | 2 +- configs/bcmns_defconfig | 2 +- configs/beelink-gsking-x_defconfig | 1 + configs/beelink-gt1-ultimate_defconfig | 1 + configs/beelink-gtking_defconfig | 1 + configs/beelink-gtkingpro_defconfig | 1 + configs/chromebook_samus_tpl_defconfig | 2 +- configs/clearfog_defconfig | 1 + configs/clearfog_gt_8k_defconfig | 1 + configs/clearfog_sata_defconfig | 1 + configs/clearfog_spi_defconfig | 1 + configs/cortina_presidio-asic-base_defconfig | 2 +- configs/cortina_presidio-asic-pnand_defconfig | 2 +- configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + configs/dra7xx_hs_evm_usb_defconfig | 1 + 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-ast2500_defconfig | 1 + configs/evb-ast2600_defconfig | 1 + configs/evb-px5_defconfig | 2 +- configs/generic-rk3568_defconfig | 2 +- configs/generic-rk3588_defconfig | 2 +- configs/hc2910_2aghd05_defconfig | 2 +- configs/helios4_defconfig | 1 + configs/igep00x0_defconfig | 2 +- configs/imx6q_bosch_acc_defconfig | 2 +- configs/imx6ulz_smm_m2_defconfig | 2 +- configs/imx8mn_var_som_defconfig | 1 + configs/iot_devkit_defconfig | 2 +- configs/j722s_evm_r5_defconfig | 2 +- configs/jethub_j100_defconfig | 1 + configs/jethub_j80_defconfig | 1 + configs/khadas-vim2_defconfig | 1 + configs/khadas-vim3_defconfig | 1 + configs/khadas-vim3l_defconfig | 1 + configs/khadas-vim_defconfig | 1 + configs/kontron-sl-mx6ul_defconfig | 1 + configs/kontron-sl-mx8mm_defconfig | 1 + configs/kontron_pitx_imx8m_defconfig | 1 + configs/kontron_sl28_defconfig | 1 + configs/legoev3_defconfig | 2 +- configs/libretech-ac_defconfig | 1 + configs/libretech-cc_defconfig | 1 + configs/libretech-cc_v2_defconfig | 1 + configs/libretech-s905d-pc_defconfig | 1 + configs/libretech-s912-pc_defconfig | 1 + configs/marsboard_defconfig | 1 + configs/mk808_defconfig | 2 +- configs/mvebu_crb_cn9130_defconfig | 1 + configs/mvebu_db_armada8k_defconfig | 1 + configs/mvebu_db_cn9130_defconfig | 1 + configs/mvebu_mcbin-88f8040_defconfig | 1 + configs/mvebu_puzzle-m801-88f8040_defconfig | 1 + configs/mx23evk_defconfig | 2 +- configs/mx28evk_defconfig | 2 +- configs/mx53cx9020_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/mx6memcal_defconfig | 2 +- configs/mx6ulz_14x14_evk_defconfig | 2 +- configs/mx7dsabresd_defconfig | 1 + configs/mx7dsabresd_qspi_defconfig | 1 + configs/mx7ulp_com_defconfig | 2 +- configs/mx7ulp_evk_defconfig | 2 +- configs/mx7ulp_evk_plugin_defconfig | 2 +- configs/myir_mys_6ulx_defconfig | 1 + configs/nanopi-k2_defconfig | 1 + configs/netgear_cg3100d_ram_defconfig | 2 +- configs/novena_defconfig | 1 + configs/nsim_700_defconfig | 2 +- configs/nsim_700be_defconfig | 2 +- configs/nsim_hs38be_defconfig | 2 +- configs/odroid-c2_defconfig | 1 + configs/odroid-c4_defconfig | 1 + configs/odroid-go-ultra_defconfig | 1 + configs/odroid-hc4_defconfig | 1 + configs/odroid-n2_defconfig | 1 + configs/odroid-n2l_defconfig | 1 + configs/odroid-xu3_defconfig | 1 + configs/openpiton_riscv64_defconfig | 2 +- configs/openpiton_riscv64_spl_defconfig | 2 +- configs/origen_defconfig | 2 +- configs/p200_defconfig | 1 + configs/p201_defconfig | 1 + configs/p212_defconfig | 1 + configs/pe2201_defconfig | 2 +- configs/peach-pi_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/phycore_pcl063_defconfig | 1 + configs/pico-dwarf-imx6ul_defconfig | 1 + configs/pico-dwarf-imx7d_defconfig | 1 + configs/pico-hobbit-imx6ul_defconfig | 1 + configs/pico-hobbit-imx7d_defconfig | 1 + configs/pico-imx6ul_defconfig | 1 + configs/pico-imx7d_bl33_defconfig | 1 + configs/pico-imx7d_defconfig | 1 + configs/pico-nymph-imx7d_defconfig | 1 + configs/pico-pi-imx6ul_defconfig | 1 + configs/pico-pi-imx7d_defconfig | 1 + configs/pinecube_defconfig | 2 +- configs/pm9261_defconfig | 2 +- configs/qemu_arm64_lwip_defconfig | 10 + configs/radxa-zero2_defconfig | 1 + configs/radxa-zero_defconfig | 1 + configs/riotboard_defconfig | 1 + configs/s400_defconfig | 1 + 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/seeed_npi_imx6ull_defconfig | 1 + configs/sipeed_maix_bitm_defconfig | 2 +- configs/sipeed_maix_smode_defconfig | 2 +- configs/smdk5250_defconfig | 1 + configs/smdk5420_defconfig | 1 + configs/snow_defconfig | 1 + configs/spring_defconfig | 1 + 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/ten64_tfa_defconfig | 1 + configs/th1520_lpi4a_defconfig | 2 +- configs/thunderx_88xx_defconfig | 2 +- configs/tools-only_defconfig | 34 +- 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/turris_mox_defconfig | 1 + configs/turris_omnia_defconfig | 1 + configs/u200_defconfig | 1 + configs/vexpress_aemv8a_juno_defconfig | 1 + configs/vexpress_aemv8a_semi_defconfig | 1 + configs/vexpress_aemv8r_defconfig | 1 + configs/vexpress_ca9x4_defconfig | 1 + configs/vexpress_fvp_defconfig | 1 + configs/videostrong-kii-pro_defconfig | 1 + configs/wandboard_defconfig | 1 + configs/wetek-core2_defconfig | 1 + configs/wetek-hub_defconfig | 1 + configs/wetek-play2_defconfig | 1 + 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 | 2 + drivers/fastboot/Kconfig | 1 + drivers/mtd/altera_qspi.c | 4 +- drivers/mtd/cfi_flash.c | 36 +- drivers/net/Kconfig | 4 +- drivers/net/fec_mxc.c | 3 +- drivers/net/fm/eth.c | 10 +- drivers/net/phy/Kconfig | 3 +- drivers/usb/gadget/Kconfig | 3 +- include/configs/ethernut5.h | 2 - include/flash.h | 20 +- include/net-common.h | 490 +++++++++ include/net-legacy.h | 560 +++++++++++ include/net-lwip.h | 41 + 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 | 45 + lib/lwip/u-boot/arch/sys_arch.h | 0 lib/lwip/u-boot/limits.h | 0 lib/lwip/u-boot/lwipopts.h | 157 +++ lib/tiny-printf.c | 3 +- net/Kconfig | 81 +- net/Makefile | 20 +- net/eth-uclass.c | 38 +- net/lwip/Kconfig | 48 + net/lwip/Makefile | 8 + net/lwip/dhcp.c | 134 +++ net/lwip/dns.c | 127 +++ net/lwip/eth_internal.h | 35 + net/lwip/net-lwip.c | 302 ++++++ net/lwip/ping.c | 177 ++++ net/lwip/tftp.c | 286 ++++++ net/lwip/wget.c | 357 +++++++ net/net-common.c | 13 + net/net.c | 35 +- net/wget.c | 11 +- test/py/tests/test_efi_loader.py | 62 +- test/py/tests/test_net_boot.py | 2 +- tools/buildman/test.py | 46 + tools/buildman/toolchain.py | 6 +- 301 files changed, 3785 insertions(+), 1460 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 create mode 100644 net/net-common.c -- 2.40.1

3 34

[PATCH v2 0/6] Miscellaneous FWU fixes
by Sughosh Ganu 13 Sep '24

13 Sep '24

The following set of patches are miscellaneous fixes and some hardening of the FWU update logic. Changes since V1: * Squash patch 1 and 2 in the earlier version into a single patch. * Have a single check for image descriptor offset, and have a log message mention that image descriptor mandatory. * Use a macro FWU_IMG_DESC_OFFSET for the image descriptor offset. * Use the enum names for primary and secondary partitions from fwu.h instead of defining new macros. Sughosh Ganu (6): fwu: v2: try reading both copies of metadata fwu: v1: do a version check for the metadata fwu: check all images for transitioning out of Trial State fwu: add dependency checks for selecting FWU metadata version fwu: do not allow capsule processing on exceeding Trial Counter threshold fwu: print a message if empty capsule checks fail include/fwu.h | 11 +++++ lib/efi_loader/efi_capsule.c | 11 +++-- lib/fwu_updates/Kconfig | 1 + lib/fwu_updates/fwu.c | 31 +++++++++++++- lib/fwu_updates/fwu_v1.c | 18 ++++++-- lib/fwu_updates/fwu_v2.c | 81 ++++++++++++++++++++---------------- 6 files changed, 108 insertions(+), 45 deletions(-) -- 2.34.1

2 7

[PATCH] board: rpi: Enable capsule updates
by Ilias Apalodimas 13 Sep '24

13 Sep '24

Since RPI works well using EFI and has no size limitations with regards to U-Boot, add the needed structures and Kconfig options needed to enable capsule updates --- board/raspberrypi/rpi/rpi.c | 22 ++++++++++++++++++++++ configs/rpi_4_defconfig | 2 ++ 2 files changed, 24 insertions(+) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index ab5ea85cf9f8..1f342eee12b2 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -63,6 +63,28 @@ struct msg_get_clock_rate { u32 end_tag; }; +struct efi_fw_image fw_images[] = { + { + .fw_name = u"RPI_UBOOT", + .image_index = 1, + }, +}; + +struct efi_capsule_update_info update_info = { + .dfu_string = "mmc 0=u-boot.bin fat 0 1", + .num_images = ARRAY_SIZE(fw_images), + .images = fw_images, +}; + +#if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO) +void set_dfu_alt_info(char *interface, char *devstr) +{ + if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) + env_set("dfu_alt_info", update_info.dfu_string); +} +#endif + + #ifdef CONFIG_ARM64 #define DTB_DIR "broadcom/" #else diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index f5fb322aa8fc..c70414e6fcaf 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -65,3 +65,5 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y -- 2.45.2

4 10

[PATCH v3] board: rpi: Enable capsule updates
by Ilias Apalodimas 13 Sep '24

13 Sep '24

Since RPI works well using EFI and has no size limitations with regards to U-Boot, add the needed structures to support capsule updates. While at it update the most commonly used defconfigs and include capsule support and U-Boot commands needed by EFI Tested-by: Sughosh Ganu <sughosh.ganu(a)linaro.org> Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- This needs to be applied *after* https://lore.kernel.org/u-boot/20240830-b4-dynamic-uuid-v8-0-79b31b199bee@l… I managed to test this on rpi5 and works Changes since v2: - Add missing DFU options for rpi3 and rpi defconfigs Changes since v1: - Remove a redundant function definition - Add the required Kconfig options in more defconfigs - add my SoB which was missing... board/raspberrypi/rpi/rpi.c | 13 +++++++++++++ configs/rpi_3_b_plus_defconfig | 8 ++++++++ configs/rpi_3_defconfig | 8 ++++++++ configs/rpi_4_defconfig | 5 +++++ configs/rpi_arm64_defconfig | 8 ++++++++ 5 files changed, 42 insertions(+) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index d996eb0cf695..02800615a25a 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -63,6 +63,19 @@ struct msg_get_clock_rate { u32 end_tag; }; +struct efi_fw_image fw_images[] = { + { + .fw_name = u"RPI_UBOOT", + .image_index = 1, + }, +}; + +struct efi_capsule_update_info update_info = { + .dfu_string = "mmc 0=u-boot.bin fat 0 1", + .num_images = ARRAY_SIZE(fw_images), + .images = fw_images, +}; + #ifdef CONFIG_ARM64 #define DTB_DIR "broadcom/" #else diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig index 3c8f8fc1bb75..a6a8431c8ff4 100644 --- a/configs/rpi_3_b_plus_defconfig +++ b/configs/rpi_3_b_plus_defconfig @@ -19,14 +19,19 @@ CONFIG_SYS_PBSIZE=1049 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_TFTP_TSIZE=y +CONFIG_DFU_MMC=y +CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 +CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 CONFIG_BCM2835_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y @@ -49,3 +54,6 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y +# CONFIG_HEXDUMP is not set +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 9853c448809a..358096f3d1c5 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -19,14 +19,19 @@ CONFIG_SYS_PBSIZE=1049 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_TFTP_TSIZE=y +CONFIG_DFU_MMC=y +CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 +CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 CONFIG_BCM2835_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y @@ -49,3 +54,6 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y +# CONFIG_HEXDUMP is not set +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index f5fb322aa8fc..17b6688e75c5 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -20,11 +20,13 @@ CONFIG_SYS_PBSIZE=1049 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y +CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y @@ -65,3 +67,6 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y +# CONFIG_HEXDUMP is not set +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig index 02f942cf3442..a8723ea24e1c 100644 --- a/configs/rpi_arm64_defconfig +++ b/configs/rpi_arm64_defconfig @@ -18,15 +18,20 @@ CONFIG_SYS_PBSIZE=1049 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y +CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_TFTP_TSIZE=y CONFIG_DM_DMA=y +CONFIG_DFU_MMC=y +CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 +CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 CONFIG_BCM2835_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y @@ -56,3 +61,6 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y +# CONFIG_HEXDUMP is not set +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y -- 2.45.2

1 0