November 2024 - U-Boot

[PATCH] mtd: spi-nor: Enable mt35xu512aba_fixups for all mt35xx flashes
by Venkatesh Yadav Abbarapu 27 Nov '24

27 Nov '24

Enable mt35xu512aba_fixups for all mt35 series flashes to work in DTR mode, and return after nor->fixups is updated, otherwise it will get overwritten with macronix_octal_fixups. This flash works in DTR mode only if CONFIG_SPI_FLASH_MT35XU is enabled and SPI_NOR_OCTAL_DTR_READ flag is set in id table. Additionally, a new flag, "SPI_XFER_SET_DDR", has been introduced to instruct the OSPI controller driver to switch to DDR mode. Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)amd.com> Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> --- drivers/mtd/spi/spi-nor-core.c | 8 +++++++- include/spi.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index ec841fb13b..8d201433d5 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -4073,6 +4073,7 @@ static int spi_nor_micron_octal_dtr_enable(struct spi_nor *nor) if (ret) return ret; + nor->spi->flags |= SPI_XFER_SET_DDR; buf = SPINOR_MT_OCT_DTR; op = (struct spi_mem_op) SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_MT_WR_ANY_REG, 1), @@ -4404,8 +4405,13 @@ void spi_nor_set_fixups(struct spi_nor *nor) #endif #ifdef CONFIG_SPI_FLASH_MT35XU - if (!strcmp(nor->info->name, "mt35xu512aba")) + if (!strcmp(nor->info->name, "mt35xu512aba") || + !strcmp(nor->info->name, "mt35xl512aba") || + !strcmp(nor->info->name, "mt35xu01g") || + !strcmp(nor->info->name, "mt35xu02g")) { nor->fixups = &mt35xu512aba_fixups; + return; + } #endif #if CONFIG_IS_ENABLED(SPI_FLASH_MACRONIX) diff --git a/include/spi.h b/include/spi.h index 6944773b59..d7fef36662 100644 --- a/include/spi.h +++ b/include/spi.h @@ -164,6 +164,7 @@ struct spi_slave { #define SPI_XFER_U_PAGE BIT(4) #define SPI_XFER_STACKED BIT(5) #define SPI_XFER_LOWER BIT(6) +#define SPI_XFER_SET_DDR BIT(7) /* * Flag indicating that the spi-controller has multi chip select -- 2.25.1

4 5

[PATCH v5 00/14] efi_loader: efi http and ipconfig drivers
by Adriano Cordova 27 Nov '24

27 Nov '24

Add support for EFI_HTTP_PROTOCOL, EFI_HTTP_SERVICE_BINDING_PROTOCOL, and EFI_IP4_CONFIG2_PROTOCOL. This series depends on the series 'wget: Expose wget to applications', also found at: https://github.com/0n41rd4/u-boot/commits/http-driver-wget The fist two patches of this series are not efi specific and have also been sent to the corresponding maintainers, but this series depends on them, so they are added here for redundancy. A branch with both series of patches, concatenated, is at: https://github.com/0n41rd4/u-boot/commits/efi-http-driver Adriano Cordova (12): net: wget: let wget_with_dns work with dns disabled efi_loader: device_path: add definition of DEVICE_PATH_SUB_TYPE_MSG_IPV4 efi_loader: device_path: add efi_dp_from_ipv4 efi_api: add definitions for HTTP and IP4_CONFIG2 protocols efi_loader: efi_net: add efi_net_set_addr, efi_net_get_addr efi_loader: device_path: add support for HTTP device path efi_loader: net: set EFI bootdevice device path to HTTP when loaded from wget efi_loader: net: add support to send http requests and parse http headers efi_loader: efi_net: add EFI_IP4_CONFIG2_PROTOCOL efi_loader: efi_net: add EFI_HTTP_PROTOCOL efi_selftest: add test for HTTP protocol efi_selftest: add test for IPv4 Config2 protocol Heinrich Schuchardt (2): efi_loader: add IPv4() to device path to text protocol lib: uuid: display HTTP and IPV4 Config II protocols include/efi_api.h | 220 +++++++++ include/efi_loader.h | 42 ++ include/net-common.h | 7 +- lib/efi_loader/Kconfig | 17 + lib/efi_loader/Makefile | 2 + lib/efi_loader/efi_bootmgr.c | 2 +- lib/efi_loader/efi_device_path.c | 108 ++++- lib/efi_loader/efi_device_path_to_text.c | 23 + lib/efi_loader/efi_http.c | 548 +++++++++++++++++++++++ lib/efi_loader/efi_ipconfig.c | 214 +++++++++ lib/efi_loader/efi_net.c | 360 ++++++++++++++- lib/efi_selftest/Makefile | 2 + lib/efi_selftest/efi_selftest_http.c | 315 +++++++++++++ lib/efi_selftest/efi_selftest_ipconfig.c | 170 +++++++ lib/uuid.c | 14 + net/lwip/wget.c | 5 +- net/net-common.c | 2 +- net/wget.c | 35 +- 18 files changed, 2059 insertions(+), 27 deletions(-) create mode 100644 lib/efi_loader/efi_http.c create mode 100644 lib/efi_loader/efi_ipconfig.c create mode 100644 lib/efi_selftest/efi_selftest_http.c create mode 100644 lib/efi_selftest/efi_selftest_ipconfig.c -- 2.43.0

5 21

[GIT PULL] Please pull u-boot-dfu-next-20241126
by Mattijs Korpershoek 27 Nov '24

27 Nov '24

Hi Tom, Please find some new developments for next: Android: - bootstd: Implement bootimage v2 support - bootstd: Support non-A/B in bootmeth_android - Migrate VIM3 and VIM3L to use bootmeth_android - bootstd: Additional test for bootimage v2 - bootstd: Optimize load time when reading partitions CI job: - https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/23573 Thanks, Mattijs The following changes since commit 48380f9b2a12e3fc6339d6af5a154bded769d911: Merge tag 'v2025.01-rc3' into next (2024-11-25 17:34:08 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-dfu.git tags/u-boot-dfu-next-20241126 for you to fetch changes up to abadcda24b100b8eb0f138085cca6595518cec85: bootstd: android: don't read whole partition sizes (2024-11-26 10:04:40 +0100) ---------------------------------------------------------------- u-boot-dfu-next-20241126 Android: - bootstd: Implement bootimage v2 support - bootstd: Support non-A/B in bootmeth_android - Migrate VIM3 and VIM3L to use bootmeth_android - bootstd: Additional test for bootimage v2 - bootstd: Optimize load time when reading partitions ---------------------------------------------------------------- Guillaume La Roque (5): bootstd: android: add support of bootimage v2 bootstd: android: add non-A/B image support configs: khadas-vim3l_android{_ab}: move on bootmeth android configs: khadas-vim3_android{_ab}: move on bootmeth android bootstd: Add test for Android boot image v2 Julien Masson (1): bootstd: android: don't read whole partition sizes arch/sandbox/dts/test.dts | 10 ++- boot/Kconfig | 1 - boot/bootmeth_android.c | 104 ++++++++++++++++++++++-------- boot/image-android.c | 45 +++++++++++++ configs/am62x_a53_android.config | 1 + configs/khadas-vim3_android_ab_defconfig | 7 +- configs/khadas-vim3_android_defconfig | 7 +- configs/khadas-vim3l_android_ab_defconfig | 7 +- configs/khadas-vim3l_android_defconfig | 7 +- configs/sandbox_defconfig | 1 + include/configs/khadas-vim3_android.h | 25 +++++-- include/configs/khadas-vim3l_android.h | 25 +++++-- include/configs/meson64_android.h | 6 -- include/image.h | 24 +++++++ test/boot/bootflow.c | 29 ++++++++- test/py/tests/test_ut.py | 49 ++++++++++++++ 16 files changed, 297 insertions(+), 51 deletions(-)

2 1

[GIT PULL] Please pull u-boot-imx-next-20241126
by Fabio Estevam 27 Nov '24

27 Nov '24

Hi Tom, Please pull from u-boot-imx/next, thanks. The following changes since commit 48380f9b2a12e3fc6339d6af5a154bded769d911: Merge tag 'v2025.01-rc3' into next (2024-11-25 17:34:08 -0600) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-next-20241126 for you to fetch changes up to a488d9f26e37bcb5776bc8a2dadb708f1ac9cfdc: board: phytec: phycore-imx8mm: Add EEPROM detection initialisation (2024-11-25 23:08:24 -0300) u-boot-imx-next-20241126 -------------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/23563 - Make Siemens i.MX8 Capricorn board to boot U-Boot mainline again. - Add support for phycore-imx93 2GB LPDDR4X variant. - Add phycore-imx8mm EEPROM detection initialisation. ---------------------------------------------------------------- Alessandro Zini (1): siemens: capricorn: add HW version information to boot log Christoph Stoidner (3): board: phytec: phycore-imx93: Add 2GB LPDDR4X RAM timings board: phytec: imx93: Add eeprom-based hardware introspection board: phytec: imx93: Add phyCORE-i.MX 93 support for all SOM variants Enrico Leto (6): siemens: capricorn: move to cxg3 reference project with deneb board siemens: capricorn: get ram size from system controller siemens: capricorn: get module name from eeprom siemens: add ddr full memory test siemens: add ddr signal integrity test siemens: capricorn: update maintainers Heiko Schocher (13): wdt: imx8qxp: add option to control external PMIC wdt via IMX8 SCU net: fec_mxc: fix probing for imx8qxp tools: imx8image: Improve error message imx: imx_cntr_image.sh: prevent warning for missing spl imx8qxp: Fix build when using SPL siemens: imx8qxp-capricorn-u-boot.dtsi: fix boot siemens: capricorn: use DCD_SKIP entry siemens: imximage.cfg: correct comment siemens: imximage.cfg: sync image names siemens: configs/capricorn_cxg3_defconfig: updates siemens: capricorn: sync spl code with 8qxp-mek siemens: imx8-capricorn.dtsi: add wdt device siemens: capricorn: small board updates Yunus Bas (1): board: phytec: phycore-imx8mm: Add EEPROM detection initialisation arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx8-capricorn-cxg3.dts | 129 ++++ ...corn-u-boot.dtsi => imx8-capricorn-u-boot.dtsi} | 67 +- ...{imx8qxp-capricorn.dtsi => imx8-capricorn.dtsi} | 109 +-- arch/arm/dts/imx8-deneb.dts | 10 - arch/arm/dts/imx8-giedi.dts | 10 - arch/arm/dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi | 8 + arch/arm/dts/imx8qxp-u-boot.dtsi | 2 + arch/arm/dts/imx93-phyboard-segin-u-boot.dtsi | 69 +- arch/arm/mach-imx/imx8/Kconfig | 11 +- arch/arm/mach-imx/imx9/Kconfig | 2 + arch/arm/mach-imx/imx9/soc.c | 2 +- board/boundary/nitrogen6x/nitrogen6x.c | 2 +- board/phytec/common/Kconfig | 8 + board/phytec/common/Makefile | 1 + board/phytec/common/imx93_som_detection.c | 111 +++ board/phytec/common/imx93_som_detection.h | 51 ++ board/phytec/phycore_imx8mm/Kconfig | 1 + board/phytec/phycore_imx8mm/spl.c | 17 + board/phytec/phycore_imx93/Kconfig | 28 + board/phytec/phycore_imx93/MAINTAINERS | 7 +- board/phytec/phycore_imx93/lpddr4_timing.c | 793 +++++++++++++++++++-- board/phytec/phycore_imx93/phycore-imx93.c | 51 ++ board/phytec/phycore_imx93/spl.c | 48 ++ board/siemens/capricorn/Kconfig | 25 +- board/siemens/capricorn/MAINTAINERS | 12 +- board/siemens/capricorn/Makefile | 2 + board/siemens/capricorn/board.c | 70 +- board/siemens/capricorn/imximage.cfg | 21 +- board/siemens/capricorn/spl.c | 43 ++ board/siemens/capricorn/spl_memory_test.c | 158 ++++ board/siemens/capricorn/spl_memory_test.h | 7 + board/siemens/common/Kconfig | 4 + board/siemens/common/board.h | 44 ++ board/siemens/common/ddr_si_test.c | 348 +++++++++ board/siemens/draco/board.h | 10 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 +- .../{deneb_defconfig => capricorn_cxg3_defconfig} | 21 +- configs/giedi_defconfig | 133 ---- ...ard-segin_defconfig => imx93-phycore_defconfig} | 2 + configs/phycore-imx8mm_defconfig | 1 + ...{imx93-phyboard-segin.rst => imx93-phycore.rst} | 8 +- doc/board/phytec/index.rst | 2 +- drivers/misc/imx8/scu_api.c | 20 + drivers/net/fec_mxc.c | 14 +- drivers/watchdog/Kconfig | 7 + drivers/watchdog/Makefile | 1 + drivers/watchdog/siemens_pmic_wdt.c | 59 ++ include/configs/capricorn-common.h | 4 +- include/configs/deneb.h | 16 - include/firmware/imx/sci/rpc.h | 3 + include/firmware/imx/sci/sci.h | 1 + include/netdev.h | 2 +- tools/imx8image.c | 2 +- tools/imx_cntr_image.sh | 4 + 55 files changed, 2140 insertions(+), 446 deletions(-) create mode 100644 arch/arm/dts/imx8-capricorn-cxg3.dts rename arch/arm/dts/{imx8qxp-capricorn-u-boot.dtsi => imx8-capricorn-u-boot.dtsi} (54%) rename arch/arm/dts/{imx8qxp-capricorn.dtsi => imx8-capricorn.dtsi} (64%) delete mode 100644 arch/arm/dts/imx8-deneb.dts delete mode 100644 arch/arm/dts/imx8-giedi.dts create mode 100644 board/phytec/common/imx93_som_detection.c create mode 100644 board/phytec/common/imx93_som_detection.h create mode 100644 board/siemens/capricorn/spl_memory_test.c create mode 100644 board/siemens/capricorn/spl_memory_test.h create mode 100644 board/siemens/common/board.h create mode 100644 board/siemens/common/ddr_si_test.c rename configs/{deneb_defconfig => capricorn_cxg3_defconfig} (88%) delete mode 100644 configs/giedi_defconfig rename configs/{imx93-phyboard-segin_defconfig => imx93-phycore_defconfig} (98%) rename doc/board/phytec/{imx93-phyboard-segin.rst => imx93-phycore.rst} (91%) create mode 100644 drivers/watchdog/siemens_pmic_wdt.c delete mode 100644 include/configs/deneb.h

2 1

Odd error with cn9130, asix88179 and xhci
by Chris Packham 26 Nov '24

26 Nov '24

Hi U-Boot, We've hit a weird problem at $dayjob with a board using the Marvell CN9130 SoC and using the asix88179 USB-Eth adapter. The problem is after enabling and unrelated feature in u-boot the asix88179 fails to receive data (I can confirm that the link partner does see packets in the transmit direction) => version U-Boot 2022.01 (Nov 08 2024 - 09:45:44 +0000) => usb start starting USB... Bus usb3@500000: Register 2000120 NbrPorts 2 Starting the controller USB XHCI 1.00 scanning bus usb3@500000 for devices... 2 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found => ping ${serverip} Waiting for Ethernet connection... unable to connect. Reset Ethernet Device Waiting for Ethernet connection... done. Using ax88179_eth device Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Rx: failed to receive: -5 Abort ping failed; host 10.37.233.65 is not alive => <INTERRUPT> Debugging a little we can see that the -EIO is actually because xhci_bulk_tx() hits a timeout from xhci_wait_for_event(). We think this is triggered by the u-boot image size crossing some boundary (the problem seems to start when .bss_end crosses 0x00000000000f0000) although I've so far been unable to find specifically why that might be. As far as I can tell u-boot is being built relocatably and nothing is overlapping. I also considered that ATF might be preventing access to something but so far I see no evidence of this. If I turn off some features to reduce the build size the problem goes away. That is actually how we've avoided the immediate issue, although that means the problem will likely come back and an inopportune time. Does anyone have any ideas as to what the true root cause might be? I'm a bit stumped. Thanks, Chris

2 3

[GIT PULL] Please pull u-boot-dfu-20241126
by Mattijs Korpershoek 26 Nov '24

26 Nov '24

Hi Tom, Please find some fixes for master: Fastboot: - handle unknown partition type as "raw" Usb gadget: - Fix ci_udc gadget driver for Tegra 2 devices by not using USBADRA CI job: - https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/23572 Thanks, Mattijs The following changes since commit 0e6432e19f9c812b4986ca7fd8e6db9fd2c199d3: Merge patch series "Fix boot failure due to misaligned DMA buffer" (2024-11-18 08:24:06 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-dfu.git tags/u-boot-dfu-20241126 for you to fetch changes up to 35d967f5a8219adc47628247a98c302b1870313e: usb: ci_udc: don't use "advance" feature when setting address (2024-11-26 09:56:03 +0100) ---------------------------------------------------------------- u-boot-dfu-20241126 Fastboot: - handle unknown partition type as "raw" Usb gadget: - Fix ci_udc gadget driver for Tegra 2 devices by not using USBADRA ---------------------------------------------------------------- Caleb Connolly (1): fastboot: properly handle unknown partition type Ion Agorria (1): usb: ci_udc: don't use "advance" feature when setting address drivers/fastboot/fb_getvar.c | 3 ++- drivers/usb/gadget/ci_udc.c | 24 +++++++++++++++++++++++- drivers/usb/gadget/ci_udc.h | 1 + 3 files changed, 26 insertions(+), 2 deletions(-)

2 1

Please pull u-boot-marvell/master
by Stefan Roese 26 Nov '24

26 Nov '24

Hi Tom, please pull the next batch of Marvell Marvell related patches: ---------------------------------------------------------------- - mvebu: Disable JFFS2 support for Kirkwood and Armada XP boards (Tony) - kirkwood: Enable bootstd for Sheevaplug board (Tony) - mvebu: Add Allied Telesis x250 board (Chris) - mvebu: Updates for Allied Telesis boards (Chris) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=379&view=results Thanks, Stefan The following changes since commit 3073246d1be682071d8b3d07d06c2484907aed60: Prepare v2025.01-rc3 (2024-11-25 16:59:13 -0600) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to 7446e29db54818324859126739c3477a15d25c36: arm: mvebu: Add Allied Telesis x250 board (2024-11-26 13:20:03 +0100) ---------------------------------------------------------------- Chris Packham (8): arm: mvebu: x240: Use default baudrate table arm: mvebu: x240: Switch to standard boot arm: mvebu: x240: Don't build mkeficapsule arm: mvebu: x240: Enable IPV6 support arm: mvebu: x530: Remove dead comments arm: mvebu: x530: Don't build mkeficapsule arm: mvebu: x530: Enable IPV6 support arm: mvebu: Add Allied Telesis x250 board Tony Dinh (2): arm: mvebu: Disable JFFS2 support for Kirkwood and Armada XP boards arm: kirkwood: Enable bootstd for Sheevaplug board arch/arm/dts/Makefile | 3 +- arch/arm/dts/cn9130-atl-x250.dts | 274 ++++++++++++++++++++++++++++++++ arch/arm/mach-mvebu/Kconfig | 10 ++ board/Marvell/sheevaplug/sheevaplug.env | 20 +++ board/alliedtelesis/x250/MAINTAINERS | 7 + board/alliedtelesis/x250/Makefile | 6 + board/alliedtelesis/x250/x250.c | 19 +++ configs/dns325_defconfig | 1 - configs/dockstar_defconfig | 1 - configs/ds414_defconfig | 1 - configs/goflexhome_defconfig | 1 - configs/guruplug_defconfig | 1 - configs/iconnect_defconfig | 1 - configs/nas220_defconfig | 3 - configs/nsa310s_defconfig | 1 - configs/nsa325_defconfig | 3 - configs/pogo_e02_defconfig | 1 - configs/pogo_v4_defconfig | 3 - configs/sheevaplug_defconfig | 16 +- configs/x240_defconfig | 8 +- configs/x250_defconfig | 104 ++++++++++++ configs/x530_defconfig | 2 + include/configs/sheevaplug.h | 9 -- include/configs/x240.h | 12 +- include/configs/x250.h | 28 ++++ include/configs/x530.h | 16 -- 26 files changed, 478 insertions(+), 73 deletions(-) create mode 100644 arch/arm/dts/cn9130-atl-x250.dts create mode 100644 board/Marvell/sheevaplug/sheevaplug.env create mode 100644 board/alliedtelesis/x250/MAINTAINERS create mode 100644 board/alliedtelesis/x250/Makefile create mode 100644 board/alliedtelesis/x250/x250.c create mode 100644 configs/x250_defconfig create mode 100644 include/configs/x250.h

2 1

[PATCH v2 1/2] net: zero terminate string with headers in wget_fill_info()
by Adriano Cordova 26 Nov '24

26 Nov '24

From: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> Commit 2dd076a9c1b4 ("net: wget: integrate struct wget_info into legacy wget code") introduced function wget_fill_info() which retrieves the headers from the HTTP server response. As we want to parse the string in later patches we need to ensure that it is NUL terminated. We must further check that wget_info->headers in not NULL. Otherwise a crash occurs. Fixes: 2dd076a9c1b4 ("net: wget: integrate struct wget_info into legacy wget code") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> Signed-off-by: Adriano Cordova <adrianox(a)gmail.com> --- Changes in v2: - removed double check of wget_info->headers - removed an unnecessary "- 1" net/wget.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/wget.c b/net/wget.c index 3bc2522cde..5d70b7a82e 100644 --- a/net/wget.c +++ b/net/wget.c @@ -208,8 +208,13 @@ static void wget_fill_info(const uchar *pkt, int hlen) const char *second_space; char *pos, *end; - if (wget_info->headers && hlen < MAX_HTTP_HEADERS_SIZE) - strncpy(wget_info->headers, pkt, hlen); + if (wget_info->headers) { + if (hlen < MAX_HTTP_HEADERS_SIZE) + strncpy(wget_info->headers, pkt, hlen); + else + hlen = 0; + wget_info->headers[hlen] = 0; + } //Get status code first_space = strchr(pkt, ' '); -- 2.43.0

1 1

[PATCH 1/1] net: zero terminate string with headers in wget_fill_info()
by Heinrich Schuchardt 26 Nov '24

26 Nov '24

Commit 2dd076a9c1b4 ("net: wget: integrate struct wget_info into legacy wget code") introduced function wget_fill_info() which retrieves the headers from the HTTP server response. As we want to parse the string in later patches we need to ensure that it is NUL terminated. We must further check that wget_info->headers in not NULL. Otherwise a crash occurs. Fixes: 2dd076a9c1b4 ("net: wget: integrate struct wget_info into legacy wget code") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- net/wget.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/wget.c b/net/wget.c index 3bc2522cde5..b290ca1843e 100644 --- a/net/wget.c +++ b/net/wget.c @@ -208,8 +208,13 @@ static void wget_fill_info(const uchar *pkt, int hlen) const char *second_space; char *pos, *end; - if (wget_info->headers && hlen < MAX_HTTP_HEADERS_SIZE) - strncpy(wget_info->headers, pkt, hlen); + if (wget_info->headers) { + if (wget_info->headers && hlen < MAX_HTTP_HEADERS_SIZE - 1) + strncpy(wget_info->headers, pkt, hlen); + else + hlen = 0; + wget_info->headers[hlen] = 0; + } //Get status code first_space = strchr(pkt, ' '); -- 2.45.2

3 2

[PATCH v6 00/11] Support OF_UPSTREAM for StarFive JH7110
by Hal Feng 26 Nov '24

26 Nov '24

This patchset add OF_UPSTREAM support for StarFive JH7110 based boards. All the JH7110 based boards can use the DT from upstreaming linux kernel. The v1.3b board device tree is set as the default device tree. Support CONFIG_MULTI_DTB_FIT and the SPL selects the correct U-Boot dtb using the EEPROM information. Note: 1. Mars CM (lite) are missing upstream dts and so are detected but not supported in this series. Users of Mars CM and Mars CM Lite may stay with U-Boot v2024.10 until this is resolved. 2. Property values of network phy0/1 for all JH7110 based boards now follow the upstream dts. Changes since v5: - In patch 2, drop the override of rx-internal-delay-ps on phy0 and phy1. - In patch 5, drop "/delete-property/ motorcomm,tx-clk-10-inverted;" for Mars network phy0. - In patch 8, rename fdt and conf based on the compatible identifier of boards. Changes since v4: - Merge patch 2, 3, 5 into patch 1, ensuring git bisect works. - Add a new patch to sort the list of JH7110 imply statements. - Drop the reparent of clock JH7110_AONCLK_APB_FUNC in patch 4, which is unnecessary and will cause errors in gmac0 initialization. Changes since v3: - Add detection for Milk-V Mars CM (lite) boards in patch 13. Changes since v2: - Drop patch 1, because the riscv of_upstream Makefile is created by Conor in commit 239e4705099c. - Drop phy0 rx delay for milkv u-boot dtsi in patch 9. - Add a Fixes tag for patch 13. - In patch 14, the PCB version is only obtained when the product_id is VF7110. Improve the commit messages. Changes since v1: - Drop patch 12. - Modify patch 11 and add three new patches to support CONFIG_MULTI_DTB_FIT. The SPL selects the correct U-Boot dtb using the EEPROM information. History: v5: https://lore.kernel.org/all/20241119020425.51989-1-hal.feng@starfivetech.co… v4: https://lore.kernel.org/all/20241111020808.38974-1-hal.feng@starfivetech.co… v3: https://lore.kernel.org/all/20241105034328.56439-1-hal.feng@starfivetech.co… v2: https://lore.kernel.org/all/20241028015847.42344-1-hal.feng@starfivetech.co… v1: https://lore.kernel.org/all/20240930155919.111738-1-hal.feng@starfivetech.c… Hal Feng (11): dts: starfive: Switch to using upstream DT riscv: dts: jh7110: Make u-boot device trees adapting to upstream DT pcie: starfive: Make the driver compatible with upstream DT riscv: dts: jh7110: Move common code to the new jh7110-common-u-boot.dtsi riscv: dts: jh7110: Add u-boot device tree for JH7110 based boards board: starfive: spl: Drop the unneeded DT modification code configs: visionfive2: Enable MULTI_DTB_FIT for JH7110 based board DT riscv: dts: jh7110: Support multiple DTBs in a Fit image board: starfive: spl: Fix the wrong use of CONFIG_IS_ENABLED() board: starfive: spl: Support multiple DTBs for JH7110 based boards riscv: cpu: jh7110: Sort the list of imply statements arch/riscv/cpu/jh7110/Kconfig | 19 +- arch/riscv/dts/Makefile | 1 - arch/riscv/dts/jh7110-common-u-boot.dtsi | 198 +++++ arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi | 7 + .../dts/jh7110-pine64-star64-u-boot.dtsi | 6 + .../jh7110-starfive-visionfive-2-u-boot.dtsi | 117 --- ...10-starfive-visionfive-2-v1.2a-u-boot.dtsi | 6 + ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi | 6 + .../dts/jh7110-starfive-visionfive-2.dts | 11 - .../dts/jh7110-starfive-visionfive-2.dtsi | 380 --------- arch/riscv/dts/jh7110-u-boot.dtsi | 36 +- arch/riscv/dts/jh7110.dtsi | 761 ------------------ board/starfive/visionfive2/spl.c | 391 +-------- configs/starfive_visionfive2_defconfig | 4 +- drivers/clk/starfive/clk-jh7110-pll.c | 6 +- drivers/clk/starfive/clk-jh7110.c | 44 +- drivers/pci/pcie_starfive_jh7110.c | 59 +- .../dt-bindings/clock/starfive,jh7110-crg.h | 258 ------ .../dt-bindings/reset/starfive,jh7110-crg.h | 183 ----- 19 files changed, 358 insertions(+), 2135 deletions(-) create mode 100644 arch/riscv/dts/jh7110-common-u-boot.dtsi create mode 100644 arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi create mode 100644 arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi delete mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi create mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi create mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi delete mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2.dts delete mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi delete mode 100644 arch/riscv/dts/jh7110.dtsi delete mode 100644 include/dt-bindings/clock/starfive,jh7110-crg.h delete mode 100644 include/dt-bindings/reset/starfive,jh7110-crg.h base-commit: 880fcc49eb40a78ed27ff575aa02034d7bd74e80 -- 2.43.2

3 17