From 0b77fc0694932dadcd3afda77e7109b6882fb5e9 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Mon, 26 Jul 2021 11:25:57 -0500
Subject: [PATCH] imx-vpu-hantro-daemon: Add Hantro V4L2 daemon

Add userspace daemon needed by Hantro VPU driver for V4L2.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 ...akefile-Honor-LDFLAGS-from-toolchain.patch | 33 +++++++++++++++++++
 .../imx-vpu-hantro-daemon_1.0.0.bb            | 32 ++++++++++++++++++
 .../imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb   |  2 ++
 3 files changed, 67 insertions(+)
 create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch
 create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb

diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch
new file mode 100644
index 00000000..dff2fb8f
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch
@@ -0,0 +1,33 @@
+From 94ae72948f1ed1a8bad1c13b4edc4b9189207e35 Mon Sep 17 00:00:00 2001
+From: Tom Hochstein <tom.hochstein@nxp.com>
+Date: Mon, 26 Jul 2021 09:06:26 -0500
+Subject: [PATCH] Makefile: Honor LDFLAGS from toolchain
+
+The LDFLAGS variable is standard from the toolchain and should be
+honored. Yocto detects the problem with a QA check:
+
+ERROR: imx-vpu-hantro-daemon-1.1.0-r0 do_package_qa: QA Issue: File /usr/bin/vsidaemon in package imx-vpu-hantro-daemon doesn't have GNU_HASH (didn't pass LDFLAGS?) [ldflags]
+
+Upstream-Status: Pending
+
+Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 9a775b0..e73ff47 100755
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@ OUT_FILE = vsidaemon
+ DEC = nxp_enc_hw
+ ENC = nxp_dec_hw
+ LIBFILES = 
+-LD_FLAGS = -lpthread -lm
++LD_FLAGS = $(LDFLAGS) -lpthread -lm
+ 
+ PLATFORM ?= IMX8MP
+ 
+-- 
+2.17.1
+
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb
new file mode 100644
index 00000000..88b9ee0e
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb
@@ -0,0 +1,32 @@
+# 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 \
+    file://0001-Makefile-Honor-LDFLAGS-from-toolchain.patch \
+"
+SRC_URI[md5sum] = "65417710ef22214523c37f50f34b6ab2"
+SRC_URI[sha256sum] = "897d174c4c0818f31012d8a60ed51fc83fdfc55fca2d2b0fc24a0db3e9f3b6e8"
+
+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/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb
index 6bac0e46..20ac87c7 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb
@@ -30,4 +30,6 @@ do_install () {
 
 FILES_${PN} += "/unit_tests"
 
+RDEPENDS_${PN} += "imx-vpu-hantro-daemon"
+
 COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
-- 
2.40.1