From 13add49b2aa94db3c2c94576de670b6423f42a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 25 Nov 2021 19:26:55 +0100 Subject: [PATCH] configs/aarch64_efi_defconfig: bump kernel version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump Linux kernel version to 5.15.4. We enlarge the boot partition to follow the kernel image size increase and update the documentation. Signed-off-by: Vincent Stehlé Reviewed-by: Dick Olsson Cc: Erico Nunes Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/aarch64-efi/genimage-efi.cfg | 2 +- board/aarch64-efi/readme.txt | 2 +- configs/aarch64_efi_defconfig | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/aarch64-efi/genimage-efi.cfg b/board/aarch64-efi/genimage-efi.cfg index 8ec1f10fd8..13d69e5e42 100644 --- a/board/aarch64-efi/genimage-efi.cfg +++ b/board/aarch64-efi/genimage-efi.cfg @@ -8,7 +8,7 @@ image efi-part.vfat { } } - size = 32M + size = 64M } image disk.img { diff --git a/board/aarch64-efi/readme.txt b/board/aarch64-efi/readme.txt index 164993eea4..0e7ea0b5dd 100644 --- a/board/aarch64-efi/readme.txt +++ b/board/aarch64-efi/readme.txt @@ -45,7 +45,7 @@ the instructions in [3], with qemu_arm64_defconfig. This should give you a nor_flash.bin, which you can use with qemu as an alternative to QEMU_EFI.fd. You will also need to change the machine -specification to "-M virt,secure" on qemu command line, to enable TrustZone +specification to "-M virt,secure=on" on qemu command line, to enable TrustZone support, and you will need to increase the memory with "-m 1024". [1]: https://github.com/ARM-software/ebbr diff --git a/configs/aarch64_efi_defconfig b/configs/aarch64_efi_defconfig index 6cb8d1fac2..1bd06c51f3 100644 --- a/configs/aarch64_efi_defconfig +++ b/configs/aarch64_efi_defconfig @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.cfg" -# Linux headers same as kernel, a 5.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.11.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y