From b8d2226d59bd69dd4ad7cc9fc874d0bd06943124 Mon Sep 17 00:00:00 2001 From: brooksytech <1673861+brooksytech@users.noreply.github.com> Date: Thu, 25 Jan 2024 01:28:57 +0000 Subject: [PATCH] RK3399 & RK3326: update kernel to 6.7.1 --- projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf | 2 +- projects/Rockchip/packages/linux/package.mk | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf index 1c9b82122..78c930679 100644 --- a/projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf @@ -464,7 +464,7 @@ CONFIG_AS_HAS_SHA3=y # CONFIG_ARM64_PTR_AUTH is not set CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y -CONFIG_AS_HAS_ARMV8_3=y +# CONFIG_AS_HAS_ARMV8_3 is not set CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y CONFIG_AS_HAS_LDAPR=y # end of ARMv8.3 architectural features diff --git a/projects/Rockchip/packages/linux/package.mk b/projects/Rockchip/packages/linux/package.mk index 786f35830..37bd339cf 100644 --- a/projects/Rockchip/packages/linux/package.mk +++ b/projects/Rockchip/packages/linux/package.mk @@ -36,11 +36,8 @@ case ${DEVICE} in PKG_GIT_CLONE_BRANCH="main" ;; RK3399|RK3326) -# PKG_VERSION="6.6.13" PKG_VERSION="6.7.1" -# PKG_VERSION="6.8-rc1" PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" -# PKG_URL="https://git.kernel.org/torvalds/t/linux-${PKG_VERSION}.tar.gz" ;; esac