December 2024 - U-Boot

[PATCH 0/4] Add support for USB DFU boot on AM62Px
by Siddharth Vadapalli 18 Dec '24

18 Dec '24

Hello, This series add support for USB DFU boot on TI's AM62Px SoC which has two instances of USB Controllers, of which the USB0 instance of USB which is a DWC3 USB Controller is used for USB DFU Boot: ROM => tiboot3.bin => tispl.bin => u-boot.img The first patch of this series is based on the suggestion of Jonathan Humphreys <j-humpreys(a)ti.com> at: https://patchwork.ozlabs.org/project/uboot/cover/20241124070828.617558-1-s-… which prevents overwriting the "dfu_alt_info" environment variable which is set by "spl_dfu_cmd()" for USB DFU boot. The second patch adds USB DFU environment for AM62Px. The third patch extends "am62x_r5_usbdfu.config" config fragment for being re-used by AM62Px SoC by dropping configs which aren't required for USB DFU boot. This is necessary to reduce the size of R5 SPL (tiboot3.bin) built for USB DFU boot. The fourth patch enables USB device-tree nodes for USB DFU functionality on AM62Px. Since CONFIG_OF_UPSTREAM is not yet supported for AM62Px, the changes are being made in arch/arm/dts/k3-am62p5-sk-u-boot.dtsi at the moment, with the intent of making the same changes in the Linux device-tree and eventually enabling CONFIG_OF_UPSTREAM to drop the changes made in "k3-am62p5-sk-u-boot.dtsi". Series is based on commit 3b3c7280b82 smbios: address build warning of the next branch of U-Boot. The USB DFU config fragments for AM62x are to be re-used for enabling USB DFU boot on AM62Px as follows: R5 => am62px_evm_r5_defconfig + am62x_r5_usbdfu.config A53 => am62px_evm_a53_defconfig + am62x_a53_usbdfu.config Series has been tested on AM62P5-SK. Logs validating USB DFU boot on AM62P5-SK with this series: https://gist.github.com/Siddharth-Vadapalli-at-TI/50198ee3348c2db73e0dbd3a1… Series has also been validated on AM625-SK to ensure that the changes made to "am62x_r5_usbdfu.config" config fragment being used by AM625-SK for USB DFU boot do not cause a regression on AM625-SK w.r.t. USB DFU boot. Logs validating USB DFU Boot on AM625-SK with this series: https://gist.github.com/Siddharth-Vadapalli-at-TI/85a7579ed2c95330ac71ee3a8… Regards, Siddharth. Jonathan Humphreys (1): dfu: do not overwrite "dfu_alt_info" Siddharth Vadapalli (3): board: ti: am62px: env: include environment for DFU Boot configs: am62x_r5_usbdfu: extend for AM62Px arm: dts: k3-am62p5-sk-u-boot: enable USB0 for USB DFU boot arch/arm/dts/k3-am62p5-sk-u-boot.dtsi | 10 ++++++++++ board/ti/am62px/am62px.env | 5 +++-- configs/am62x_r5_usbdfu.config | 3 +++ drivers/dfu/dfu.c | 7 +++++-- 4 files changed, 21 insertions(+), 4 deletions(-) -- 2.43.0

3 13

[PATCH 1/4] ARM: dts: stm32: Reinstate missing root oscillators on DH STM32MP15xx DHCOR
by Marek Vasut 18 Dec '24

18 Dec '24

The root oscillators reference used to be in rcc node since 3d15245502c4 ("ARM: dts: stm32mp1: explicit clock reference needed by RCC clock driver") however this is not part of upstream stm32mp151.dtsi . The RCC driver does need this reference, reinstate it locally. Signed-off-by: Marek Vasut <marex(a)denx.de> --- NOTE: For 2025.01 --- Cc: Igor Opaniuk <igor.opaniuk(a)gmail.com> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de Cc: uboot-stm32(a)st-md-mailman.stormreply.com --- arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi index 08439342cb2..ab162f39473 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi @@ -112,6 +112,10 @@ }; &rcc { + clock-names = "hse", "hsi", "csi", "lse", "lsi"; + clocks = <&clk_hse>, <&clk_hsi>, <&clk_csi>, + <&clk_lse>, <&clk_lsi>; + st,clksrc = < CLK_MPU_PLL1P CLK_AXI_PLL2P -- 2.45.2

2 17

[PATCH 1/5] configs: stm32mp1: Restore boot SPL from sdcard for stm32mp15
by Patrice Chotard 18 Dec '24

18 Dec '24

Restore boot SPL from sdcard for STM32MP1 platforms. Fixes: 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options") Signed-off-by: Patrice Chotard <patrice.chotard(a)foss.st.com> --- configs/stm32mp15_basic_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index 1c0d0d0a073..dcf44bcc0e7 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -38,6 +38,9 @@ CONFIG_SPL_SYS_MALLOC=y CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0xc0300000 CONFIG_SPL_SYS_MALLOC_SIZE=0x1d00000 +CONFIG_SPL_SYS_MMCSD_RAW_MODE=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x3 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MTD=y -- 2.25.1

3 15

[PATCH] ARM: dts: stm32: Reinstate missing root oscillators on STM32MP15xx
by Marek Vasut 18 Dec '24

18 Dec '24

The root oscillators reference used to be in rcc node since 3d15245502c4 ("ARM: dts: stm32mp1: explicit clock reference needed by RCC clock driver") however this is not part of upstream stm32mp151.dtsi . The RCC driver does need this reference, reinstate it globally. Signed-off-by: Marek Vasut <marex(a)denx.de> --- NOTE: Would be good for 2025.01, but needs to be tested on other systems --- Cc: Igor Opaniuk <igor.opaniuk(a)gmail.com> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de Cc: uboot-stm32(a)st-md-mailman.stormreply.com --- arch/arm/dts/stm32mp15-u-boot.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi b/arch/arm/dts/stm32mp15-u-boot.dtsi index 66d4c40c6a8..3f57bd5fe0f 100644 --- a/arch/arm/dts/stm32mp15-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15-u-boot.dtsi @@ -186,6 +186,9 @@ bootph-all; #address-cells = <1>; #size-cells = <0>; + clock-names = "hse", "hsi", "csi", "lse", "lsi"; + clocks = <&clk_hse>, <&clk_hsi>, <&clk_csi>, + <&clk_lse>, <&clk_lsi>; }; &usart1 { -- 2.45.2

2 3

[PATCH] Kconfig: Set STACK_SIZE to 16KB for STM32 MCUs
by Patrice Chotard 18 Dec '24

18 Dec '24

Since commit 6534d26ee9a5 ("lmb: do away with arch_lmb_reserve()"), STM32F746-disco hangs when loading device tree just before starting kernel: Retrieving file: /stm32f746-disco.dtb Kernel image @ 0xc0008000 [ 0x000000 - 0x19ae00 ] Flattened Device Tree blob at c0408000 Booting using the fdt blob at 0xc0408000 Working FDT set to c0408000 Loading Device Tree to c05f8000, end c05ff71c ... Adjust STACK_SIZE to 16KB for STM32 MCUs (F4/F7 and H7) boards to fix kernel boot process as some of these boards embeds a limited amount of memory. Fixes: 6534d26ee9a5 ("lmb: do away with arch_lmb_reserve()") Signed-off-by: Patrice Chotard <patrice.chotard(a)foss.st.com> --- Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/Kconfig b/Kconfig index 1f5b0f1972d..c087a420a24 100644 --- a/Kconfig +++ b/Kconfig @@ -578,6 +578,7 @@ config STACK_SIZE hex "Define max stack size that can be used by U-Boot" default 0x4000000 if ARCH_VERSAL_NET || ARCH_VERSAL || ARCH_ZYNQMP default 0x200000 if MICROBLAZE + default 0x4000 if ARCH_STM32 default 0x1000000 help Define Max stack size that can be used by U-Boot. This value is used -- 2.25.1

3 3

[PATCH v5 0/2] cmd: Add support for optee commands.
by Venkatesh Yadav Abbarapu 18 Dec '24

18 Dec '24

Add the basic 'hello world ta' command which increments the value passed. This provides easy test for establishing a session with OP-TEE TA and verify. It includes following subcommands: optee hello optee hello <value>; value to increment via OP-TEE HELLO WORLD TA. Changes in v2: - Added command "optee" and subdommand "hello". - Update the man-page in doc/usage/cmd/optee.rst Changes in v3: - Rename the config from OPTEE_HELLO_WORLD_TA to CMD_OPTEE. - Rename the file from optee_hello_world_ta.c to optee.c - Add the hextoul from dectoul. Changes in v4: - Removed the hello_world_ta_open_session() and included in the hello_world_ta() itself. Changes in v5: - Updated the printf statements. - Fixed the description for doc usage. Venkatesh Yadav Abbarapu (2): cmd: Add support for optee commands doc: man-page for optee commands cmd/Kconfig | 6 ++++ cmd/Makefile | 1 + cmd/optee.c | 76 +++++++++++++++++++++++++++++++++++++++++ doc/usage/cmd/optee.rst | 70 +++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + 5 files changed, 154 insertions(+) create mode 100644 cmd/optee.c create mode 100644 doc/usage/cmd/optee.rst -- 2.34.1

2 4

[PATCH] ARM: stm32mp: Fix dram_bank_mmu_setup() for LMB located above ram_top
by Patrice Chotard 18 Dec '24

18 Dec '24

Previously, all LMB marked with LMB_NOMAP (above and below ram_top) are considered as invalid entry in TLB. Since commit 1a48b0be93d4 ("lmb: prohibit allocations above ram_top even from same bank") all LMB located above ram_top are now marked LMB_NOOVERWRITE and no more LMB_MAP. This area above ram_top is reserved for OPTEE and must not be cacheable, otherwise this leads to a Panic on some boards (Issue on STM32MP135F-DK). Restore previous behavior by marking invalid entry all TLB above ram_top. Fixes: 1a48b0be93d4 ("lmb: prohibit allocations above ram_top even from same bank") Signed-off-by: Patrice Chotard <patrice.chotard(a)foss.st.com> cc: Sughosh Ganu <sughosh.ganu(a)linaro.org> --- arch/arm/mach-stm32mp/stm32mp1/cpu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-stm32mp/stm32mp1/cpu.c b/arch/arm/mach-stm32mp/stm32mp1/cpu.c index 62cc98910a7..cb1b84c9af9 100644 --- a/arch/arm/mach-stm32mp/stm32mp1/cpu.c +++ b/arch/arm/mach-stm32mp/stm32mp1/cpu.c @@ -53,6 +53,7 @@ void dram_bank_mmu_setup(int bank) struct bd_info *bd = gd->bd; int i; phys_addr_t start; + phys_addr_t addr; phys_size_t size; bool use_lmb = false; enum dcache_option option; @@ -77,8 +78,12 @@ void dram_bank_mmu_setup(int bank) for (i = start >> MMU_SECTION_SHIFT; i < (start >> MMU_SECTION_SHIFT) + (size >> MMU_SECTION_SHIFT); i++) { + addr = i << MMU_SECTION_SHIFT; option = DCACHE_DEFAULT_OPTION; - if (use_lmb && lmb_is_reserved_flags(i << MMU_SECTION_SHIFT, LMB_NOMAP)) + if (use_lmb && + (lmb_is_reserved_flags(i << MMU_SECTION_SHIFT, LMB_NOMAP) || + addr >= gd->ram_top) + ) option = 0; /* INVALID ENTRY in TLB */ set_section_dcache(i, option); } -- 2.25.1

5 5

[PATCH 1/2] bloblist: Introduce BLOBLIST_PRIOR_STAGE options
by Tom Rini 18 Dec '24

18 Dec '24

Introduce an option to control if we expect that a prior stage has created a bloblist already and thus it is safe to scan the address. We need to have this be configurable because we do not (and cannot) know if the address at CONFIG_BLOBLIST_ADDR is in regular DRAM or some special on-chip memory and so it may or may not be safe to read from this address this early. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Cc: Simon Glass <sjg(a)chromium.org> --- common/Kconfig | 32 ++++++++++++++++++++++++++++++++ lib/fdtdec.c | 11 +++-------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index e8d89bf6eb9d..e8febad0f212 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1077,6 +1077,14 @@ config BLOBLIST_SIZE is set up in the first part of U-Boot to run (TPL, SPL or U-Boot proper), and this sane bloblist is used for subsequent phases. +config BLOBLIST_PRIOR_STAGE + bool "Bloblist was created in a stage prior to U-Boot" + default y + depends on BLOBLIST_FIXED + help + Select this if the bloblist at CONFIG_BLOBLIST_ADDR was created + before U-Boot is started. + config BLOBLIST_SIZE_RELOC hex "Size of bloblist after relocation" default BLOBLIST_SIZE if BLOBLIST_FIXED || BLOBLIST_ALLOC @@ -1117,6 +1125,14 @@ config SPL_BLOBLIST_ALLOC endchoice +config SPL_BLOBLIST_PRIOR_STAGE + bool "Bloblist was created in a stage prior to SPL" + default y + depends on SPL_BLOBLIST_FIXED + help + Select this if the bloblist at CONFIG_BLOBLIST_ADDR was created before + U-Boot SPL is started. + endif # SPL_BLOBLIST if TPL_BLOBLIST @@ -1146,6 +1162,14 @@ config TPL_BLOBLIST_ALLOC endchoice +config TPL_BLOBLIST_PRIOR_STAGE + bool "Bloblist was created in a stage prior to TPL" + default y + depends on TPL_BLOBLIST_FIXED + help + Select this if the bloblist at CONFIG_BLOBLIST_ADDR was created before + U-Boot TPL is started. + endif # TPL_BLOBLIST if VPL_BLOBLIST @@ -1175,6 +1199,14 @@ config VPL_BLOBLIST_ALLOC endchoice +config VPL_BLOBLIST_PRIOR_STAGE + bool "Bloblist was created in a stage prior to VPL" + default y + depends on VPL_BLOBLIST_FIXED + help + Select this if the bloblist at CONFIG_BLOBLIST_ADDR was created before + U-Boot VPL is started. + endif # VPL_BLOBLIST endmenu diff --git a/lib/fdtdec.c b/lib/fdtdec.c index b06559880296..29bddab4150c 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1669,15 +1669,10 @@ int fdtdec_setup(void) int ret = -ENOENT; /* - * If allowing a bloblist, check that first. There was discussion about - * adding an OF_BLOBLIST Kconfig, but this was rejected. - * - * The necessary test is whether the previous phase passed a bloblist, - * not whether this phase creates one. + * Only scan for a bloblist and then if that bloblist contains a device + * tree if we have been configured to expect one. */ - if (CONFIG_IS_ENABLED(BLOBLIST) && - (xpl_prev_phase() != PHASE_TPL || - !IS_ENABLED(CONFIG_TPL_BLOBLIST))) { + if (CONFIG_IS_ENABLED(BLOBLIST_PRIOR_STAGE)) { ret = bloblist_maybe_init(); if (!ret) { gd->fdt_blob = bloblist_find(BLOBLISTT_CONTROL_FDT, 0); -- 2.43.0

3 20

[PATCH v5 0/9] add the support of sha256_hmac and sha256_hkdf
by Philippe Reynes 17 Dec '24

17 Dec '24

This serie adds the support of sha256_hmac and sha256_hkdf. A first version was sent several months ago just before the integration of mbedtls. This new version is based on mbedtls. The first patch of this serie add the support of hkdf using mbedtls. v5: - use mbedtls to compute hmac - add tests for hkdf - enabled mbedtls in sandbox_defconfig - some cleanup v4: - fix computation of the hmac - add more test for hmac - move sha256 common functions to sha256_common.c - some cleanup v3: - also define sha256_hmac for legacy sha256 - add some #if to define function only when needed Philippe Reynes (9): tools: kwbimage.h: use linux/compiler_attributes.h tools: renesas_spkgimage.h: use linux/compiler_attributes.h mbedtls: enable support of hkdf lib: sha256: move common function to sha256_common.c lib: sha256: add feature sha256_hmac test: lib: add test for sha256_hmac lib: mbedtls: sha256: add support of key derivation test: lib: add test for key derivation configs: sandbox: enable mbedtls configs/sandbox_defconfig | 2 + include/u-boot/sha256.h | 24 +++ lib/Makefile | 1 + lib/mbedtls/Kconfig | 14 ++ lib/mbedtls/Makefile | 2 + lib/mbedtls/mbedtls_def_config.h | 4 + lib/mbedtls/sha256.c | 59 ++++--- lib/sha256.c | 66 ++++--- lib/sha256_common.c | 50 ++++++ test/lib/Makefile | 2 + test/lib/test_sha256_hkdf.c | 197 +++++++++++++++++++++ test/lib/test_sha256_hmac.c | 294 +++++++++++++++++++++++++++++++ tools/Makefile | 1 + tools/kwbimage.h | 6 +- tools/renesas_spkgimage.h | 6 +- 15 files changed, 668 insertions(+), 60 deletions(-) create mode 100644 lib/sha256_common.c create mode 100644 test/lib/test_sha256_hkdf.c create mode 100644 test/lib/test_sha256_hmac.c -- 2.25.1

3 16

[PATCH] gitlab: Add a NVIDIA Jetson TK1 board to the sjg lab
by Simon Glass 17 Dec '24

17 Dec '24

I have one of these boards, with no OS loaded. Add an entry for it so that it can be used for testing. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c15907fffa..60a841bd4d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -707,3 +707,9 @@ colibrimx8: variables: ROLE: colibrimx8 <<: *lab_dfn + +# NVIDIA Jetson TK1 +tk1: + variables: + ROLE: tk1 + <<: *lab_dfn -- 2.34.1

1 0