From 1cf0dc9bc7051a1547e944299d4a338f831b2f04 Mon Sep 17 00:00:00 2001
From: Zelan Zou <zelan.zou@nxp.com>
Date: Fri, 29 Aug 2025 14:34:18 +0800
Subject: linux-qoriq: Upgrade to LF-6.12.20_2.0.0

Signed-off-by: Zelan Zou <zelan.zou@nxp.com>
---
 recipes-kernel/linux/linux-qoriq.inc     | 18 ++++++++++++------
 recipes-kernel/linux/linux-qoriq_5.10.bb |  8 --------
 recipes-kernel/linux/linux-qoriq_6.12.bb |  9 +++++++++
 3 files changed, 21 insertions(+), 14 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-qoriq_5.10.bb
 create mode 100644 recipes-kernel/linux/linux-qoriq_6.12.bb

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 7243a345c..09de1ba0a 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -1,13 +1,13 @@
 inherit kernel qoriq_build_64bit_kernel siteinfo
-inherit fsl-kernel-localversion
+inherit fsl-kernel-localversion kernel-yocto
 
 SUMMARY = "Linux Kernel for NXP QorIQ platforms"
 SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
 
-DEPENDS:append = " libgcc"
+DEPENDS:append = " libgcc coreutils-native"
 # not put Images into /boot of rootfs, install kernel-image if needed
-RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 KERNEL_CC:append = " ${TOOLCHAIN_OPTIONS}"
 KERNEL_LD:append = " ${TOOLCHAIN_OPTIONS}"
@@ -21,12 +21,16 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 
 SCMVERSION ?= "y"
 LOCALVERSION = ""
+
 DELTA_KERNEL_DEFCONFIG ?= ""
 DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm64 = "lsdk.config "
 DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm = "multi_v7_lpae.config lsdk.config "
 
-do_merge_delta_config[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot bison-native:do_populate_sysroot"
+do_merge_delta_config[depends] += "virtual/cross-cc:do_populate_sysroot bison-native:do_populate_sysroot"
 do_merge_delta_config[dirs] = "${B}"
+do_kernel_metadata[noexec] = "1"
+do_kernel_configme[noexec] = "1"
+do_kernel_configcheck[noexec] = "1"
 
 do_merge_delta_config() {
     # create config with make config
@@ -42,15 +46,17 @@ do_merge_delta_config() {
     for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
         if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then
             oe_runmake  -C ${S} O=${B} ${deltacfg}
-        elif [ -f "${UNPACKDIR}/${deltacfg}" ]; then
-            ${S}/scripts/kconfig/merge_config.sh -m .config ${UNPACKDIR}/${deltacfg}
+        elif [ -f "${S}/${deltacfg}" ]; then
+            ${S}/scripts/kconfig/merge_config.sh -m .config ${S}/${deltacfg}
         elif [ -f "${deltacfg}" ]; then
             ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
         fi
     done
     cp .config ${UNPACKDIR}/defconfig
 }
+
 addtask merge_delta_config before do_kernel_localversion after do_patch
 
 FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/zImage*"
+INSANE_SKIP:${PN}-src += " buildpaths"
 COMPATIBLE_MACHINE = "(qoriq)"
diff --git a/recipes-kernel/linux/linux-qoriq_5.10.bb b/recipes-kernel/linux/linux-qoriq_5.10.bb
deleted file mode 100644
index c62de58e7..000000000
--- a/recipes-kernel/linux/linux-qoriq_5.10.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-LINUX_VERSION = "5.10.52"
-
-SRC_URI = "git://github.com/nxp-qoriq/linux;protocol=https;nobranch=1"
-SRCREV = "a11753a89ec610768301d4070e10b8bd60fde8cd"
-
-require recipes-kernel/linux/linux-qoriq.inc
diff --git a/recipes-kernel/linux/linux-qoriq_6.12.bb b/recipes-kernel/linux/linux-qoriq_6.12.bb
new file mode 100644
index 000000000..b43fe7d53
--- /dev/null
+++ b/recipes-kernel/linux/linux-qoriq_6.12.bb
@@ -0,0 +1,9 @@
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+LINUX_VERSION = "6.12.20"
+
+LINUX_QORIQ_BRANCH ?= "lf-6.12.y"
+LINUX_QORIQ_SRC ?= "git://github.com/nxp-qoriq/linux.git;protocol=https"
+SRC_URI = "${LINUX_QORIQ_SRC};branch=${LINUX_QORIQ_BRANCH}"
+SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
+
+require linux-qoriq.inc
-- 
cgit v1.2.3-54-g00ecf