From 35352fa288cedcee806caa83bb5de6c9162758b7 Mon Sep 17 00:00:00 2001 From: Jianfeng Liu Date: Sat, 30 Nov 2024 23:41:22 +0800 Subject: [PATCH] rk35xx-vendor: bump to 6.1 rkr4.1 sdk kernel --- config/sources/families/rk35xx.conf | 2 +- config/sources/families/rockchip-rk3588.conf | 2 +- patch/kernel/rk35xx-vendor-6.1/0000.patching_config.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf index c252a5cd6c59..50e83ad213e0 100644 --- a/config/sources/families/rk35xx.conf +++ b/config/sources/families/rk35xx.conf @@ -37,7 +37,7 @@ case $BRANCH in declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo KERNELSOURCE='https://github.com/armbian/linux-rockchip.git' - KERNELBRANCH='branch:rk-6.1-rkr3' + KERNELBRANCH='branch:rk-6.1-rkr4.1' KERNELPATCHDIR='rk35xx-vendor-6.1' ;; esac diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf index 626035b70cc4..2b589ab0c718 100644 --- a/config/sources/families/rockchip-rk3588.conf +++ b/config/sources/families/rockchip-rk3588.conf @@ -34,7 +34,7 @@ case $BRANCH in declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo KERNELSOURCE='https://github.com/armbian/linux-rockchip.git' - KERNELBRANCH='branch:rk-6.1-rkr3' + KERNELBRANCH='branch:rk-6.1-rkr4.1' KERNELPATCHDIR='rk35xx-vendor-6.1' LINUXFAMILY=rk35xx ;; diff --git a/patch/kernel/rk35xx-vendor-6.1/0000.patching_config.yaml b/patch/kernel/rk35xx-vendor-6.1/0000.patching_config.yaml index c77f324d61de..e2e43b1ec21f 100644 --- a/patch/kernel/rk35xx-vendor-6.1/0000.patching_config.yaml +++ b/patch/kernel/rk35xx-vendor-6.1/0000.patching_config.yaml @@ -4,8 +4,8 @@ config: name: rk35xx-6.1 kind: kernel type: vendor # or: vendor - branch: rk-6.1-rkr3 - last-known-good-tag: v6.1.75 + branch: rk-6.1-rkr4.1 + last-known-good-tag: v6.1.84 # .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones. # This is meant to provide a way to "add a board DTS" without having to null-patch them in.