From a86bbb4ae4a6f5580e4cbfad8ecf8ebf81b6e053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 16 Feb 2023 11:07:50 +0100 Subject: [PATCH] configs/qemu_arm_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and follow CONFIG_SYS_TEXT_BASE renaming. Signed-off-by: Vincent Stehlé Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/arm-ebbr/u-boot.fragment | 2 +- configs/qemu_arm_ebbr_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/arm-ebbr/u-boot.fragment b/board/qemu/arm-ebbr/u-boot.fragment index bfc382cde9..66fe910f16 100644 --- a/board/qemu/arm-ebbr/u-boot.fragment +++ b/board/qemu/arm-ebbr/u-boot.fragment @@ -31,5 +31,5 @@ CONFIG_PARTITION_TYPE_GUID=y CONFIG_RNG_OPTEE=y CONFIG_RTC_EMULATION=y CONFIG_SCMI_FIRMWARE=y -CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_TEE=y +CONFIG_TEXT_BASE=0x60000000 diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index f3e2d42a54..8fbb3069bc 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_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.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -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="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.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