From 4df9da474940ca4b803d604cd30807e9340415e6 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Tue, 21 Dec 2021 13:14:39 +0100
Subject: [PATCH] hardknott: imx-vpu-hantro: sync with meta-imx
 hardknott-5.10.72-2.2.0 branch

Update to v1.24.0 and add new recipe for imx-vpu-hantro-daemon

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../imx-vpu-hantro-daemon_1.1.1.bb            | 31 +++++++++++++++++++
 .../imx-vpu-hantro/imx-vpu-hantro.inc         | 26 ++++++++--------
 .../imx-vpu-hantro/imx-vpu-hantro_1.21.0.bb   |  7 -----
 .../imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb   |  7 +++++
 4 files changed, 51 insertions(+), 20 deletions(-)
 create mode 100644 meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb
 delete mode 100644 meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.21.0.bb
 create mode 100644 meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb

diff --git a/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb b/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb
new file mode 100644
index 000000000..1dbd382f8
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb
@@ -0,0 +1,31 @@
+# Copyright 2021 NXP
+DESCRIPTION = "i.MX Hantro V4L2 Daemon"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1"
+
+DEPENDS = "imx-vpu-hantro"
+DEPENDS_append_mx8mp = " imx-vpu-hantro-vc"
+
+SRC_URI = " \
+    ${FSL_MIRROR}/${BP}.tar.gz \
+"
+SRC_URI[md5sum] = "99e96b2e00516d56a78a95a80851076b"
+SRC_URI[sha256sum] = "e7b3d55f72e233179b1b28c03628139b463d1994d140fed3c3e0796c66e917c8"
+
+PLATFORM_mx8mm = "IMX8MM"
+PLATFORM_mx8mq = "IMX8MQ"
+PLATFORM_mx8mp = "IMX8MP"
+
+EXTRA_OEMAKE = " \
+    CROSS_COMPILE="${HOST_PREFIX}" \
+    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
+    CTRLSW_HDRPATH="${STAGING_INCDIR}" \
+    PLATFORM="${PLATFORM}" \
+"
+
+do_install () {
+    oe_runmake install DEST_DIR="${D}"
+}
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
diff --git a/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro.inc b/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro.inc
index d46dd3f7a..61feb53d4 100644
--- a/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro.inc
+++ b/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro.inc
@@ -1,31 +1,31 @@
-# Copyright 2017-2018 NXP
-
-DESCRIPTION = "i.MX HANTRO VPU library"
+# Copyright 2017-2020 NXP
+DESCRIPTION = "i.MX Hantro VPU library"
 LICENSE = "Proprietary"
 
+PROVIDES = "virtual/imxvpu"
+
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+
 inherit fsl-eula-unpack use-imx-headers
 
 PARALLEL_MAKE="-j 1"
 
-PROVIDES = "virtual/imxvpu"
-RPROVIDES_${PN} = "virtual/imxvpu"
-
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-
 PLATFORM_mx8mm = "IMX8MM"
 PLATFORM_mx8mq = "IMX8MQ"
 PLATFORM_mx8mp = "IMX8MP"
 
-do_compile () {
-    oe_runmake CROSS_COMPILE="${HOST_PREFIX}" SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" PLATFORM="${PLATFORM}" all
-}
+EXTRA_OEMAKE = " \
+    CROSS_COMPILE="${HOST_PREFIX}" \
+    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
+    PLATFORM="${PLATFORM}" \
+"
 
 do_install () {
-    oe_runmake DEST_DIR="${D}" PLATFORM="${PLATFORM}" install
+    oe_runmake install DEST_DIR="${D}"
 }
 
 FILES_${PN} += "/unit_tests"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+RDEPENDS_${PN} += "imx-vpu-hantro-daemon"
 
 COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
diff --git a/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.21.0.bb b/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.21.0.bb
deleted file mode 100644
index c83236e47..000000000
--- a/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.21.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2017-2020 NXP
-
-require imx-vpu-hantro.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a"
-
-SRC_URI[md5sum] = "556744693135acdf6711a5e85bea3a4d"
-SRC_URI[sha256sum] = "419725f0c09f5939c88cd234b729c3943cbd37e53db7352b02c8d6cc05b939b9"
diff --git a/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb b/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb
new file mode 100644
index 000000000..0cd1c63c9
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb
@@ -0,0 +1,7 @@
+# Copyright 2017-2020 NXP
+
+require imx-vpu-hantro.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f"
+
+SRC_URI[md5sum] = "1f99c6941b8a51035b52cc5bc72faa3d"
+SRC_URI[sha256sum] = "aa9461a152e13a1caa852f29ae18fd33aebd90c8a2b49519003e632687fe89d6"