October 2024 - U-Boot

[PATCH 1/1] net/wget: set filesize
by Heinrich Schuchardt 09 Oct '24

09 Oct '24

Environment variable filesize is needed for man use cased, e.g. * write file to device * calculate hash Let wget set the variable. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- net/wget.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/wget.c b/net/wget.c index f978adc9f0a..635f82efbb3 100644 --- a/net/wget.c +++ b/net/wget.c @@ -400,6 +400,7 @@ static void wget_handler(uchar *pkt, u16 dport, efi_set_bootdev("Net", "", image_url, map_sysmem(image_load_addr, 0), net_boot_file_size); + env_set_hex("filesize", net_boot_file_size); break; } } -- 2.45.2

1 0

[ANN] U-Boot v2024.10 released
by Tom Rini 08 Oct '24

08 Oct '24

Hey all, It's release day and so here is v2024.07. We had a few last minute bug fixes come in, and while I'd prefer they come in earlier in the release cycle, I'm still happier people are testing before the release comes out instead of after the release is out. I want to thank everyone that's contributed to this release, not just in terms of code, but documentation, testing and otherwise ensuring things go as smoothly as they can. In terms of a changelog, git log --merges v2024.10-rc6..v2024.10 contains what I've pulled since the last RC or: git log --merges v2024.07..v2024.10 for changes since the last full release. As always, more details in pull requests (or the tags referenced by them) will result in more details here. The merge window is formally open again, and I'll be merging in next shortly. v2025.01 is scheduled for Monday, January 6th, 2025 and the merge window will close and -rc1 will be released on the 28nd of October, and then the next window will open with -rc2, two weeks later. I'm also trying something slightly different this release and I've put -rc6 in for Monday, December 30th to have one more tag over the end of year holidays, to see if that helps with people finding time to test. We'll how that went in January. Thanks all! -- Tom

2 2

[PATCH v7 0/7] Add the USB5744 hub driver as per new DT binding
by Venkatesh Yadav Abbarapu 08 Oct '24

08 Oct '24

Add the usb5744/usb2744 hub driver which does the reset gpio toggling and the i2c initialization sequence. Tested the USB5744/USB2744 usb hub for usb0, usb1 with the DT nodes on KR260 board. Changes in v2: - Added the power_on_reset_us variable, for post-reset time. - Removed the DM_REGULATOR ifdef around the regulator API's. - Rename the i2c_init and fixed the return for the API's. Changes in v3: - Rename i2c_init to init. - Fixed the return values for the dev_read_phandle_with_args API. - Removed the unneccessary cast uint8_t *. Changes in v4: - Fixed the indentation issues. - Fixed the Reverse xmas tree for indentation. - Replaced dev_dbg to dev_err in all places. Changes in v5: - Add new API for usb_onboard_hub_reset. Changes in v6: - Add return for usb_onboard_hub_reset in probe. Changes in v7: - Sort the structure onboard_hub_data data. - Remove the variable gpio_desc * for dm_gpio_free(). Venkatesh Yadav Abbarapu (7): usb: onboard-hub: Add reset-gpio support usb: onboard-hub: Fix the return values of regulator APIs usb: onboard-hub: add support for Microchip USB5744 usb: onboard-hub: Add i2c initialization for usb5744 hub usb: onboard-hub: Bail out if peer hub is already probed configs: zynqmp_kria: Enable the USB onboard hub arm64: zynqmp: Update the usb5744 hub node as per binding arch/arm/dts/zynqmp-sck-kr-g-revA.dtso | 48 +++++++ arch/arm/dts/zynqmp-sck-kr-g-revB.dtso | 48 +++++++ arch/arm/dts/zynqmp-sck-kv-g-revA.dtso | 18 +++ arch/arm/dts/zynqmp-sck-kv-g-revB.dtso | 25 +++- common/usb_onboard_hub.c | 190 ++++++++++++++++++++++++- configs/xilinx_zynqmp_kria_defconfig | 11 +- 6 files changed, 329 insertions(+), 11 deletions(-) -- 2.17.1

2 10

[PATCH v1] imx: Kconfig: make IMX8_ROMAPI configurable
by alice.guo＠oss.nxp.com 08 Oct '24

08 Oct '24

From: Peng Fan <peng.fan(a)nxp.com> Make CONFIG_IMX8_ROMAPI could be configured in defconfig. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Signed-off-by: Alice Guo <alice.guo(a)nxp.com> Reviewed-by: Ye Li <ye.li(a)nxp.com> --- arch/arm/mach-imx/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 134e42028c..9d3aafd2f8 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -179,7 +179,8 @@ config DDRMC_VF610_CALIBRATION the ddrmc_cr_setting on relevant board file. config IMX8_ROMAPI - def_bool y + bool "Enable i.MX ROMAPI" + default y depends on IMX8MN || IMX8MP || IMX8ULP || IMX9 config SPL_IMX_ROMAPI_LOADADDR -- 2.34.1

5 11

[PATCH] video: meson: dw-hdmi: do not fail probe if HDMI regulator is already enabled
by Neil Armstrong 08 Oct '24

08 Oct '24

If the regulator is already enabled, this happens if the regulator is set in regulator-always-on, regulator_set_enable() return -EALREADY. Ignore the -EALREADY return since it's not an error. Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- drivers/video/meson/meson_dw_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c index 587df7beb9b..ee219ce6ec4 100644 --- a/drivers/video/meson/meson_dw_hdmi.c +++ b/drivers/video/meson/meson_dw_hdmi.c @@ -419,7 +419,7 @@ static int meson_dw_hdmi_probe(struct udevice *dev) if (!ret) { ret = regulator_set_enable(supply, true); - if (ret) + if (ret && ret != -EALREADY) return ret; } #endif --- base-commit: 28dc47038edc4e93f32d75a357131bcf01a18d85 change-id: 20241008-u-boot-video-fix-hdmi-supply-already-on-e6a9af27b1eb Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

2 2

[PATCH] imx8: Correct the SCU API return value check
by Peng Fan (OSS) 08 Oct '24

08 Oct '24

From: Peng Fan <peng.fan(a)nxp.com> The SCU API alrdeay has been converted to return Linux error code, using SCU error code is not correct here, although SC_ERR_NONE is value as 0. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- arch/arm/mach-imx/imx8/ahab.c | 8 ++++---- arch/arm/mach-imx/imx8/cpu.c | 34 +++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c index ed44df394b1..324e010bb2c 100644 --- a/arch/arm/mach-imx/imx8/ahab.c +++ b/arch/arm/mach-imx/imx8/ahab.c @@ -345,9 +345,9 @@ int ahab_close(void) u16 lc; err = sc_seco_chip_info(-1, &lc, NULL, NULL, NULL); - if (err != SC_ERR_NONE) { + if (err) { printf("Error in get lifecycle\n"); - return -EIO; + return err; } if (lc != 0x20) { @@ -357,9 +357,9 @@ int ahab_close(void) } err = sc_seco_forward_lifecycle(-1, 16); - if (err != SC_ERR_NONE) { + if (err) { printf("Error in forward lifecycle to OEM closed\n"); - return -EIO; + return err; } return 0; diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 834aca82bcf..317db31eeda 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -48,7 +48,7 @@ static char *get_reset_cause(void) { sc_pm_reset_reason_t reason; - if (sc_pm_reset_reason(-1, &reason) != SC_ERR_NONE) + if (sc_pm_reset_reason(-1, &reason)) return "Unknown reset"; switch (reason) { @@ -160,6 +160,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data) sc_faddr_t tcml_addr; u32 tcml_size = SZ_128K; ulong addr; + int ret; switch (core_id) { case 0: @@ -187,10 +188,12 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data) printf("Power on M4 and MU\n"); - if (sc_pm_set_resource_power_mode(-1, core_rsrc, SC_PM_PW_MODE_ON) != SC_ERR_NONE) - return -EIO; + ret = sc_pm_set_resource_power_mode(-1, core_rsrc, SC_PM_PW_MODE_ON); + if (ret) + return ret; - if (sc_pm_set_resource_power_mode(-1, mu_rsrc, SC_PM_PW_MODE_ON) != SC_ERR_NONE) + ret = sc_pm_set_resource_power_mode(-1, mu_rsrc, SC_PM_PW_MODE_ON); + if (ret) return -EIO; printf("Copy M4 image from 0x%lx to TCML 0x%lx\n", addr, (ulong)tcml_addr); @@ -199,7 +202,8 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data) memcpy((void *)tcml_addr, (void *)addr, tcml_size); printf("Start M4 %u\n", core_id); - if (sc_pm_cpu_start(-1, core_rsrc, true, tcml_addr) != SC_ERR_NONE) + ret = sc_pm_cpu_start(-1, core_rsrc, true, tcml_addr); + if (ret) return -EIO; printf("bootaux complete\n"); @@ -242,20 +246,23 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data) printf("Power on aux core %d\n", core_id); - if (sc_pm_set_resource_power_mode(-1, core_rsrc, SC_PM_PW_MODE_ON) != SC_ERR_NONE) - return -EIO; + ret = sc_pm_set_resource_power_mode(-1, core_rsrc, SC_PM_PW_MODE_ON); + if (ret) + return ret; if (mu_rsrc != SC_R_NONE) { - if (sc_pm_set_resource_power_mode(-1, mu_rsrc, SC_PM_PW_MODE_ON) != SC_ERR_NONE) + ret = sc_pm_set_resource_power_mode(-1, mu_rsrc, SC_PM_PW_MODE_ON); + if (ret) return -EIO; } if (core_id == 1) { struct power_domain pd; - if (sc_pm_clock_enable(-1, core_rsrc, SC_PM_CLK_PER, true, false) != SC_ERR_NONE) { + ret = sc_pm_clock_enable(-1, core_rsrc, SC_PM_CLK_PER, true, false) + if (ret) { printf("Error enable clock\n"); - return -EIO; + return ret; } if (!imx8_power_domain_lookup_name("audio_sai0", &pd)) { @@ -286,8 +293,9 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data) printf("Start %s\n", core_id == 0 ? "M4" : "HIFI"); - if (sc_pm_cpu_start(-1, core_rsrc, true, aux_core_ram) != SC_ERR_NONE) - return -EIO; + ret = sc_pm_cpu_start(-1, core_rsrc, true, aux_core_ram); + if (ret) + return ret; printf("bootaux complete\n"); return 0; @@ -313,7 +321,7 @@ int arch_auxiliary_core_check_up(u32 core_id) return 0; } - if (sc_pm_get_resource_power_mode(-1, core_rsrc, &power_mode) != SC_ERR_NONE) + if (sc_pm_get_resource_power_mode(-1, core_rsrc, &power_mode)) return 0; if (power_mode != SC_PM_PW_MODE_OFF) -- 2.35.3

4 4

[PATCH v6 0/7] Add the USB5744 hub driver as per new DT binding
by Venkatesh Yadav Abbarapu 08 Oct '24

08 Oct '24

Add the usb5744/usb2744 hub driver which does the reset gpio toggling and the i2c initialization sequence. Tested the USB5744/USB2744 usb hub for usb0, usb1 with the DT nodes on KR260 board. Changes in v2: - Added the power_on_reset_us variable, for post-reset time. - Removed the DM_REGULATOR ifdef around the regulator API's. - Rename the i2c_init and fixed the return for the API's. Changes in v3: - Rename i2c_init to init. - Fixed the return values for the dev_read_phandle_with_args API. - Removed the unneccessary cast uint8_t *. Changes in v4: - Fixed the indentation issues. - Fixed the Reverse xmas tree for indentation. - Replaced dev_dbg to dev_err in all places. Changes in v5: - Add new API for usb_onboard_hub_reset. Changes in v6: - Add return for usb_onboard_hub_reset in probe. Venkatesh Yadav Abbarapu (7): usb: onboard-hub: Add reset-gpio support usb: onboard-hub: Fix the return values of regulator APIs usb: onboard-hub: add support for Microchip USB5744 usb: onboard-hub: Add i2c initialization for usb5744 hub usb: onboard-hub: Bail out if peer hub is already probed configs: zynqmp_kria: Enable the USB onboard hub arm64: zynqmp: Update the usb5744 hub node as per binding arch/arm/dts/zynqmp-sck-kr-g-revA.dtso | 48 ++++++ arch/arm/dts/zynqmp-sck-kr-g-revB.dtso | 48 ++++++ arch/arm/dts/zynqmp-sck-kv-g-revA.dtso | 18 +++ arch/arm/dts/zynqmp-sck-kv-g-revB.dtso | 25 +++- common/usb_onboard_hub.c | 193 ++++++++++++++++++++++++- configs/xilinx_zynqmp_kria_defconfig | 11 +- 6 files changed, 332 insertions(+), 11 deletions(-) -- 2.17.1

2 9

[PATCH] mkimage: ecdsa: add nodes to signature/key node
by Matthias Pritschet 08 Oct '24

08 Oct '24

From: Matthias Pritschet <matthias.pritschet(a)itk-engineering.de> Add the "required", "algo", and "key-name-hint" nodes to the signature/key node if ecdsa256 is used. This change is mainly copy&paste from rsa_add_verify_data which already adds these nodes. Signed-off-by: Matthias Pritschet <matthias.pritschet(a)itk-engineering.de> --- lib/ecdsa/ecdsa-libcrypto.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/ecdsa/ecdsa-libcrypto.c b/lib/ecdsa/ecdsa-libcrypto.c index db0a828a29..4513703d08 100644 --- a/lib/ecdsa/ecdsa-libcrypto.c +++ b/lib/ecdsa/ecdsa-libcrypto.c @@ -272,7 +272,8 @@ int ecdsa_verify(struct image_sign_info *info, return ret; } -static int do_add(struct signer *ctx, void *fdt, const char *key_node_name) +static int do_add(struct signer *ctx, void *fdt, const char *key_node_name, + struct image_sign_info *info) { int signature_node, key_node, ret, key_bits; const char *curve_name; @@ -322,6 +322,11 @@ static int do_add(struct signer *ctx, void *fdt, const char *key_node_name) point = EC_KEY_get0_public_key(ctx->ecdsa_key); EC_POINT_get_affine_coordinates(group, point, x, y, NULL); + ret = fdt_setprop_string(fdt, key_node, FIT_KEY_HINT, + info->keyname); + if (ret < 0) + return ret; + ret = fdt_setprop_string(fdt, key_node, "ecdsa,curve", curve_name); if (ret < 0) return ret; @@ -334,6 +339,16 @@ static int do_add(struct signer *ctx, void *fdt, const char *key_node_name) if (ret < 0) return ret; + ret = fdt_setprop_string(fdt, key_node, FIT_ALGO_PROP, + info->name); + if (ret < 0) + return ret; + + ret = fdt_setprop_string(fdt, key_node, FIT_KEY_REQUIRED, + info->require_keys); + if (ret < 0) + return ret; + return key_node; } @@ -346,7 +361,7 @@ int ecdsa_add_verify_data(struct image_sign_info *info, void *fdt) fdt_key_name = info->keyname ? info->keyname : "default-key"; ret = prepare_ctx(&ctx, info); if (ret >= 0){ - ret = do_add(&ctx, fdt, fdt_key_name); + ret = do_add(&ctx, fdt, fdt_key_name, info); if (ret < 0) ret = ret == -FDT_ERR_NOSPACE ? -ENOSPC : -EIO; } -- 2.34.1

2 1

[PATCH] mkimage: ecdsa: add signature/key nodes to dtb if missing
by Matthias Pritschet 08 Oct '24

08 Oct '24

From: Matthias Pritschet <matthias.pritschet(a)itk-engineering.de> If the signature/key node(s) are not yet present in the U-Boot device tree, ecdsa_add_verify_data simply fails if it can't find the nodes. This behaviour differs from rsa_add_verify_data, wich does add the missing nodes and proceeds in that case. This change is mainly copy&paste from rsa_add_verify_data to add the same behaviour to ecdsa_add_verify_data. Signed-off-by: Matthias Pritschet <matthias.pritschet(a)itk-engineering.de> --- lib/ecdsa/ecdsa-libcrypto.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/lib/ecdsa/ecdsa-libcrypto.c b/lib/ecdsa/ecdsa-libcrypto.c index 5fa9be10b4..db0a828a29 100644 --- a/lib/ecdsa/ecdsa-libcrypto.c +++ b/lib/ecdsa/ecdsa-libcrypto.c @@ -281,16 +281,35 @@ static int do_add(struct signer *ctx, void *fdt, const char *key_node_name) BIGNUM *x, *y; signature_node = fdt_subnode_offset(fdt, 0, FIT_SIG_NODENAME); - if (signature_node < 0) { - fprintf(stderr, "Could not find 'signature node: %s\n", + if (signature_node == -FDT_ERR_NOTFOUND) { + signature_node = fdt_add_subnode(fdt, 0, FIT_SIG_NODENAME); + if (signature_node < 0) { + if (signature_node != -FDT_ERR_NOSPACE) { + fprintf(stderr, "Couldn't create signature node: %s\n", + fdt_strerror(signature_node)); + } + return signature_node; + } + } else if (signature_node < 0) { + fprintf(stderr, "Cannot select keys signature_node: %s\n", fdt_strerror(signature_node)); return signature_node; } - key_node = fdt_add_subnode(fdt, signature_node, key_node_name); - if (key_node < 0) { - fprintf(stderr, "Could not create '%s' node: %s\n", - key_node_name, fdt_strerror(key_node)); + /* Either create or overwrite the named key node */ + key_node = fdt_subnode_offset(fdt, signature_node, key_node_name); + if (key_node == -FDT_ERR_NOTFOUND) { + key_node = fdt_add_subnode(fdt, signature_node, key_node_name); + if (key_node < 0) { + if (key_node != -FDT_ERR_NOSPACE) { + fprintf(stderr, "Could not create key subnode: %s\n", + fdt_strerror(key_node)); + } + return key_node; + } + } else if (key_node < 0) { + fprintf(stderr, "Cannot select keys key_node: %s\n", + fdt_strerror(key_node)); return key_node; } @@ -326,8 +345,11 @@ int ecdsa_add_verify_data(struct image_sign_info *info, void *fdt) fdt_key_name = info->keyname ? info->keyname : "default-key"; ret = prepare_ctx(&ctx, info); - if (ret >= 0) + if (ret >= 0){ ret = do_add(&ctx, fdt, fdt_key_name); + if (ret < 0) + ret = ret == -FDT_ERR_NOSPACE ? -ENOSPC : -EIO; + } free_ctx(&ctx); return ret; -- 2.34.1

3 3

[PATCH] configs: am64x*_r5_defconfig: Drop BOOTCOMMAND
by Wadim Egorov 08 Oct '24

08 Oct '24

There is no need to define a default for bootcmd in R5 u-boot because the R5 is directly booting into the next stage A53 bootloader. Signed-off-by: Wadim Egorov <w.egorov(a)phytec.de> --- configs/am64x_evm_r5_defconfig | 2 -- configs/phycore_am64x_r5_defconfig | 2 -- 2 files changed, 4 deletions(-) diff --git a/configs/am64x_evm_r5_defconfig b/configs/am64x_evm_r5_defconfig index 96475d4c1b8..08c9cf2c316 100644 --- a/configs/am64x_evm_r5_defconfig +++ b/configs/am64x_evm_r5_defconfig @@ -35,8 +35,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000 -CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="run distro_bootcmd" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y CONFIG_SPL_SIZE_LIMIT_SUBTRACT_MALLOC=y diff --git a/configs/phycore_am64x_r5_defconfig b/configs/phycore_am64x_r5_defconfig index a0d78241928..24361bb9c1d 100644 --- a/configs/phycore_am64x_r5_defconfig +++ b/configs/phycore_am64x_r5_defconfig @@ -34,8 +34,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000 -CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="run distro_bootcmd" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y CONFIG_SPL_SIZE_LIMIT_SUBTRACT_MALLOC=y -- 2.34.1

2 1