Skip to content

[pull] master from buildroot:master#909

Merged
pull[bot] merged 7 commits intomir-one:masterfrom
buildroot:master
Mar 11, 2026
Merged

[pull] master from buildroot:master#909
pull[bot] merged 7 commits intomir-one:masterfrom
buildroot:master

Conversation

@pull
Copy link

@pull pull bot commented Mar 11, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

OP-TEE generates a few binaries that can be used by u-boot on some
platforms (Rockchip, Texas Instruments K3) using TEE variable.

Add a link to the OP-TEE documentation were we can find easily the
desciption for each TEE format that can be used by u-boot.

For convenience, copy tee.elf and tee.bin description in each option
choice help text.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Some platforms such Texas Instrument’s K3 familly of SoCs requires
TEE in raw binary format to support their boot flow [1].

Add a new option to select tee-raw.bin instead of tee.bin.

[1] https://docs.u-boot.org/en/latest/board/ti/k3.html#building-tispl-bin

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
…E_RAW_BIN

This defconfig use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS to provide the path
to the TEE in raw binary format but use the legacy file name
"tee-pager_v2.bin" rather than the recommended "tee-raw.bin" [1][2].

Instead of just replacing the file name, use the newly introduced
BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_RAW_BIN option. Since this option
needs BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE, we now have an explicit
dependency between u-boot and optee-os package.

Previously we had an indirect dependency: optee-os <- ATF <- u-boot
with both BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE and
BR2_TARGET_UBOOT_NEEDS_ATF_BL31 options enabled at the same time.

[1] OP-TEE/optee_os@376cb12
[2] https://source.denx.de/u-boot/u-boot/-/commit/4e0b8238eea83b71713230e67e781111ea897035

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
The commit [1] update arm-trusted-firmware to v2.12 LTS without
removing the custom file hash.

While at it, remove unused linux-headers.hash since we already use a
prebuilt toolchain.

[1] https://gitlab.com/buildroot.org/buildroot/-/commit/4abb8a98b26922796b41bc913e72be487337640e

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
There was a previous attempt in commit [1] to bump the kernel to 6.18
but the SD card failed at boot. It seems the actual issue is related to
the "cheap" (or fake?) SD card with SD UHS SDR50 speed.

This offending SD card come from a lot recently purchased in order to
fix my “Too many boards, not enough SD cards” issue.

[1] https://gitlab.com/buildroot.org/buildroot/-/commit/4abb8a98b26922796b41bc913e72be487337640e

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
…6.01

Replace OP-TEE TEE binary file tee-pager_v2.bin by tee-raw.bin using
the new option BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_RAW_BIN.

Remove unsued linux-headers.hash since we use a prebuilt toolchain.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
…6.01

This commit:
    - updates the Kernel from 6.10 to 6.18.16
    - updates U-Boot from 2024.07 to 2026.01
    - updates arm-trusted-firmware from v2.11 to v2.12 LTS
    - switches to Bootlin external glibc stable toolchain

Replace OP-TEE TEE binary file tee-pager_v2.bin by tee-raw.bin using
the new option BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_RAW_BIN.

Remove unsued linux-headers.hash since we now use a prebuilt toolchain.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
@pull pull bot locked and limited conversation to collaborators Mar 11, 2026
@pull pull bot added the ⤵️ pull label Mar 11, 2026
@pull pull bot merged commit ccf727a into mir-one:master Mar 11, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant