[Buildroot] [PATCH next] configs/aarch64_efi: bump kernel version

[Buildroot] [PATCH next] configs/aarch64_efi: bump kernel version

[Vincent Stehlé]

Bump Linux kernel version to 5.15.4.

We enlarge the boot partition to follow the kernel image size increase and
update the instructions to run on qemu with a U-Boot based firmware.

Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Erico Nunes <nunes.erico@gmail.com>
Cc: Dick Olsson <hi@senzilla.io>
---


Hi,

This was (lightly) tested on qemu with both edk2 and U-Boot[1] firmware, as well
as on ROCKPro64 with U-Boot firmware[2].

Best regards,
Vincent.

[1]: https://github.com/glikely/u-boot-tfa-build
[2]: https://gitlab.arm.com/systemready/firmware-build/rk3399-manifest/-/tree/rockpro64-21.09


 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 8ec1f10fd82..13d69e5e425 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 164993eea49..0e7ea0b5dd7 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 6cb8d1fac21..1bd06c51f37 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
 
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH next] configs/aarch64_efi: bump kernel version

[D. Olsson via buildroot]

Hi Vincent,

> On 25 Nov 2021, at 11:25, Vincent Stehlé <vincent.stehle@arm.com> wrote:
> 
> Bump Linux kernel version to 5.15.4.
> 
> We enlarge the boot partition to follow the kernel image size increase and
> update the instructions to run on qemu with a U-Boot based firmware.

I understand that you might have tested this with U-Boot firmware. But the updated instructions doesn't make any references to U-Boot, so your description is a little bit confusing. Maybe simplify the commit message?

> 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 8ec1f10fd82..13d69e5e425 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 164993eea49..0e7ea0b5dd7 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 6cb8d1fac21..1bd06c51f37 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
> 
> -- 
> 2.33.0

However, the code changes look good.

Reviewed-by: Dick Olsson <hi@senzilla.io>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH next] configs/aarch64_efi: bump kernel version

[Vincent Stehlé]

On Thu, Nov 25, 2021 at 01:28:16PM +0100, D. Olsson wrote:
..
> I understand that you might have tested this with U-Boot firmware. But the updated instructions doesn't make any references to U-Boot, so your description is a little bit confusing. Maybe simplify the commit message?

Hi Dick,

Thanks for your review; I will simplify the commit message.

Best regards,
Vincent.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH next v2] configs/aarch64_efi: bump kernel version

[Vincent Stehlé]

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é <vincent.stehle@arm.com>
Reviewed-by: Dick Olsson <hi@senzilla.io>
Cc: Erico Nunes <nunes.erico@gmail.com>
---

Changes since v1:
- Update commit message

 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 8ec1f10fd82..13d69e5e425 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 164993eea49..0e7ea0b5dd7 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 6cb8d1fac21..1bd06c51f37 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
 
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH next v2] configs/aarch64_efi: bump kernel version

[Arnout Vandecappelle]

On 25/11/2021 19:26, Vincent Stehlé wrote:
> 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é <vincent.stehle@arm.com>
> Reviewed-by: Dick Olsson <hi@senzilla.io>
> Cc: Erico Nunes <nunes.erico@gmail.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
> 
> Changes since v1:
> - Update commit message
> 
>   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 8ec1f10fd82..13d69e5e425 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 164993eea49..0e7ea0b5dd7 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 6cb8d1fac21..1bd06c51f37 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
>   
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot