From 0b428adb66f365d9377ccdfe50a4b5fd6141ab28 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Tue, 17 Dec 2024 21:00:41 +0800 Subject: [PATCH] configs/cubieboard2_defconfig: bump Linux to 6.12.5 Bump Linux kernel version to 6.12.5 and update the hash accordingly. Signed-off-by: Scott Fan [Julien: add missing BR2_TARGET_UBOOT_NEEDS_GNUTLS=y] Signed-off-by: Julien Olivain --- board/cubietech/cubieboard2/patches/linux/linux.hash | 2 +- configs/cubieboard2_defconfig | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/board/cubietech/cubieboard2/patches/linux/linux.hash b/board/cubietech/cubieboard2/patches/linux/linux.hash index 4759f8354e..450cb12423 100644 --- a/board/cubietech/cubieboard2/patches/linux/linux.hash +++ b/board/cubietech/cubieboard2/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc linux-6.11.11.tar.xz +sha256 39207fce1ce42838e085261bae0af5ce4a0843aa777cfc0f5c49bc7729602bcd linux-6.12.5.tar.xz diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index 9c0e51b37d..bace740ce9 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/cubietech/cubieboard2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/cubietech/cubieboard2/rootfs_overlay" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.5" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-cubieboard2" @@ -24,6 +24,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y