From 73813c56c8bb3e781376f333125a13048be690b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 11 Jan 2024 14:57:04 +0100 Subject: [PATCH] configs/qemu_{arm, aarch64}_ebbr: bump Linux, U-Boot and TF-A MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump qemu_arm_ebbr_defconfig and qemu_aarch64_ebbr_defconfig in sync: - Bump Linux to v6.6.11 - Bump U-Boot to 2024.01 - Bump TF-A to v2.10 While at it, adapt Qemu command line arguments to avoid a warning when disabling ACPI. Signed-off-by: Vincent Stehlé Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/aarch64-ebbr/readme.txt | 6 ++---- board/qemu/arm-ebbr/readme.txt | 3 +-- configs/qemu_aarch64_ebbr_defconfig | 8 ++++---- configs/qemu_arm_ebbr_defconfig | 8 ++++---- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/board/qemu/aarch64-ebbr/readme.txt b/board/qemu/aarch64-ebbr/readme.txt index 76d566045d..15353a8f68 100644 --- a/board/qemu/aarch64-ebbr/readme.txt +++ b/board/qemu/aarch64-ebbr/readme.txt @@ -26,7 +26,7 @@ Running under Qemu Run the emulation with: qemu-system-aarch64 \ - -M virt,secure=on \ + -M virt,secure=on,acpi=off \ -bios output/images/flash.bin \ -cpu cortex-a53 \ -device virtio-blk-device,drive=hd0 \ @@ -35,7 +35,6 @@ Run the emulation with: -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ -m 2048 \ -netdev user,id=eth0 \ - -no-acpi \ -nographic \ -object rng-random,filename=/dev/urandom,id=rng0 \ -rtc base=utc,clock=host \ @@ -63,7 +62,7 @@ image first with: Then run the OS installer iso image on emulation with: qemu-system-aarch64 \ - -M virt,secure=on \ + -M virt,secure=on,acpi=off \ -bios output/images/flash.bin \ -cpu cortex-a53 \ -device virtio-blk-device,drive=hd1 \ @@ -74,7 +73,6 @@ Then run the OS installer iso image on emulation with: -drive file=disk.qcow2,if=none,id=hd1 \ -m 2048 \ -netdev user,id=eth0 \ - -no-acpi \ -nographic \ -object rng-random,filename=/dev/urandom,id=rng0 \ -rtc base=utc,clock=host \ diff --git a/board/qemu/arm-ebbr/readme.txt b/board/qemu/arm-ebbr/readme.txt index dc2b0647a2..19e114579f 100644 --- a/board/qemu/arm-ebbr/readme.txt +++ b/board/qemu/arm-ebbr/readme.txt @@ -26,7 +26,7 @@ Running under Qemu Run the emulation with: qemu-system-arm \ - -M virt,secure=on \ + -M virt,secure=on,acpi=off \ -bios output/images/flash.bin \ -cpu cortex-a15 \ -device virtio-blk-device,drive=hd0 \ @@ -35,7 +35,6 @@ Run the emulation with: -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ -m 1024 \ -netdev user,id=eth0 \ - -no-acpi \ -nographic \ -object rng-random,filename=/dev/urandom,id=rng0 \ -rtc base=utc,clock=host \ diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 7807814aff..75a892f798 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -27,7 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # Firmware and bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -39,7 +39,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index cfeea623ff..a0520edcf4 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # Firmware and bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -42,7 +42,7 @@ 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="2023.07.02" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y