summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2017-05-15 18:06:47 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2017-05-19 07:57:43 -0300
commitfa9281613e2b3b669b06b085ffaf51d61e48a94b (patch)
treefe4d2433c28be2d2662e92e5f2f42f8a28026771 /conf
parent15d531bff1d30316c740a8fe85a024b1a69b8c5a (diff)
downloadmeta-freescale-fa9281613e2b3b669b06b085ffaf51d61e48a94b.tar.gz
weston: Use weston 1.11.1 for mx6 and mx7 machines
As EGL support was removed from weston on commit: https://github.com/wayland-project/weston/commit/e77f8ad79bdf3613dc7e587ea0cf5b9d39e4f8e0 we can't use version 2.0.0. Add latest version with EGL support, 1.11.1 and set mx6 and mx7 machines to use this version. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/imx-base.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 40689772..6f3b39c2 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -88,7 +88,7 @@ MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx"
88 88
89MACHINE_ARCH_FILTER = "virtual/kernel" 89MACHINE_ARCH_FILTER = "virtual/kernel"
90MACHINE_SOCARCH_FILTER_append_imxvpu = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser" 90MACHINE_SOCARCH_FILTER_append_imxvpu = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser"
91MACHINE_SOCARCH_FILTER_append_imxgpu2d = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango" 91MACHINE_SOCARCH_FILTER_append_imxgpu2d = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango weston"
92MACHINE_SOCARCH_FILTER_append_imxpxp = " imx-codec imx-parser" 92MACHINE_SOCARCH_FILTER_append_imxpxp = " imx-codec imx-parser"
93MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \ 93MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \
94 qtbase \ 94 qtbase \
@@ -215,5 +215,9 @@ KERNEL_IMAGETYPE = "zImage"
215 215
216MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" 216MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
217 217
218# Use weston 1.11.1 for mx6 and mx7 machines
219PREFERRED_VERSION_weston_mx6 = "1.11.1"
220PREFERRED_VERSION_weston_mx7 = "1.11.1"
221
218# Add the ability to specify _imx machines 222# Add the ability to specify _imx machines
219MACHINEOVERRIDES =. "imx:" 223MACHINEOVERRIDES =. "imx:"