From 0151cf31a1778667503b8d727a9313ed4bf0bee4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 2 Sep 2015 16:49:45 -0300 Subject: 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 --- recipes-graphics/mesa/mesa-demos_%.bbappend | 20 +++++--------------- recipes-graphics/mesa/mesa_%.bbappend | 21 +++++++-------------- 2 files changed, 12 insertions(+), 29 deletions(-) (limited to 'recipes-graphics/mesa') 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 () { -- cgit v1.2.3-54-g00ecf