From a4f58dbdddef66c9289261a8d527bc0f717b3d74 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Sun, 31 Oct 2021 09:22:53 -0500
Subject: imx-gpu-viv: Install SOC-specific binaries

The archive now contains SOC-specific binaries.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 3e1403807107397d8c07508835e9efdde4ff537f)
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 325d36d7..14912e1b 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -147,6 +147,13 @@ PACKAGE_FP_TYPE = "hardfp"
 HAS_GBM     = "false"
 HAS_GBM:mx8 = "true"
 
+IMX_SOC        = "IMX_SOC_NOT_SET"
+IMX_SOC:mx8qm  = "mx8qm"
+IMX_SOC:mx8mp  = "mx8mp"
+IMX_SOC:mx8mq  = "mx8mq"
+IMX_SOC:mx8qxp = "mx8qxp"
+IMX_SOC:mx8mn  = "mx8mn"
+IMX_SOC:mx8ulp = "mx8ulp"
 
 LIBVULKAN_VERSION_MAJOR = "1"
 LIBVULKAN_VERSION = "${LIBVULKAN_VERSION_MAJOR}.1.6"
@@ -164,6 +171,10 @@ do_install () {
     # Use vulkan header from vulkan-headers recipe to support vkmark
     rm -rf ${D}${includedir}/vulkan/
 
+    if [ -d ${S}/gpu-core/usr/lib/${IMX_SOC} ]; then
+        cp -r ${S}/gpu-core/usr/lib/${IMX_SOC}/* ${D}${libdir}
+    fi
+
     install -d ${D}${libdir}/pkgconfig
     if ${HAS_GBM}; then
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc
-- 
cgit v1.2.3-54-g00ecf