configs/qemu_{arm, aarch64}_ebbr: bump Linux, U-Boot and TF-A
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é <vincent.stehle@arm.com> Cc: Romain Naour <romain.naour@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
bd181c4de1
commit
73813c56c8
@ -26,7 +26,7 @@ Running under Qemu
|
|||||||
Run the emulation with:
|
Run the emulation with:
|
||||||
|
|
||||||
qemu-system-aarch64 \
|
qemu-system-aarch64 \
|
||||||
-M virt,secure=on \
|
-M virt,secure=on,acpi=off \
|
||||||
-bios output/images/flash.bin \
|
-bios output/images/flash.bin \
|
||||||
-cpu cortex-a53 \
|
-cpu cortex-a53 \
|
||||||
-device virtio-blk-device,drive=hd0 \
|
-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 \
|
-drive file=output/images/disk.img,if=none,format=raw,id=hd0 \
|
||||||
-m 2048 \
|
-m 2048 \
|
||||||
-netdev user,id=eth0 \
|
-netdev user,id=eth0 \
|
||||||
-no-acpi \
|
|
||||||
-nographic \
|
-nographic \
|
||||||
-object rng-random,filename=/dev/urandom,id=rng0 \
|
-object rng-random,filename=/dev/urandom,id=rng0 \
|
||||||
-rtc base=utc,clock=host \
|
-rtc base=utc,clock=host \
|
||||||
@ -63,7 +62,7 @@ image first with:
|
|||||||
Then run the OS installer iso image on emulation with:
|
Then run the OS installer iso image on emulation with:
|
||||||
|
|
||||||
qemu-system-aarch64 \
|
qemu-system-aarch64 \
|
||||||
-M virt,secure=on \
|
-M virt,secure=on,acpi=off \
|
||||||
-bios output/images/flash.bin \
|
-bios output/images/flash.bin \
|
||||||
-cpu cortex-a53 \
|
-cpu cortex-a53 \
|
||||||
-device virtio-blk-device,drive=hd1 \
|
-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 \
|
-drive file=disk.qcow2,if=none,id=hd1 \
|
||||||
-m 2048 \
|
-m 2048 \
|
||||||
-netdev user,id=eth0 \
|
-netdev user,id=eth0 \
|
||||||
-no-acpi \
|
|
||||||
-nographic \
|
-nographic \
|
||||||
-object rng-random,filename=/dev/urandom,id=rng0 \
|
-object rng-random,filename=/dev/urandom,id=rng0 \
|
||||||
-rtc base=utc,clock=host \
|
-rtc base=utc,clock=host \
|
||||||
|
@ -26,7 +26,7 @@ Running under Qemu
|
|||||||
Run the emulation with:
|
Run the emulation with:
|
||||||
|
|
||||||
qemu-system-arm \
|
qemu-system-arm \
|
||||||
-M virt,secure=on \
|
-M virt,secure=on,acpi=off \
|
||||||
-bios output/images/flash.bin \
|
-bios output/images/flash.bin \
|
||||||
-cpu cortex-a15 \
|
-cpu cortex-a15 \
|
||||||
-device virtio-blk-device,drive=hd0 \
|
-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 \
|
-drive file=output/images/disk.img,if=none,format=raw,id=hd0 \
|
||||||
-m 1024 \
|
-m 1024 \
|
||||||
-netdev user,id=eth0 \
|
-netdev user,id=eth0 \
|
||||||
-no-acpi \
|
|
||||||
-nographic \
|
-nographic \
|
||||||
-object rng-random,filename=/dev/urandom,id=rng0 \
|
-object rng-random,filename=/dev/urandom,id=rng0 \
|
||||||
-rtc base=utc,clock=host \
|
-rtc base=utc,clock=host \
|
||||||
|
@ -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"
|
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg"
|
||||||
|
|
||||||
# Linux headers
|
# Linux headers
|
||||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
|
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
|
||||||
|
|
||||||
# Kernel
|
# Kernel
|
||||||
BR2_LINUX_KERNEL=y
|
BR2_LINUX_KERNEL=y
|
||||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=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_USE_ARCH_DEFAULT_CONFIG=y
|
||||||
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
|
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
|
||||||
|
|
||||||
@ -27,7 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
|
|||||||
# Firmware and bootloader
|
# Firmware and bootloader
|
||||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
|
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
|
||||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=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_PLATFORM="qemu"
|
||||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
|
BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
|
||||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=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=y
|
||||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=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_BOARD_DEFCONFIG="qemu_arm64"
|
||||||
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment"
|
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment"
|
||||||
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
|
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
|
||||||
|
@ -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"
|
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg"
|
||||||
|
|
||||||
# Linux headers
|
# Linux headers
|
||||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
|
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
|
||||||
|
|
||||||
# Kernel
|
# Kernel
|
||||||
BR2_LINUX_KERNEL=y
|
BR2_LINUX_KERNEL=y
|
||||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=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_USE_ARCH_DEFAULT_CONFIG=y
|
||||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment"
|
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
|
# Firmware and bootloader
|
||||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
|
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
|
||||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=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_PLATFORM="qemu"
|
||||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
|
BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
|
||||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=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=y
|
||||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=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_BOARD_DEFCONFIG="qemu_arm"
|
||||||
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment"
|
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment"
|
||||||
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
|
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
|
||||||
|
Loading…
Reference in New Issue
Block a user