From c11fb84b0c74f8037585b1b19b42687addbae37c Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 10 Feb 2026 01:07:28 +0100 Subject: [PATCH] configs/asus_tinker_rk3288: bump Linux to 6.18.8 and U-Boot to 2026.01 The patch: * bumps Linux kernel to version 6.18.8 * bumps U-Boot to version 2026.01 * forces check hashes Signed-off-by: Giulio Benetti [Julien: change linux.hash comment to use hash from upstream] Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - .../tinker/patches/linux-headers/linux-headers.hash | 1 + board/asus/tinker/patches/linux/linux.hash | 2 ++ board/asus/tinker/patches/uboot/uboot.hash | 2 ++ configs/asus_tinker_rk3288_defconfig | 11 +++++++---- 5 files changed, 12 insertions(+), 5 deletions(-) create mode 120000 board/asus/tinker/patches/linux-headers/linux-headers.hash create mode 100644 board/asus/tinker/patches/linux/linux.hash create mode 100644 board/asus/tinker/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index c7a02caf06..62e3998a66 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -77,7 +77,6 @@ configs/am574x_idk_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucp1020_defconfig lib_defconfig.ForceCheckHash configs/asus_tinker-s_rk3288_defconfig lib_defconfig.ForceCheckHash -configs/asus_tinker_rk3288_defconfig lib_defconfig.ForceCheckHash configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash configs/atmel_sama5d2_xplained_mmc_defconfig lib_defconfig.ForceCheckHash configs/atmel_sama5d2_xplained_mmc_dev_defconfig lib_defconfig.ForceCheckHash diff --git a/board/asus/tinker/patches/linux-headers/linux-headers.hash b/board/asus/tinker/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/asus/tinker/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/asus/tinker/patches/linux/linux.hash b/board/asus/tinker/patches/linux/linux.hash new file mode 100644 index 0000000000..f83883b936 --- /dev/null +++ b/board/asus/tinker/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 37f0c5d5c242c1d604e87d48f08795e861a5a85f725b4ca11d0a538f12ff8cff linux-6.18.8.tar.xz diff --git a/board/asus/tinker/patches/uboot/uboot.hash b/board/asus/tinker/patches/uboot/uboot.hash new file mode 100644 index 0000000000..60971ee74f --- /dev/null +++ b/board/asus/tinker/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 u-boot-2026.01.tar.bz2 diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index f3a2c4d71d..8326405536 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -1,7 +1,9 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_18=y +BR2_GLOBAL_PATCH_DIR="board/asus/tinker/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="tinker-rk3288" BR2_TARGET_GENERIC_ISSUE="Welcome to TINKER RK3288!" BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker/post-build.sh" @@ -9,10 +11,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/asus/tinker/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.8" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3288-tinker" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y @@ -20,11 +22,12 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="512M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" 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_FORMAT_DTB_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin"