From cdaf8b98981e9d4e7978c6b11a5e44af1f9fab77 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Wed, 4 May 2022 17:32:19 -0500
Subject: [PATCH] tensorflow-lite: Rework OpenVX dependency [YOCIMX-6234]

Align the OpenVX dependency logic with similar logic in deepview-rt,
using a simpler RDEPENDS instead of PACKAGECONFIG.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 .../tensorflow-lite/tensorflow-lite_2.8.0.bb    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/meta-ml/recipes-libraries/tensorflow-lite/tensorflow-lite_2.8.0.bb b/meta-ml/recipes-libraries/tensorflow-lite/tensorflow-lite_2.8.0.bb
index 2a29425b15..639506a923 100644
--- a/meta-ml/recipes-libraries/tensorflow-lite/tensorflow-lite_2.8.0.bb
+++ b/meta-ml/recipes-libraries/tensorflow-lite/tensorflow-lite_2.8.0.bb
@@ -17,15 +17,6 @@ S = "${WORKDIR}/git"
 
 inherit python3native cmake
 
-PACKAGECONFIG_OPENVX = ""
-PACKAGECONFIG_OPENVX:mx8-nxp-bsp:imxgpu3d = "openvx"
-PACKAGECONFIG_OPENVX:mx8mm-nxp-bsp = ""
-PACKAGECONFIG_OPENVX:mx8ulp-nxp-bsp = ""
-
-PACKAGECONFIG ?= "${PACKAGECONFIG_OPENVX}"
-
-PACKAGECONFIG[openvx] = ",,,libnn-imx nn-imx"
-
 EXTRA_OECMAKE = " \
     -DCMAKE_SYSROOT=${PKG_CONFIG_SYSROOT_DIR} \
     -DFETCHCONTENT_FULLY_DISCONNECTED=OFF \
@@ -107,7 +98,15 @@ RDEPENDS:${PN}   = " \
     flatbuffers \
     python3 \
     python3-numpy \
+    ${RDEPENDS_OPENVX} \
 "
+RDEPENDS_OPENVX                    = ""
+RDEPENDS_OPENVX:mx8-nxp-bsp:imxgpu = "libnn-imx nn-imx"
+RDEPENDS_OPENVX:mx8mm-nxp-bsp      = ""
+# The tensorflow-lite implementation for 8ULP uses CPU, and so doesn't
+# support OpenVX
+RDEPENDS_OPENVX:mx8ulp-nxp-bsp     = ""
+
 # TensorFlow and TensorFlow Lite both exports few files, suppress the error
 # SSTATE_ALLOW_OVERLAP_FILES = "${D}${includedir}"
 SSTATE_ALLOW_OVERLAP_FILES = "/"