1 files changed, 11 insertions, 9 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 548394d17..14912e1b9 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -147,11 +147,13 @@ PACKAGE_FP_TYPE = "hardfp"
 HAS_GBM     = "false"
 HAS_GBM:mx8 = "true"
 
-GLES3_HEADER_REMOVALS        = "gl31.h gl32.h"
-GLES3_HEADER_REMOVALS:mx8m   = "gl32.h"
-GLES3_HEADER_REMOVALS:mx8mm  = "gl31.h gl32.h"
-GLES3_HEADER_REMOVALS:mx8qxp = ""
-GLES3_HEADER_REMOVALS:mx8qm  = ""
+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"
@@ -169,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
@@ -236,10 +242,6 @@ do_install () {
         ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so
     fi
 
-    for header in ${GLES3_HEADER_REMOVALS}; do
-        rm -f ${D}${includedir}/GLES3/${header}
-    done
-
     # FIXME: MX6SL does not have 3D support; hack it for now
     if [ "${IS_MX6SL}" = "1" ]; then
         rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \