1 files changed, 18 insertions, 5 deletions

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 474ddf359..4cbb7ba60 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -50,9 +50,14 @@ EXTRA_PROVIDES:append:imxgpu3d = " \
 EXTRA_PROVIDES:append:mx8-nxp-bsp = " \
     virtual/libgbm \
 "
+
 PROVIDES_OPENGLES3               = ""
 PROVIDES_OPENGLES3:mx8-nxp-bsp   = "virtual/libgles3"
 PROVIDES_OPENGLES3:mx8mm-nxp-bsp = ""
+
+# Note: OpenVX is fully supported on i.MX 8 QuadMax and 8 QuadPlus.
+# However, only limited support is provided on other i.MX 8 machines
+# as needed for i.MX machine learning packages.
 PROVIDES_OPENVX                  = ""
 PROVIDES_OPENVX:mx8-nxp-bsp      = "virtual/libopenvx"
 PROVIDES_OPENVX:mx8mm-nxp-bsp    = ""
@@ -96,14 +101,14 @@ PACKAGES_GBM:mx8-nxp-bsp      = "libgbm-imx libgbm-imx-dev"
 
 PACKAGES_OPENCL               = "libopencl-imx libopencl-imx-dev libclc-imx libclc-imx-dev"
 PACKAGES_OPENCL:mx7-nxp-bsp   = ""
-PACKAGES_OPENCL:mx8mm-nxp-bsp = ""
 
-PACKAGES_OPENVX               = ""
-PACKAGES_OPENVX:mx8qm-nxp-bsp = "libopenvx-imx libopenvx-imx-dev"
+PACKAGES_OPENVX = \
+    "${@bb.utils.contains("PROVIDES_OPENVX", "virtual/libopenvx", \
+        "libopenvx-imx libopenvx-imx-dev", "", d)}"
 
 PACKAGES_VULKAN               = ""
-PACKAGES_VULKAN:aarch64       = "libvulkan-imx libvulkan-imx-dev"
-PACKAGES_VULKAN:mx8mm-nxp-bsp = ""
+PACKAGES_VULKAN:imxvulkan     = "libvulkan-imx libvulkan-imx-dev"
+
 python __anonymous () {
         has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0')
         if has_vivante_kernel_driver_support != '1':
@@ -214,7 +219,9 @@ do_install () {
         # Framebuffer backend for i.MX 8 and beyond
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl.pc         ${D}${libdir}/pkgconfig/egl.pc
         cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir}
+        set -f
         for f in ${FILES:libvdk-imx} ${FILES:libvdk-imx-dev}; do
+            set +f
             rm -rf ${D}/$f
         done
         rm -rf \
@@ -228,7 +235,9 @@ do_install () {
     fi
 
     if [ -z "${PACKAGES_OPENCL}" ]; then
+        set -f
         for f in ${FILES:libopencl-imx} ${FILES:libopencl-imx-dev} ${FILES:libclc-imx} ${FILES:libclc-imx-dev}; do
+            set +f
             rm -rf ${D}$f
         done
         rm -rf ${D}/opt/viv_samples/cl11
@@ -239,7 +248,9 @@ do_install () {
     fi
 
     if [ -z "${PACKAGES_OPENVX}" ]; then
+        set -f
         for f in ${FILES:libopenvx-imx} ${FILES:libopenvx-imx-dev}; do
+            set +f
             rm -rf ${D}$f
         done
     fi
@@ -255,7 +266,9 @@ do_install () {
         ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR
         ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so
         if [ -z "${PACKAGES_VULKAN}" ]; then
+            set -f
             for f in ${FILES:libvulkan-imx} ${FILES:libvulkan-imx-dev}; do
+                set +f
                 rm -rf ${D}$f
             done
         fi