From 1dfcb841f9021310bc81a2d0bb3c52c90050a325 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 Jun 2026 13:45:38 +0200 Subject: [PATCH] configs/qemu_arm_vexpress_tz_defconfig: bump tf-a and u-boot versions - Bump TF-A LTS 2.12 - Bump u-boot to version 2026.04. smhload command has been removed from u-boot 2022.07 [1], use "load hostfs" generic command as suggested by the documentation [2]. This commit adds BR2_TARGET_UBOOT_NEEDS_DTC=y, because the new 2026.04 version does need dtc. Adding host-dtc also avoid uboot build failures on hosts with libyaml (uboot builds its own dtc if none is defined in DTC build variable). This commit also removes BR2_TOOLCHAIN_BUILDROOT_CXX=y, which was forgotten when the defconfig was switched to Bootlin toolchain, in commit [3]. [1] https://source.denx.de/u-boot/u-boot/-/commit/dcc4f9623e27b92a1e0b97326631b0d5841c49cb [2] https://docs.u-boot-project.org/en/latest/usage/semihosting.html#migrating-from-smhload [3] https://gitlab.com/buildroot.org/buildroot/-/commit/dbe0896826e7394da71d653c6987d1a119d85336 Signed-off-by: Romain Naour [Julien: - add BR2_TARGET_UBOOT_NEEDS_DTC=y - remove BR2_TOOLCHAIN_BUILDROOT_CXX=y ] Signed-off-by: Julien Olivain --- board/qemu/arm-vexpress-tz/u-boot.config | 2 +- board/qemu/patches/uboot/uboot.hash | 2 +- configs/qemu_arm_vexpress_tz_defconfig | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/board/qemu/arm-vexpress-tz/u-boot.config b/board/qemu/arm-vexpress-tz/u-boot.config index 48b1d06fdb..8633ea18d0 100644 --- a/board/qemu/arm-vexpress-tz/u-boot.config +++ b/board/qemu/arm-vexpress-tz/u-boot.config @@ -1,5 +1,5 @@ CONFIG_SYS_TEXT_BASE=0x60000000 -CONFIG_BOOTCOMMAND="smhload zImage ${kernel_addr_r} && smhload rootfs.cpio.uboot ${ramdisk_addr_r} && setenv bootargs console=ttyAMA0,115200 earlyprintk=serial,ttyAMA0,115200 && bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr}" +CONFIG_BOOTCOMMAND="load hostfs - ${kernel_addr_r} zImage && load hostfs - ${ramdisk_addr_r} rootfs.cpio.uboot && setenv bootargs console=ttyAMA0,115200 earlyprintk=serial,ttyAMA0,115200 && bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr}" CONFIG_SEMIHOSTING=y # Drop flash accesses CONFIG_ENV_IS_IN_FLASH=n diff --git a/board/qemu/patches/uboot/uboot.hash b/board/qemu/patches/uboot/uboot.hash index 7762ff3f8f..594d7ebeae 100644 --- a/board/qemu/patches/uboot/uboot.hash +++ b/board/qemu/patches/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 u-boot-2022.04.tar.bz2 sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +sha256 ac7c04b8b7004923b00a4e5d6699c5df4d21233bac9fda690d8cfbc209fff2fd u-boot-2026.04.tar.bz2 diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 48273cdf5a..84dca264da 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -4,7 +4,6 @@ BR2_ARM_FPU_VFPV3D16=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -24,8 +23,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # 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.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -37,8 +35,9 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/u-boot.config" +BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y