Merge pull request #1617 from junzhuimx/master

Upgrade i.MX 8MP ISP components to L6.1.22-2.0.0 release

3 files changed, 12 insertions, 10 deletions

diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb
index 9eaa11b8..ee839cd9 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb
@@ -1,15 +1,15 @@
-# Copyright 2020-2022 NXP
+# Copyright 2020-2023 NXP
 
 DESCRIPTION = "Basler camera binary drivers"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
+LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
 
 inherit fsl-eula-unpack
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "4e33adeb8a43f5bd06703368721085f5"
-SRC_URI[sha256sum] = "c44fc890902d9d8ef22186d56af035c9cac182817525e64575e3b79015383790"
+SRC_URI[md5sum] = "cb5e5a4d1efd1d845464ac9a8c6383b8"
+SRC_URI[sha256sum] = "6fe10f5118d18a7cb1dd40e713343ce788ad3766104ad2471ee49aed7b55833a"
 
 do_install() {
     # provided by the isp-imx package, do not install them here additionally
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb
index 4591965f..59a4c14d 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb
@@ -2,13 +2,13 @@
 
 DESCRIPTION = "i.MX Verisilicon Software ISP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
+LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
 DEPENDS = "boost libdrm virtual/libg2d libtinyxml2"
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "2f2fc2f6209a5efe7ef14cb6711b6292"
-SRC_URI[sha256sum] = "66340acdda4318b2031791f488a95b59541c98cd1e255abdc070a2d1e6e9494d"
+SRC_URI[md5sum] = "693e76b20985de607208c21d996019f8"
+SRC_URI[sha256sum] = "c2f450502390442926920d6457bbf24378c0338a445be180130ec6b1b12d1056"
 
 inherit fsl-eula-unpack cmake systemd use-imx-headers
 
@@ -30,6 +30,7 @@ EXTRA_OECMAKE += " \
     -DISP_VERSION=ISP8000NANO_V1802 \
     -DPLATFORM=ARM64 \
     -DAPPMODE=V4L2 \
+    -DTUNINGEXT=1 \
     -DQTLESS=1 \
     -DFULL_SRC_COMPILE=1 \
     -DWITH_DRM=1 \
@@ -52,6 +53,7 @@ do_install() {
     cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin
     cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin
     cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin
+    cp -r ${B}/generated/release/bin/tuningext ${D}/opt/imx8-isp/bin
     cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin
     cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin
 
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.21.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.22.0.bb
index 206018eb..34625658 100644
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.21.0.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.22.0.bb
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 NXP
+# Copyright 2020-2023 NXP
 
 DESCRIPTION = "Kernel loadable module for ISP"
 LICENSE = "GPL-2.0-only"
@@ -6,8 +6,8 @@ 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-6.1.y_1.0.0"
-SRCREV = "774808215a15e2acdc02967907c47515e3512f2d"
+SRCBRANCH = "lf-6.1.22_2.0.0"
+SRCREV = "dad0b927a26100ebcfbcb6ad09d64ecde767af7f"
 
 S = "${WORKDIR}/git/vvcam/v4l2"