2 files changed, 7 insertions, 17 deletions

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 09de1ba0a..8c89a33aa 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -22,17 +22,11 @@ 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 "
+KBUILD_DEFCONFIG = "${KERNEL_DEFCONFIG}"
+EXTRA_KBUILD_DEFCONFIG:qoriq-arm64 = "lsdk.config"
+EXTRA_KBUILD_DEFCONFIG:qoriq-arm   = "multi_v7_lpae.config lsdk.config"
 
-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() {
+do_configure() {
     # create config with make config
     oe_runmake  -C ${S} O=${B} ${KERNEL_DEFCONFIG}
 
@@ -41,9 +35,7 @@ do_merge_delta_config() {
         echo "CONFIG_CPU_BIG_ENDIAN=y" >> .config
         echo "CONFIG_MTD_CFI_BE_BYTE_SWAP=y" >> .config
     fi
-
-    # add config fragments
-    for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
+    for deltacfg in ${EXTRA_KBUILD_DEFCONFIG}; do
         if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then
             oe_runmake  -C ${S} O=${B} ${deltacfg}
         elif [ -f "${S}/${deltacfg}" ]; then
@@ -55,8 +47,6 @@ do_merge_delta_config() {
     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_6.12.bb b/recipes-kernel/linux/linux-qoriq_6.12.bb
index b43fe7d53..aa7561e3e 100644
--- a/recipes-kernel/linux/linux-qoriq_6.12.bb
+++ b/recipes-kernel/linux/linux-qoriq_6.12.bb
@@ -1,9 +1,9 @@
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION = "6.12.20"
+LINUX_VERSION = "6.12.49"
 
 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"
+SRCREV = "df24f9428e38740256a410b983003a478e72a7c0"
 
 require linux-qoriq.inc