From ccf727ab96af0ad58b432fa9ed2aed8680649f3a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 8 Mar 2026 22:33:48 +0100 Subject: [PATCH] configs/beagleplay_defconfig: bump linux to 6.18.16 and u-boot to 2026.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 Signed-off-by: Julien Olivain --- .../arm-trusted-firmware.hash | 2 -- .../patches/linux-headers/linux-headers.hash | 1 - .../beagleplay/patches/linux/linux.hash | 4 ++-- .../beagleplay/patches/uboot/uboot.hash | 2 +- configs/beagleplay_defconfig | 16 +++++++++------- 5 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash delete mode 120000 board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash diff --git a/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash deleted file mode 100644 index 8b77e1f165..0000000000 --- a/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash b/board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash deleted file mode 120000 index 5808d92afe..0000000000 --- a/board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash +++ /dev/null @@ -1 +0,0 @@ -../linux/linux.hash \ No newline at end of file diff --git a/board/beagleboard/beagleplay/patches/linux/linux.hash b/board/beagleboard/beagleplay/patches/linux/linux.hash index 53eb143894..eb4dcee958 100644 --- a/board/beagleboard/beagleplay/patches/linux/linux.hash +++ b/board/beagleboard/beagleplay/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 4f21c01f4d04c1d1b3ed794153f8900802c92497be620b07c4869530f2d28ee3 linux-6.18.16.tar.xz diff --git a/board/beagleboard/beagleplay/patches/uboot/uboot.hash b/board/beagleboard/beagleplay/patches/uboot/uboot.hash index fe9b4f53dc..b6a925ea4e 100644 --- a/board/beagleboard/beagleplay/patches/uboot/uboot.hash +++ b/board/beagleboard/beagleplay/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 +sha256 b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 u-boot-2026.01.tar.bz2 diff --git a/configs/beagleplay_defconfig b/configs/beagleplay_defconfig index 42aa2fbd6e..90212bda44 100644 --- a/configs/beagleplay_defconfig +++ b/configs/beagleplay_defconfig @@ -1,5 +1,7 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/beagleboard/beagleplay/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beagleplay/post-build.sh" @@ -7,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/beagleboard/beagleplay/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-beagleplay" @@ -22,8 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -31,17 +32,19 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2026.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_beagleplay_r5" BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_beagleplay_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE=y +BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_RAW_BIN=y BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y @@ -49,7 +52,6 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.img_unsigned" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="tispl.bin_unsigned" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y