From 852a7057dd4a8577d4e38d66707698846a6b075c Mon Sep 17 00:00:00 2001 From: Mecid Urganci Date: Mon, 6 Oct 2025 00:02:58 +0200 Subject: [PATCH] Switch Rockchip Vendor to rkr6.1 --- config/kernel/linux-rk35xx-vendor.config | 16 +++++++++++----- config/sources/families/rk35xx.conf | 2 +- config/sources/families/rockchip-rk3588.conf | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/config/kernel/linux-rk35xx-vendor.config b/config/kernel/linux-rk35xx-vendor.config index 0aac0c14b1a4..658e7f85964d 100644 --- a/config/kernel/linux-rk35xx-vendor.config +++ b/config/kernel/linux-rk35xx-vendor.config @@ -23,6 +23,7 @@ CONFIG_UCLAMP_BUCKETS_COUNT=20 CONFIG_MEMCG=y CONFIG_BLK_CGROUP=y CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y CONFIG_UCLAMP_TASK_GROUP=y CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_RDMA=y @@ -180,7 +181,9 @@ CONFIG_MPTCP=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETFILTER=y CONFIG_BRIDGE_NETFILTER=m +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMESTAMP=y @@ -225,6 +228,7 @@ CONFIG_NFT_SYNPROXY=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FIB_NETDEV=m +CONFIG_NFT_REJECT_NETDEV=m CONFIG_NF_FLOW_TABLE_INET=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XTABLES=y @@ -233,7 +237,6 @@ CONFIG_NETFILTER_XT_TARGET_AUDIT=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_HMARK=m CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m @@ -242,6 +245,7 @@ CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m @@ -475,6 +479,7 @@ CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m CONFIG_NET_EMATCH_TEXT=m CONFIG_NET_EMATCH_IPSET=m +CONFIG_NET_EMATCH_IPT=m CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=m CONFIG_NET_ACT_GACT=m @@ -569,6 +574,8 @@ CONFIG_MTD_SPI_NAND=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=y CONFIG_ZRAM=m +CONFIG_ZRAM_WRITEBACK=y +CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_NBD=m @@ -902,7 +909,6 @@ CONFIG_TTY_OVERY_SDIO=m CONFIG_USB_NET_RNDIS_WLAN=y # CONFIG_IEEE802154_DRIVERS is not set CONFIG_LTE=y -# CONFIG_LTE_RM310 is not set CONFIG_LTE_EM05=m CONFIG_INPUT_LEDS=m CONFIG_INPUT_SPARSEKMAP=m @@ -1025,7 +1031,6 @@ CONFIG_TOUCHSCREEN_EETI=m CONFIG_TOUCHSCREEN_EGALAX=m CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m CONFIG_TOUCHSCREEN_EXC3000=m -CONFIG_TOUCHSCREEN_FTS=y CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_GSL3673=y @@ -1115,7 +1120,6 @@ CONFIG_GS_DA223=m CONFIG_GS_DA228E=m CONFIG_ICM2060X_ACC=m CONFIG_COMPASS_DEVICE=m -CONFIG_COMPASS_AK8975=m CONFIG_COMPASS_AK8963=m CONFIG_COMPASS_AK09911=m CONFIG_COMPASS_AK09918=m @@ -2699,8 +2703,10 @@ CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=y CONFIG_DLM=m CONFIG_UNICODE=y +CONFIG_PERSISTENT_KEYRINGS=y CONFIG_TRUSTED_KEYS=m -CONFIG_ENCRYPTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=y +CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_SELINUX=y diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf index 793436c35907..46cf5060f248 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-rkr5.1' + KERNELBRANCH='branch:rk-6.1-rkr6.1' KERNELPATCHDIR='rk35xx-vendor-6.1' ;; esac diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf index 589a7446768a..71013767a91d 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-rkr5.1' + KERNELBRANCH='branch:rk-6.1-rkr6.1' KERNELPATCHDIR='rk35xx-vendor-6.1' LINUXFAMILY=rk35xx ;;