Upgrade NXP BSP to LF6.6.36_2.1.0

imx-g2d: Upgrade 2.1.14 -> 2.2.0

Signed-off-by: Valentin Jec <valentin.jec@nxp.com>
(cherry picked from commit 640880536da477a2c38e6522f4678a7b4b3819fb)

4 files changed, 12 insertions, 58 deletions

diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
index 23168ae1..5e8f5402 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION = "G2D library using i.MX DPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" 
 
 DEPENDS = "libdrm ${LIBGAL_IMX}"
 LIBGAL_IMX              = "libgal-imx"
@@ -15,15 +15,13 @@ PROVIDES += "virtual/libg2d"
 SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}"
 IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}"
 
-IMX_SRCREV_ABBREV = "6a00326"
+IMX_SRCREV_ABBREV = "7943590"
 IMX_SRC_URI_NAME = "v1"
-SRC_URI[v1.md5sum] = "470ad0bdef7dec171395991d47b39e2c"
-SRC_URI[v1.sha256sum] = "4d8e4b536bd24eedfbce375a06c19ab74603291b8b5a5be36b03fbf6e016e940"
+SRC_URI[v1.sha256sum] = "bf347f53e8f390a0554c0db76707819bb50cf4aaa564a9c86821ae9add26e113"
 
-IMX_SRCREV_ABBREV:mx95-nxp-bsp = "6a00326"
+IMX_SRCREV_ABBREV:mx95-nxp-bsp = "7943590"
 IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2"
-SRC_URI[v2.md5sum] = "cf807c38a110763c19a12d6d595b4b09"
-SRC_URI[v2.sha256sum] = "1b86d4fecd5026e871da0de8ed6382c962460468d8151ae2f95b72d00bca17ee"
+SRC_URI[v2.sha256sum] = "c0a87908cd04c208659423746a57eaee6a30b4d680ec871f3495ad4a2acb5076"
 
 S = "${WORKDIR}/${IMX_BIN_NAME}"
 
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index 0f0c1896..ab0819c6 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
 
 DEPENDS = "cairo"
 
-PV = "2.1+git${SRCPV}"
+PV = "2.2+git${SRCPV}"
 
 SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}"
 GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https"
-SRCBRANCH = "imx_2.1"
+SRCBRANCH = "imx_2.2"
 SRCREV = "431f311a41ca052902ea0d6445e74defe0a4df2d"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb
deleted file mode 100644
index d12d9c1a..00000000
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2024 NXP
-# Copyright 2018 (C) O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "G2D library using i.MX GPU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" 
-DEPENDS = "libgal-imx"
-PROVIDES = "virtual/libg2d"
-
-SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
-IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}"
-IMX_SRCREV_ABBREV = "bc7b6a2"
-SRC_URI[aarch64.md5sum] = "4b12d0434d612b57ff4d7df690c3154f"
-SRC_URI[aarch64.sha256sum] = "b2e4c580bf887042f479fde7c8b07c6215794d8123263d10ff0c167af7ba5918"
-SRC_URI[arm.md5sum] = "4bead15838f47793f59cb374c10c2dd2"
-SRC_URI[arm.sha256sum] = "413610ce4730eb9adbde30c8ad4a72df3edd69d84e1154a0c29efa7f33a30663"
-
-S = "${WORKDIR}/${IMX_BIN_NAME}"
-
-inherit fsl-eula-unpack
-
-SOC_INSTALL_DIR               = "SOC_INSTALL_DIR_NOT_SET"
-SOC_INSTALL_DIR:mx8mm-nxp-bsp = "mx8mm"
-
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-    cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
-    if [ -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR} ]; then
-        cp -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR}/*.so* ${D}${libdir}
-    fi
-    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
-}
-
-# The packaged binaries have been stripped of debug info, so disable
-# operations accordingly.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(imxgpu2d)"
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index 4481188b..88fc60ae 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -1,19 +1,19 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "G2D library using i.MX PXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837"
 
 PROVIDES += "virtual/libg2d"
 
-PV = "2.1.0+git${SRCPV}"
+PV = "2.2+git${SRCPV}"
 
 SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}"
 IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https"
-SRCBRANCH = "imx_2.1"
-SRCREV = "edd234c4e1c58cd2453963d19155d4d5d3800d07"
+SRCBRANCH = "imx_2.2"
+SRCREV = "5e633f895a84cec809ca98d77c879af3591b3b20"
 
 S = "${WORKDIR}/git"