Browse Source

configs/qemu_arm_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 follow CONFIG_SYS_TEXT_BASE renaming.

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>
Vincent Stehlé 2 năm trước cách đây
mục cha
commit
a86bbb4ae4
2 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 1 1
      board/qemu/arm-ebbr/u-boot.fragment
  2. 3 3
      configs/qemu_arm_ebbr_defconfig

+ 1 - 1
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

+ 3 - 3
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