18 files changed, 98 insertions, 108 deletions

diff --git a/recipes-bsp/atf/qoriq-atf-2.6.inc b/recipes-bsp/atf/qoriq-atf-2.12.inc
index 7a752ee93..a025401e0 100644
--- a/recipes-bsp/atf/qoriq-atf-2.6.inc
+++ b/recipes-bsp/atf/qoriq-atf-2.12.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "ARM Trusted Firmware"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 
-ATF_BRANCH ?= "lf_v2.6"
+ATF_BRANCH ?= "lf_v2.12"
 ATF_SRC ?= "git://github.com/nxp-qoriq/atf.git;protocol=https"
 SRC_URI = "${ATF_SRC};branch=${ATF_BRANCH}"
-SRCREV = "616a4588f333522d50a55bedd2b9a90a51474a75"
+SRCREV = "6ddd57019494cabfca5065368349109c37f2cc9f"
diff --git a/recipes-bsp/atf/qoriq-atf-tools_2.6.bb b/recipes-bsp/atf/qoriq-atf-tools_2.12.bb
index 2c1db306c..2c1db306c 100644
--- a/recipes-bsp/atf/qoriq-atf-tools_2.6.bb
+++ b/recipes-bsp/atf/qoriq-atf-tools_2.12.bb
diff --git a/recipes-bsp/atf/qoriq-atf_2.6.bb b/recipes-bsp/atf/qoriq-atf_2.12.bb
index 9f2b0e47a..e7e669fa1 100644
--- a/recipes-bsp/atf/qoriq-atf_2.6.bb
+++ b/recipes-bsp/atf/qoriq-atf_2.12.bb
@@ -9,7 +9,6 @@ PV:append = "+${SRCPV}"
 
 SRC_URI += "git://github.com/ARMmbed/mbedtls;protocol=https;nobranch=1;destsuffix=git/mbedtls;name=mbedtls \
     git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=git/ddr-phy-binary;name=ddr \
-    file://tf-a-tests-no-warn-rwx-segments.patch \
 "
 SRCREV_mbedtls = "0795874acdf887290b2571b193cafd3c4041a708"
 SRCREV_ddr = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb
index 9e9f8d409..2d09bbcc8 100644
--- a/recipes-bsp/mc-utils/mc-utils_git.bb
+++ b/recipes-bsp/mc-utils/mc-utils_git.bb
@@ -8,7 +8,7 @@ DEPENDS += "dtc-native"
 inherit deploy
 
 SRC_URI = "git://github.com/nxp-qoriq/mc-utils;protocol=https;nobranch=1"
-SRCREV = "5ccc2688b72c4a05119a393cbe3573b5f81d10bc"
+SRCREV = "f5c4b2c9d2b1d5122a7d97f236894f87959b3831"
 
 MC_CFG ?= ""
 MC_CFG:ls1088a = "ls1088a"
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index b73dd9753..6a52861b0 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -8,7 +8,7 @@ DEPENDS += "tcl-native"
 inherit deploy siteinfo
 
 SRC_URI = "git://github.com/nxp-qoriq/rcw;protocol=https;nobranch=1"
-SRCREV = "64abe70cf0abab053c37db460c12e367e6adf7a4"
+SRCREV = "45e69253690452656a4dfe933c4c9f55e1eb0f5f"
 
 export PYTHON = "${USRBINPATH}/python3"
 
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
index c765cd2d7..7fb10ad3b 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
@@ -10,19 +10,23 @@ LIC_FILES_CHKSUM = " \
     file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
     file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
-    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://Licenses/lgpl-2.0.txt;md5=4cf66a4984120007c9881cc871cf49db \
     file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
 "
 
-SRC_URI = "git://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1"
-SRCREV = "1c0116f3da250c5a52858c53efb8b38c0963f477"
+PV:append = "+${SRCPV}"
 
-B = "${WORKDIR}/build"
+UBOOT_BRANCH ?= "lf_v2025.04"
+UBOOT_SRC ?= "git://github.com/nxp-qoriq/u-boot.git;protocol=https"
+SRC_URI = "${UBOOT_SRC};branch=${UBOOT_BRANCH}"
+SRCREV = "9383f8387dc76524524da69992db96c22195a57c"
+
+B = "${UNPACKDIR}/build"
 PV:append = "+fslgit"
 LOCALVERSION = "+fsl"
 
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python3-native python3-setuptools-native"
+DEPENDS = "libgcc virtual/cross-cc bison-native bc-native gnutls-native swig-native python3-native"
 DEPENDS:append:qoriq-arm64 = " dtc-native"
 DEPENDS:append:qoriq-arm = " dtc-native"
 DEPENDS:append:qoriq-ppc = " boot-format-native"
@@ -39,7 +43,7 @@ python () {
             raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
         sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib32-linux'
         sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR')
+        workdir = d.getVar('UNPACKDIR')
         d.setVar('DEPENDS:append', ' lib32-gcc-cross-powerpc lib32-libgcc')
         d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib)
         d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib32-recipe-sysroot')
@@ -49,7 +53,7 @@ python () {
             raise bb.parse.SkipRecipe("Building the u-boot for this arch requires multilib to be enabled")
         sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
         sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR')
+        workdir = d.getVar('UNPACKDIR')
         d.setVar('DEPENDS:append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
         d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
         d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
@@ -79,8 +83,6 @@ do_compile:append:qoriq() {
                         boot_format ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
                             ${config}/u-boot-${type}.${UBOOT_SUFFIX} -spi ${config}/u-boot.format.bin
                         cp ${config}/u-boot.format.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX}
-                    elif [ "qspi" = "${type}" ];then
-                        cp ${config}/${binary} ${config}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
                     fi
                 fi
             done
@@ -91,6 +93,46 @@ do_compile:append:qoriq() {
     unset i
 }
 
+do_deploy:append:lx2162a () {
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]
+                then
+                    if [ "tfa-verified-boot" = "${type}" ];then
+                        install -m 644 ${B}/${config}/u-boot.dtb ${DEPLOYDIR}/u-boot.dtb
+                    fi
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    fi
+}
+
+do_deploy:append:ls102xa () {
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]
+                then
+                    if expr "$type" : sdcard;then
+                        install -m 644 ${B}/${config}/u-boot-dtb.bin ${DEPLOYDIR}/u-boot-dtb.${UBOOT_SUFFIX}-${type}
+                        install -m 644 ${B}/${config}/spl/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl.${UBOOT_SUFFIX}-${type}
+                    fi
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    fi
+}
 
 PACKAGES += "${PN}-images"
 FILES:${PN}-images += "/boot"
diff --git a/recipes-core/udev/udev-rules-qoriq/73-fsl-dpaa-persistent-networking.rules b/recipes-core/udev/udev-rules-qoriq/73-fsl-dpaa-persistent-networking.rules
index a96b9458e..c9a6d70bb 100644
--- a/recipes-core/udev/udev-rules-qoriq/73-fsl-dpaa-persistent-networking.rules
+++ b/recipes-core/udev/udev-rules-qoriq/73-fsl-dpaa-persistent-networking.rules
@@ -9,3 +9,12 @@ SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="1af0000", NAME="fm1-m
 
 # Rename macless0 to "macless0"
 SUBSYSTEM=="net", ATTR{device_type}=="macless0", NAME="macless0"
+
+# Rules for handling the Upstream DPAA ethernet ports
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae0000*", NAME="fm1-mac1"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae2000*", NAME="fm1-mac2"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae4000*", NAME="fm1-mac3"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae6000*", NAME="fm1-mac4"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae8000*", NAME="fm1-mac5"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1aea000*", NAME="fm1-mac6"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1af0000*", NAME="fm1-mac9"
diff --git a/recipes-core/udev/udev-rules-qoriq/74-ls1046a-xfi2-networking.rules b/recipes-core/udev/udev-rules-qoriq/74-ls1046a-xfi2-networking.rules
index 42931d475..79a10250a 100644
--- a/recipes-core/udev/udev-rules-qoriq/74-ls1046a-xfi2-networking.rules
+++ b/recipes-core/udev/udev-rules-qoriq/74-ls1046a-xfi2-networking.rules
@@ -1 +1,5 @@
+# Rules for handling the SDK DPAA ethernet ports
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="1af2000", NAME="fm1-mac10"
+
+# Rules for handling the Upstream DPAA ethernet ports
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1af2000*", NAME="fm1-mac10"
diff --git a/recipes-devtools/qemu/qemu-qoriq_4.2.bb b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
index 20ba6b535..cb415d66b 100644
--- a/recipes-devtools/qemu/qemu-qoriq_4.2.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
@@ -15,7 +15,7 @@ SRC_URI = "gitsm://github.com/nxp-qoriq/qemu;protocol=https;nobranch=1 \
            file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \
            "
 
-SRCREV = "14fda5a42df6c72e890d6a97ff88c5852172604b"
+SRCREV = "a46ddbbe661677dcfa342f00ab7ab71e5f6f1a09"
 
 python() {
     d.appendVar('PROVIDES', ' ' + d.getVar('BPN').replace('-qoriq', ''))
diff --git a/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch b/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch
deleted file mode 100644
index d25675aae..000000000
--- a/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 81ec65e72f357fb2c395e40c5195434bbaddf7f7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 16 May 2020 08:21:52 -0700
-Subject: [PATCH] tools: Mark struct input_field file_field extern
-
-This struct is already defined in common/parse_utils.c
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tools/header_generation/create_hdr_common.c | 2 +-
- tools/pbi_creation/create_pbi_common.c      | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/header_generation/create_hdr_common.c b/tools/header_generation/create_hdr_common.c
-index bfa90a3..edf632c 100644
---- a/tools/header_generation/create_hdr_common.c
-+++ b/tools/header_generation/create_hdr_common.c
-@@ -39,7 +39,7 @@
- #include <crypto_utils.h>
- 
- extern struct g_data_t gd;
--struct input_field file_field;
-+extern struct input_field file_field;
- 
- extern char line_data[];
- static struct option long_options[] = {
-diff --git a/tools/pbi_creation/create_pbi_common.c b/tools/pbi_creation/create_pbi_common.c
-index ff2ed84..bd976da 100644
---- a/tools/pbi_creation/create_pbi_common.c
-+++ b/tools/pbi_creation/create_pbi_common.c
-@@ -57,7 +57,7 @@ static char *parse_list[] = {
- 
- extern struct g_data_t gd;
- extern char line_data[];
--struct input_field file_field;
-+extern struct input_field file_field;
- 
- #define NUM_PARSE_LIST (sizeof(parse_list) / sizeof(char *))
- 
--- 
-2.26.2
-
diff --git a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
index 95bf4eb64..eb01f5427 100644
--- a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
+++ b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
@@ -16,10 +16,8 @@ inherit kernel-arch
 #SECURE_PRI_KEY = "/path/srk.pri"
 #SECURE_PUB_KEY = "/path/srk.pub"
 
-SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1 \
-           file://0001-tools-Mark-struct-input_field-file_field-extern.patch \
-"
-SRCREV = "e96dead3c339f6addb1600249be67e1884cdbcc5"
+SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1"
+SRCREV = "892d2ed3207d78a3cb5533eeb91bcc73967e3e36"
 
 EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}"'
 CFLAGS:append = ' -Wno-deprecated-declarations'
@@ -39,3 +37,5 @@ do_install () {
 
 FILES:${PN}-dbg += "${bindir}/cst/.debug"
 BBCLASSEXTEND = "native nativesdk"
+INSANE_SKIP:${PN}-dbg += " buildpaths"
+
diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb
index 02790d47b..2276ac3c6 100644
--- a/recipes-dpaa/fmlib/fmlib_git.bb
+++ b/recipes-dpaa/fmlib/fmlib_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9c7bd5e45d066db084bdb3543d55b1ac"
 PR = "r1"
 
 SRC_URI = "git://github.com/nxp-qoriq/fmlib;protocol=https;nobranch=1"
-SRCREV = "9fb916f255214013aa6003496c47bab0b5add2d9"
+SRCREV = "7a58ecaf0d90d71d6b78d3ac7998282a472c4394"
 
 CFLAGS += "-fmacro-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1 \
                 -fdebug-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1"
diff --git a/recipes-dpaa2/restool/files/disable-manpage-generation.patch b/recipes-dpaa2/restool/files/disable-manpage-generation.patch
deleted file mode 100644
index 34f2ae2d0..000000000
--- a/recipes-dpaa2/restool/files/disable-manpage-generation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5392152e704ff001c41de03445d668227237a87e Mon Sep 17 00:00:00 2001
-From: Ting Liu <ting.liu@nxp.com>
-Date: Fri, 15 Oct 2021 09:36:04 +0530
-Subject: [PATCH] disable manpage generation
-
-Upstream-Status: Inappropriate [Cross-compile specific]
-Signed-off-by: Ting Liu <ting.liu@nxp.com>
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index ee669ae..ab6e499 100644
---- a/Makefile
-+++ b/Makefile
-@@ -60,7 +60,6 @@ install: restool scripts/ls-main scripts/ls-append-dpl scripts/ls-debug scripts/
-        install -D -m 755 scripts/ls-debug $(DESTDIR)$(bindir)/ls-debug
-        $(foreach symlink, $(RESTOOL_SCRIPT_SYMLINKS), sh -c "cd $(DESTDIR)$(bindir) && ln -sf ls-main $(symlink)" ;)
-        install -D -m 755 scripts/restool_completion.sh $(DESTDIR)$(bindir_completion)/restool
--       install -m 0644 -D $(MANPAGE) $(call get_manpage_destination,$(MANPAGE))
- 
- clean:
-        rm -f $(OBJ) $(MANPAGE) \
--- 
-2.25.1
-
diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb
index 0ea40ec69..596625ece 100644
--- a/recipes-dpaa2/restool/restool_git.bb
+++ b/recipes-dpaa2/restool/restool_git.bb
@@ -2,10 +2,8 @@ SUMMARY = "DPAA2 Resource Manager Tool"
 LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=83af78c71766dd5fb1c1c3dd64a75ee7"
 
-SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \
-    file://disable-manpage-generation.patch \
-"
-SRCREV = "8c45e04363bf2a984a87b24d1dac80a286dd40d8"
+SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1"
+SRCREV = "8f73f2600111440d034227966d6ff03ec47d8f1a"
 
 inherit bash-completion
 
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
diff --git a/recipes-security/smw/keyctl-caam_git.bb b/recipes-security/smw/keyctl-caam_git.bb
index 66ff7ecb0..f147e1148 100644
--- a/recipes-security/smw/keyctl-caam_git.bb
+++ b/recipes-security/smw/keyctl-caam_git.bb
@@ -17,5 +17,5 @@ do_install () {
         oe_runmake DESTDIR=${D} install
 }
 
-COMPATIBLE_MACHINE = "(imx-generic-bsp)"
+COMPATIBLE_MACHINE = "(imx-generic-bsp|qoriq)"