2 files changed, 13 insertions, 2 deletions

diff --git a/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend
index 989577d44..221a3c08f 100644
--- a/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -2,3 +2,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append_mx6 = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch"
 
+PACKAGECONFIG_remove_mx6sl = "gles1 gles2"
diff --git a/meta-fsl-arm/recipes-graphics/mesa/mesa_%.bbappend b/meta-fsl-arm/recipes-graphics/mesa/mesa_%.bbappend
index 8e0a36b73..adcf20184 100644
--- a/meta-fsl-arm/recipes-graphics/mesa/mesa_%.bbappend
+++ b/meta-fsl-arm/recipes-graphics/mesa/mesa_%.bbappend
@@ -2,9 +2,19 @@ PACKAGECONFIG_remove_mx5 = "egl gles"
 PROVIDES_remove_mx5 = "virtual/libgles1 virtual/libgles2 virtual/egl"
 
 PACKAGECONFIG_remove_mx6 = "egl gles"
-PROVIDES_remove_mx6 = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
+
+# i.MX6SL uses mesa software rendering
+
+PROVIDES_remove_mx6 = "virtual/libgles1 virtual/libgles2 virtual/egl"
+PROVIDES_remove_mx6q = "virtual/libgl"
+PROVIDES_remove_mx6dl = "virtual/libgl"
+
+USE_VIV_LIBGL = "yes"
+USE_VIV_LIBGL_mx6sl = "no"
 
 # FIXME: Dirty hack to allow use of Vivante GPU libGL binary
 do_install_append_mx6 () {
-    rm -f ${D}${libdir}/libGL.*
+    if [ "${USE_VIV_LIBGL}" = "yes" ]; then
+        rm -f ${D}${libdir}/libGL.*
+    fi
 }