From 8fcf3a1bbe71c191d8fa46ab10a59a41d6b5ea47 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 27 Oct 2024 20:43:35 +0100 Subject: [PATCH] configs/qemu_aarch64_sbsa_defconfig: update ATF to v2.11 qemu_aarch64_sbsa_defconfig doesn't boot since the qemu version bump to 9.0 [1]. Sync the ATF version with the one (v2.11) used by Qemu tests [2]. Since we use a released version of ATF, we switch to ATF custom version to use the official ATF repository instead of the read-only mirror on ARM-software's github. This doesn't fix yet this defconfig due to a bug in edk2 as mentioned in the qemu commit log [2]. With the edk2 version bump applied, this defconfig doesn't boot with ATF v2.10-lts but boot successfully with ATF v2.11. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/103a55028c75dace312470ba05a197886c6b6100 [2] https://gitlab.com/qemu-project/qemu/-/commit/24a7cd6a7c21f82f1ce9bd5ecf6fb54eb7bf4602 Signed-off-by: Romain Naour Signed-off-by: Julien Olivain --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 1 + configs/qemu_aarch64_sbsa_defconfig | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 5632db01f8..4a0534d1ba 100644 --- a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,4 @@ # Locally computed: sha256 c9f0d0bf967d690edbf34b621728a6271856f2e26ed46081a285b6d627a358c5 arm-trusted-firmware-v2.7-git4.tar.gz sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 8da4331b30..23d274b529 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_EDK2=y