Rework i.MX6 UltraLite support to not use other i.MX6 code

The i.MX6 UltraLite is very different from the other i.MX6 SoCs and
the current BSP infrastructure needs to be reworked to allow for more
granullar control of the features each SoC provide to control the
changes to be applied for the SoC peripherals support.

For now, it is not possible to express this clearly in the BSP so the
current change is to revert some of the changes done for the i.MX6
UltraLite to be enabled and make sure that the boards using the SoC
does not inherit the 'mx6' override.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

5 files changed, 16 insertions, 47 deletions

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 319d9f087..00423cbf0 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -9,7 +9,7 @@ include conf/machine/include/tune-cortexa7.inc
 
 MACHINE_FEATURES += " pci wifi bluetooth"
 
-SOC_FAMILY = "mx6:mx6ul"
+SOC_FAMILY = "mx6ul"
 
 KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb"
 
diff --git a/recipes-graphics/directfb/directfb_%.bbappend b/recipes-graphics/directfb/directfb_%.bbappend
index 20aa642ef..a95af5379 100644
--- a/recipes-graphics/directfb/directfb_%.bbappend
+++ b/recipes-graphics/directfb/directfb_%.bbappend
@@ -1,12 +1,3 @@
 # i.MX6 has DirectFB acceleration support, so add it
-RDEPENDS_${PN}_append_mx6q  = " libvivante-dfb-mx6"
-PACKAGE_ARCH_mx6q  = "${MACHINE_ARCH}"
-
-RDEPENDS_${PN}_append_mx6dl = " libvivante-dfb-mx6"
-PACKAGE_ARCH_mx6dl = "${MACHINE_ARCH}"
-
-RDEPENDS_${PN}_append_mx6sx = " libvivante-dfb-mx6"
-PACKAGE_ARCH_mx6sx = "${MACHINE_ARCH}"
-
-RDEPENDS_${PN}_append_mx6sl = " libvivante-dfb-mx6"
-PACKAGE_ARCH_mx6sl = "${MACHINE_ARCH}"
+RDEPENDS_${PN}_append_mx6 = " libvivante-dfb-mx6"
+PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index cc245b225..1f070a447 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -1,24 +1,14 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-MESA-DEMO-PATCH = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \
+SRC_URI_append_mx6 = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \
                     file://fix-clear-build-break.patch \
                     file://Additional-eglSwapBuffer-calling-makes-wrong-throttl.patch \
                     file://Add-OpenVG-demos-to-support-wayland.patch"
 
-# only apply patches on mx6 that have a GPU
-SRC_URI_append_mx6q  = " ${MESA-DEMO-PATCH}"
-SRC_URI_append_mx6dl = " ${MESA-DEMO-PATCH}"
-SRC_URI_append_mx6sx = " ${MESA-DEMO-PATCH}"
-SRC_URI_append_mx6sl = " ${MESA-DEMO-PATCH}"
-
-REMOVE_GLU = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-                 bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu', '', d), d)}"
-
-# only remove GLU on mx6 thave have a GPU
-PACKAGECONFIG_remove_mx6q = "${REMOVE_GLU}"
-PACKAGECONFIG_remove_mx6dl = "${REMOVE_GLU}"
-PACKAGECONFIG_remove_mx6sx = "${REMOVE_GLU}"
-PACKAGECONFIG_remove_mx6sl = "gles1 gles2 ${REMOVE_GLU}"
+PACKAGECONFIG_remove_mx6 = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
+         bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu', '', d), d)}"
+PACKAGECONFIG_remove_mx6sl = "gles1 gles2"
 
 PACKAGECONFIG_append = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 66913e17c..2536afd66 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,19 +1,12 @@
-PACKAGECONFIG_remove_mx6q  = "egl gles"
-PACKAGECONFIG_remove_mx6dl = "egl gles"
-PACKAGECONFIG_remove_mx6sx = "egl gles"
-PACKAGECONFIG_remove_mx6sl = "egl gles"
+PACKAGECONFIG_remove_mx6 = "egl gles"
 
-# i.MX6SL uses mesa software rendering
+PROVIDES_remove_mx6 = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl"
+PROVIDES_remove_mx6q = "virtual/libgl"
+PROVIDES_remove_mx6dl = "virtual/libgl"
+PROVIDES_remove_mx6sx = "virtual/libgl"
 
-PROVIDES_remove_mx6q = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl virtual/libgl"
-PROVIDES_remove_mx6dl = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl virtual/libgl"
-PROVIDES_remove_mx6sx = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl virtual/libgl"
-PROVIDES_remove_mx6sl = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl"
-
-USE_VIV_LIBGL = "no"
-USE_VIV_LIBGL_mx6q = "yes"
-USE_VIV_LIBGL_mx6dl = "yes"
-USE_VIV_LIBGL_mx6sx = "yes"
+USE_VIV_LIBGL = "yes"
+USE_VIV_LIBGL_mx6sl = "no"
 
 # FIXME: mesa should support 'x11-no-tls' option
 python () {
diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend
index a254f07f3..a7496daa7 100644
--- a/recipes-graphics/wayland/weston_%.bbappend
+++ b/recipes-graphics/wayland/weston_%.bbappend
@@ -1,11 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-# only install patch for mx6 with a GPU
-GPU_PATCH = "file://0001-MGS-840-Add-i.MX6-support-for-weston.patch"
-SRC_URI_append_mx6q  = " ${GPU_PATCH}"
-SRC_URI_append_mx6dl = " ${GPU_PATCH}"
-SRC_URI_append_mx6sx = " ${GPU_PATCH}"
-SRC_URI_append_mx6sl = " ${GPU_PATCH}"
+SRC_URI_append_mx6 = " file://0001-MGS-840-Add-i.MX6-support-for-weston.patch"
 
 PACKAGECONFIG_append_mx6q = " cairo-glesv2"
 PACKAGECONFIG_append_mx6dl = " cairo-glesv2"