From ee2789918d9d5c94a40dae727c5fe36d41160ff6 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Thu, 14 Dec 2023 21:29:09 +0100 Subject: [PATCH] rockchip: use point kernel version --- config/kernel/linux-rockchip-edge.config | 12 +++++++----- config/sources/families/rockchip.conf | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/config/kernel/linux-rockchip-edge.config b/config/kernel/linux-rockchip-edge.config index 565e39fd7e..29b434b9ea 100644 --- a/config/kernel/linux-rockchip-edge.config +++ b/config/kernel/linux-rockchip-edge.config @@ -1,21 +1,23 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.6.2 Kernel Configuration +# Linux/arm 6.6.7 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0" +CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=110400 +CONFIG_GCC_VERSION=110300 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=23800 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=23800 CONFIG_LLD_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=125 +CONFIG_PAHOLE_VERSION=122 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -2543,7 +2545,7 @@ CONFIG_RTLWIFI_USB=m # CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m CONFIG_RTL8XXXU=y -# CONFIG_RTL8XXXU_UNTESTED is not set +CONFIG_RTL8XXXU_UNTESTED=y CONFIG_RTW88=m # CONFIG_RTW88_8822BS is not set # CONFIG_RTW88_8822BU is not set diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf index ffdb66df62..0dadc41a92 100644 --- a/config/sources/families/rockchip.conf +++ b/config/sources/families/rockchip.conf @@ -28,14 +28,14 @@ case $BRANCH in current) declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. - KERNELBRANCH='branch:linux-6.1.y' + KERNELBRANCH='tag:v6.1.68' ;; edge) declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. - KERNELBRANCH='branch:linux-6.6.y' + KERNELBRANCH='tag:v6.6.7' ;; esac