July 2024 - U-Boot

[PATCH v1 0/4] Sync StarFive JH7110 clock and reset dt-bindings with Linux
by Hal Feng 04 Jul '24

04 Jul '24

There are differences in clock / reset dt-bindings between U-Boot and Linux. Sync them, so it is feasible to use OF_UPSTREAM for StarFive JH7110 SoC. Hal Feng (4): dt-bindings: clock: jh7110: Sync with Linux dt-bindings: reset: jh7110: Sync with Linux clk: starfive: jh7110: Sync clock definitions with Linux riscv: dts: jh7110: Sync clock and reset definitions with Linux .../dts/jh7110-starfive-visionfive-2.dtsi | 6 +- arch/riscv/dts/jh7110-u-boot.dtsi | 2 +- arch/riscv/dts/jh7110.dtsi | 28 +-- drivers/clk/starfive/clk-jh7110-pll.c | 6 +- drivers/clk/starfive/clk-jh7110.c | 44 ++--- .../dt-bindings/clock/starfive,jh7110-crg.h | 180 +++++++++++------- .../dt-bindings/reset/starfive,jh7110-crg.h | 144 ++++++++------ 7 files changed, 243 insertions(+), 167 deletions(-) base-commit: ea722aa5eb33740ae77e8816aeb72b385e621cd0 -- 2.43.2

4 9

[PATCH V4 0/6] Low Power Mode: Package TIFS Stub in BeaglePlay
by Dhruva Gole 04 Jul '24

04 Jul '24

This series includes the binman related changes required to package TIFS Stub to support Low Power Modes on BeaglePlay. It also documents the boot flow and tispl packaging details regarding the same. Changelog: * Add more documentation around TIFS Stub for AM62, 62A and 62P * Fix documentation formatting errors. * Add entry to MAINTAINERS for doc/board/ti Link to previous series: https://lore.kernel.org/u-boot/20240628093252.1864609-1-d-gole@ti.com/ Dhruva Gole (6): arm: dts: k3-am625-beagleplay: Package TIFS Stub doc: beagle: am62x_beagleplay: Update the boot flow to show TIFS Stub doc: beagle: am62x_beagleplay: Add TIFS Stub in image format doc: ti: k3: Add TIFS Stub documentation doc: ti: am62*: Mention TIFS Stub in img fmts and boot flow MAINTAINERS: Include the TI docs under ARM TI MAINTAINERS | 1 + arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 33 +- doc/board/beagle/am62x_beagleplay.rst | 4 +- doc/board/ti/am62ax_sk.rst | 4 +- doc/board/ti/am62px_sk.rst | 4 +- doc/board/ti/am62x_sk.rst | 4 +- doc/board/ti/img/boot_diagram_am62.svg | 1983 ++++++++++++++++++ doc/board/ti/img/tifsstub_dm_tispl.bin.svg | 353 ++++ doc/board/ti/k3.rst | 5 + 9 files changed, 2382 insertions(+), 9 deletions(-) create mode 100644 doc/board/ti/img/boot_diagram_am62.svg create mode 100644 doc/board/ti/img/tifsstub_dm_tispl.bin.svg base-commit: 0f073e022ddc5070e5df1d053e4bdc1874fbcc0f -- 2.34.1

1 6

[PATCH] configs: phycore-imx8mp: Disable CONFIG_ANDROID_BOOT_IMAGE
by Benjamin Hahn 04 Jul '24

04 Jul '24

CONFIG_ANDROID_BOOT_IMAGE gets enabled implicitly by FASTBOOT, but we don't need that feature. Signed-off-by: Benjamin Hahn <B.Hahn(a)phytec.de> --- configs/phycore-imx8mp_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 57e320af6030..280ebc9237ee 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -25,6 +25,7 @@ CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x3e0000 CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_SYS_LOAD_ADDR=0x40480000 +# CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y --- base-commit: 65fbdab27224ee3943a89496b21862db83c34da2 change-id: 20240703-wip-bhahn-disable_config_android_boot_image-326ea0921a03 Best regards, -- Benjamin Hahn <B.Hahn(a)phytec.de>

1 1

[PATCH 0/3] cmd: avoid duplicate weak functions
by Heinrich Schuchardt 04 Jul '24

04 Jul '24

If we have multiple weak implementations of functions, the linker might choose any of these. ARM and RISC-V already provide a weak implementation of flush_dcache_all() but cmd/cache.c provides another implementation. Add an #ifdef to avoid the duplication. The EFI sub-systems uses invalidate_icache_all() after loading binaries. Both the EFI sub-system and cmd/cache.c provide a weak invalidate_icache_all() function. Remove the EFI instance. For ARM11 functional implementation of invalidate_icache_all is missing. Add it. Heinrich Schuchardt (3): cmd: avoid duplicate weak flush_dcache_all() arm: implement invalidate_icache_all on ARM11 efi_loader: avoid duplicate weak invalidate_icache_all() arch/arm/cpu/arm11/cpu.c | 12 ++++++++++++ cmd/cache.c | 3 +++ lib/efi_loader/efi_image_loader.c | 13 +++++++------ lib/efi_loader/efi_runtime.c | 7 ++++++- 4 files changed, 28 insertions(+), 7 deletions(-) -- 2.43.0

3 15

Please pull u-boot-ubi
by Heiko Schocher 03 Jul '24

03 Jul '24

Hello Tom, please pull from u-boot-ubi.git master The following changes since commit 65fbdab27224ee3943a89496b21862db83c34da2: Merge branch 'next' (2024-07-01 15:00:56 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-ubi.git tags/ubifixes-for-v2024-10-rc1 for you to fetch changes up to 27b169f9d0bed978bea1d86ab8d584da6ada54d0: cmd: ubi: check 'updating' before calling ubi_more_update_data() (2024-07-03 08:05:19 +0200) ---------------------------------------------------------------- ubi changes for v2024.10-rc1 fs: ubifs: Add support for ZSTD decompression from Piotr Wojtaszczyk Fixes for ubi command from Martin Kurbanov ---------------------------------------------------------------- Martin Kurbanov (2): cmd: ubi: remove redundant initializations cmd: ubi: check 'updating' before calling ubi_more_update_data() Piotr Wojtaszczyk (1): fs: ubifs: Add support for ZSTD decompression cmd/ubi.c | 21 +++++++++++++++------ fs/ubifs/ubifs-media.h | 2 ++ fs/ubifs/ubifs.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 68 insertions(+), 8 deletions(-) Azure build: https://dev.azure.com/hs0298/hs/_build/results?buildId=113&view=results Thanks! bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

Please pull u-boot-dm
by Simon Glass 03 Jul '24

03 Jul '24

Hi Tom, This one is for -master and I dropped the offending commit. It will have to wait until someone responds on the MX9 bug. https://source.denx.de/u-boot/custodians/u-boot-dm/-/commit/c85a05a5d87ce6f… The following changes since commit 65fbdab27224ee3943a89496b21862db83c34da2: Merge branch 'next' (2024-07-01 15:00:56 -0600) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-2jun24-take2 for you to fetch changes up to c85a05a5d87ce6f077c41d7e63a4a7953ddb351c: bootstd: cros: store partition type in an efi_guid_t (2024-07-03 07:36:33 +0100) ---------------------------------------------------------------- buildman CI improvements binman fixes and assumed size partial tools fixes for Python 3.12 patman enhancements ---------------------------------------------------------------- Brandon Maier (3): tools: binman: fix deprecated Python unittest methods tools: binman: fix deprecated Python ConfigParser methods tools: patman: fix deprecated Python ConfigParser methods Heinrich Schuchardt (2): sandbox: use sane access rights for files acpi: set creator_revision in acpi_fill_header Ilias Apalodimas (2): sandbox: cleanup linker scripts and sections configs: enable setvariable at runtime on sandbox Jonathan Liu (1): sandbox: enable support for the unlz4 command Quentin Schulz (4): dm: core: fix misleading debug message when matching compatible dm: core: fix signedness in debug messages dm: core: migrate debug() messages to use dm_warn dm: core: fix typo in SPL_DM_WARN prompt text Rasmus Villemoes (1): global_data.h: drop write-only field dm_root_f Sean Anderson (3): patman: Fix tests if add_maintainers is set to False patman: Add Commit-cc as an alias for Patch-cc patman: Add a tag for when a patch gets added to a series Simon Glass (18): binman: efi: Correct entry docs binman: Regenerate nxp docs binman: ti: Regenerate entry docs binman: Update the entrydocs header binman: Support an assumed size for missing binaries binman: Make Intel ME default to position 0x1000 x86: Set up some assumed sizes for binary blobs buildman: Make mrproper an argument to _reconfigure() buildman: Make mrproper an argument to _config_and_build() buildman: Make mrproper an argument to run_commit() buildman: Avoid rebuilding when --mrproper is used buildman: Add a flag to force mrproper on failure buildman: Add a way to limit the number of buildmans buildman: Add python3-coverage buildman: Add python3-pycryptodome buildman: Fix a few typos in toolchain code buildman: Always use the full path in CROSS_COMPILE u_boot_pylib: Use correct coverage tool within venv Vincent Stehlé (1): bootstd: cros: store partition type in an efi_guid_t arch/sandbox/cpu/os.c | 6 +- arch/sandbox/cpu/u-boot.lds | 20 ++---- arch/sandbox/lib/Makefile | 2 +- arch/sandbox/lib/sections.c | 13 ---- arch/x86/dts/u-boot.dtsi | 5 ++ arch/x86/lib/acpi_table.c | 2 - boot/bootmeth_cros.c | 4 +- cmd/unlz4.c | 4 +- common/board_r.c | 3 +- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + drivers/core/Kconfig | 2 +- drivers/core/device.c | 2 +- drivers/core/fdtaddr.c | 7 +- drivers/core/lists.c | 7 +- drivers/core/of_access.c | 51 +++++++------- drivers/core/of_addr.c | 41 ++++++------ drivers/core/of_extra.c | 33 +++++----- drivers/core/ofnode.c | 81 ++++++++++++----------- drivers/core/regmap.c | 57 ++++++++-------- drivers/core/root.c | 14 ++-- drivers/core/uclass.c | 4 +- include/asm-generic/global_data.h | 4 -- lib/acpi/acpi_table.c | 2 +- lib/acpi/ssdt.c | 1 - test/dm/acpi.c | 3 +- test/dm/core.c | 1 - tools/binman/binman.rst | 7 ++ tools/binman/entries.rst | 115 ++++++++++++++++++++++++-------- tools/binman/entry.py | 3 +- tools/binman/entry_test.py | 6 +- tools/binman/etype/blob.py | 7 +- tools/binman/etype/efi_capsule.py | 40 +++++------ tools/binman/etype/efi_empty_capsule.py | 22 ++++--- tools/binman/etype/intel_descriptor.py | 2 +- tools/binman/etype/ti_secure.py | 45 ++++++------- tools/binman/fdt_test.py | 48 +++++++------- tools/binman/ftest.py | 70 ++++++++++++++------ tools/binman/test/326_assume_size.dts | 16 +++++ tools/binman/test/327_assume_size_ok.dts | 16 +++++ tools/buildman/bsettings.py | 5 +- tools/buildman/builder.py | 23 ++++--- tools/buildman/builderthread.py | 40 ++++++----- tools/buildman/buildman.rst | 8 ++- tools/buildman/cmdline.py | 8 ++- tools/buildman/control.py | 145 ++++++++++++++++++++++++++++++++++++++-- tools/buildman/func_test.py | 74 ++++++++++----------- tools/buildman/pyproject.toml | 6 +- tools/buildman/requirements.txt | 2 + tools/buildman/test.py | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- tools/buildman/toolchain.py | 24 ++++--- tools/patman/func_test.py | 10 ++- tools/patman/patchstream.py | 7 ++ tools/patman/patman.rst | 15 ++++- tools/patman/settings.py | 8 +-- tools/patman/test/0002-fdt-Correct-cast-for-sandbox-in-fdtdec_setup_mem_siz.patch | 2 + tools/patman/test/test01.txt | 2 + tools/u_boot_pylib/terminal.py | 7 +- tools/u_boot_pylib/test_util.py | 11 +++- 59 files changed, 934 insertions(+), 429 deletions(-) delete mode 100644 arch/sandbox/lib/sections.c create mode 100644 tools/binman/test/326_assume_size.dts create mode 100644 tools/binman/test/327_assume_size_ok.dts Regards, Simon

2 1

[PATCH 01/12] net/tcp: fix TCP options processing
by Mikhail Kshevetskiy 03 Jul '24

03 Jul '24

Current TCP code may miss an option if TCP_O_NOP option was used before it for proper aligning. Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy(a)iopsys.eu> --- net/tcp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/tcp.c b/net/tcp.c index a713e1dd609..c9bcd364ee3 100644 --- a/net/tcp.c +++ b/net/tcp.c @@ -476,7 +476,7 @@ void tcp_parse_options(uchar *o, int o_len) * NOPs are options with a zero length, and thus are special. * All other options have length fields. */ - for (p = o; p < (o + o_len); p = p + p[1]) { + for (p = o; p < (o + o_len); ) { if (!p[1]) return; /* Finished processing options */ @@ -491,12 +491,14 @@ void tcp_parse_options(uchar *o, int o_len) case TCP_O_TS: tsopt = (struct tcp_t_opt *)p; rmt_timestamp = tsopt->t_snd; - return; + break; } /* Process optional NOPs */ if (p[0] == TCP_O_NOP) p++; + else + p += p[1]; } } -- 2.43.0

4 14

[PATCH v2 0/2] scripts/Makefile.lib: EFI: Use capsule CRT instead of ESL
by Jonathan Humphreys 03 Jul '24

03 Jul '24

Use the capsule's public key certificate rather than a prebuilt ESL generated from the certificate. The ESL is now generated as part of the build. Changes from v1: - Converted the single patch to a series to include a bug fix found during development. - Created an explicit rule for creating the ESL file for proper makefile dependency tracking. v1 had combined creating the ESL file and generating the .dtsi include in a single command. Jonathan Humphreys (2): scripts/Makefile.lib: fixes: Embed capsule public key in platform's dtb scripts/Makefile.lib: EFI: Use capsule CRT instead of ESL file board/sandbox/capsule_pub_esl_good.esl | Bin 831 -> 0 bytes configs/sandbox_defconfig | 2 +- configs/sandbox_flattree_defconfig | 2 +- doc/develop/uefi/uefi.rst | 8 ++++---- lib/efi_loader/Kconfig | 12 +++++++----- scripts/Makefile.lib | 24 +++++++++++++++--------- 6 files changed, 28 insertions(+), 20 deletions(-) delete mode 100644 board/sandbox/capsule_pub_esl_good.esl -- 2.34.1

3 5

[PATCH 0/2] Support imx8m composite mux
by Michael Trimarchi 03 Jul '24

03 Jul '24

The mux ops for i.MX8M composite clk needs to be specialized. In order to reduce the code duplication we need to make public some interface and write a specific function in the mux ops. Those patches implement the behavior Michael Trimarchi (2): clk: clk-mux: Make public the clk_fetch_parent_index clk: imx: add mux ops for i.MX8M composite clk drivers/clk/clk-mux.c | 5 ++-- drivers/clk/imx/clk-composite-8m.c | 37 +++++++++++++++++++++++++++++- include/linux/clk-provider.h | 1 + 3 files changed, 39 insertions(+), 4 deletions(-) -- 2.43.0

3 4

[PATCH v1] board: mpfs_icicle: implement board_fdt_blob_setup()
by Conor Dooley 03 Jul '24

03 Jul '24

The firmware on the Icicle is capable of providing a devicetree in a1 to U-Boot, but until now the devicetree has been packaged in a "payload" [1] alongside U-Boot (or other bootloaders/RTOSes) and appended to the image. The address of this appended devicetree is placed in a1 by the firmware. This meant that the mechanism used by OF_SEPARATE to locate the devicetree at the end of the image would pick up the one provided by the firmware when u-boot-nodtb.bin was in the payload and U-Boot's devicetree when u-boot.bin was. The firmware is now going to be capable of providing a minimal devicetree (quite cut down due to severe space constraints), but this devicetree is linked into the firmware that runs out of the L2 rather than at the end of the U-Boot image. Implement board_fdt_blob_setup() so that this devicetree can be optionally used, and the devicetree provided in the "payload" can be used without relying on "happening" to implement the same strategy as OF_SEPARATE expects in combination with u-boot-nodtb.bin. Unlike other RISC-V boards, the firmware provided devicetree is only used when OF_BOARD is set, so that the almost certainly more complete devicetree in U-Boot will be used unless explicitly requested otherwise. Link: https://github.com/polarfire-soc/hart-software-services/blob/master/tools/h… [1] Signed-off-by: Conor Dooley <conor.dooley(a)microchip.com> --- CC: Ivan Griffin <ivan.griffin(a)microchip.com> CC: Padmarao Begari <padmarao.begari(a)microchip.com> CC: Cyril Jean <cyril.jean(a)microchip.com> CC: Tom Rini <trini(a)konsulko.com> CC: Conor Dooley <conor.dooley(a)microchip.com> CC: u-boot(a)lists.denx.de --- board/microchip/mpfs_icicle/mpfs_icicle.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/board/microchip/mpfs_icicle/mpfs_icicle.c b/board/microchip/mpfs_icicle/mpfs_icicle.c index 4d7d843dfa3..2c1f7175f0e 100644 --- a/board/microchip/mpfs_icicle/mpfs_icicle.c +++ b/board/microchip/mpfs_icicle/mpfs_icicle.c @@ -9,6 +9,7 @@ #include <init.h> #include <asm/global_data.h> #include <asm/io.h> +#include <asm/sections.h> DECLARE_GLOBAL_DATA_PTR; @@ -50,6 +51,24 @@ static void read_device_serial_number(u8 *response, u8 response_size) response_buf[idx] = readb(MPFS_SYS_SERVICE_MAILBOX + idx); } +void *board_fdt_blob_setup(int *err) +{ + *err = 0; + /* + * The devicetree provided by the previous stage is very minimal due to + * severe space constraints. The firmware performs no fixups etc. + * U-Boot, if providing a devicetree, almost certainly has a better + * more complete one than the firmware so that provided by the firmware + * is ignored for OF_SEPARATE. + */ + if (IS_ENABLED(CONFIG_OF_BOARD)) { + if (gd->arch.firmware_fdt_addr) + return (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr; + } + + return (ulong *)_end; +} + int board_init(void) { /* For now nothing to do here. */ -- 2.43.2

5 10