Merge pull request #1312 from Freescale/backport-1310-to-kirkstone

[Backport kirkstone] Upgrade Multimedia Packages to lf5.15.52_2.1.0

3 files changed, 27 insertions, 19 deletions

diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb
deleted file mode 100644
index 078f6a61..00000000
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020-2021 NXP
-
-DESCRIPTION = "Kernel loadable module for ISP"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
-
-SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
-ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https"
-SRCBRANCH = "lf-5.15.y_2.0.0"
-SRCREV = "551415470092d6af1d7e11e7a78591f5800333f9"
-
-S = "${WORKDIR}/git/vvcam/v4l2"
-
-inherit module
-
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb
new file mode 100644
index 00000000..05431165
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb
@@ -0,0 +1,24 @@
+# Copyright 2020-2021 NXP
+
+DESCRIPTION = "Kernel loadable module for ISP"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
+
+SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
+ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
+SRCBRANCH = "lf-5.15.y_2.1.0"
+SRCREV = "b26ee8a5402afd7488716e06d82147669c05eb4a"
+
+S = "${WORKDIR}/git/vvcam/v4l2"
+DEBUG_PREFIX_MAP = "-fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fdebug-prefix-map=${STAGING_DIR_HOST}= \
+ -fmacro-prefix-map=${STAGING_DIR_HOST}= \
+ -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
+"
+
+inherit module
+
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb
index 00747f72..827dc94a 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb
@@ -2,10 +2,10 @@ SUMMARY = "NXP Wi-Fi driver for module 88w8997/8987"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=ab04ac0f249af12befccb94447c08b77"
 
-SRCBRANCH = "lf-5.10.72_2.2.0"
-MRVL_SRC ?= "git://source.codeaurora.org/external/imx/mwifiex.git;protocol=https"
+SRCBRANCH = "lf-5.15.52_2.1.0"
+MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
 SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}"
-SRCREV = "3c2a3c2cd25e9dce95f34c21bb4e728647eb64ee"
+SRCREV = "5cda905576fd26eca6b49d0f0fb5e2bb3c0bf441"
 
 S = "${WORKDIR}/git/mxm_wifiex/wlan_src"