configs/qemu_aarch64_ebbr: bump linux to 6.1.12 and u-boot to 2023.01

- Bump Linux kernel version to 6.1.12.
- Bump U-Boot version to 2023.01 and rename config fragment to make it
  clearer that it is not a complete config file.

Signed-off-by: Vincent Stehlé <[email protected]>
Cc: Romain Naour <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>

diff --git a/board/qemu/aarch64-ebbr/u-boot.config b/board/qemu/aarch64-ebbr/u-boot.config
deleted file mode 100644 (file)
index 94aae9d..0000000
--- a/board/qemu/aarch64-ebbr/u-boot.config
+++ /dev/null
@@ -1,34 +0,0 @@
-CONFIG_BOOTM_EFI=y
-CONFIG_CMD_BOOTEFI=y
-CONFIG_CMD_BOOTEFI_HELLO=y
-CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
-CONFIG_CMD_BOOTEFI_SELFTEST=y
-CONFIG_CMD_EFIDEBUG=y
-CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y
-CONFIG_CMD_GPT=y
-CONFIG_CMD_NVEDIT_EFI=y
-CONFIG_CMD_RNG=y
-CONFIG_CMD_RTC=y
-CONFIG_DM_RTC=y
-CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
-CONFIG_EFI_GET_TIME=y
-CONFIG_EFI_HAVE_RUNTIME_RESET=y
-CONFIG_EFI_LOADER=y
-CONFIG_EFI_LOADER_HII=y
-CONFIG_EFI_MM_COMM_TEE=y
-CONFIG_EFI_PARTITION=y
-CONFIG_EFI_SECURE_BOOT=y
-CONFIG_EFI_SET_TIME=y
-CONFIG_EFI_UNICODE_CAPITALIZATION=y
-CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
-CONFIG_EFI_VARIABLE_FILE_STORE=y
-CONFIG_FAT_WRITE=y
-CONFIG_FIT=y
-CONFIG_FS_FAT=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OPTEE=y
-CONFIG_PARTITION_TYPE_GUID=y
-CONFIG_RNG_OPTEE=y
-CONFIG_RTC_EMULATION=y
-CONFIG_SCMI_FIRMWARE=y
-CONFIG_TEE=y

diff --git a/board/qemu/aarch64-ebbr/u-boot.fragment b/board/qemu/aarch64-ebbr/u-boot.fragment
new file mode 100644 (file)
index 0000000..94aae9d
--- /dev/null
+++ b/board/qemu/aarch64-ebbr/u-boot.fragment
@@ -0,0 +1,34 @@
+CONFIG_BOOTM_EFI=y
+CONFIG_CMD_BOOTEFI=y
+CONFIG_CMD_BOOTEFI_HELLO=y
+CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
+CONFIG_CMD_BOOTEFI_SELFTEST=y
+CONFIG_CMD_EFIDEBUG=y
+CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_NVEDIT_EFI=y
+CONFIG_CMD_RNG=y
+CONFIG_CMD_RTC=y
+CONFIG_DM_RTC=y
+CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
+CONFIG_EFI_GET_TIME=y
+CONFIG_EFI_HAVE_RUNTIME_RESET=y
+CONFIG_EFI_LOADER=y
+CONFIG_EFI_LOADER_HII=y
+CONFIG_EFI_MM_COMM_TEE=y
+CONFIG_EFI_PARTITION=y
+CONFIG_EFI_SECURE_BOOT=y
+CONFIG_EFI_SET_TIME=y
+CONFIG_EFI_UNICODE_CAPITALIZATION=y
+CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
+CONFIG_EFI_VARIABLE_FILE_STORE=y
+CONFIG_FAT_WRITE=y
+CONFIG_FIT=y
+CONFIG_FS_FAT=y
+CONFIG_OF_LIBFDT=y
+CONFIG_OPTEE=y
+CONFIG_PARTITION_TYPE_GUID=y
+CONFIG_RNG_OPTEE=y
+CONFIG_RTC_EMULATION=y
+CONFIG_SCMI_FIRMWARE=y
+CONFIG_TEE=y

diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig
index d293ad0e60839195b33afdf706dceaa3311d8e4e..e3157089a972e61213432285008d3f3248438b5b 100644 (file)
--- 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_0=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 
@@ -39,9 +39,9 @@ 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="2022.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment"
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 
 # Host tools