summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2017-12-07 11:31:01 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2017-12-18 10:07:13 -0200
commit68c390aa58cec61f65919b3e0d25e3d65bc2b50f (patch)
tree25a1f0643f877ae620d445ec23289ae414db1135 /conf
parente1d249bb067aa6c472367cff1e77ba2ddbc8303f (diff)
downloadmeta-freescale-68c390aa58cec61f65919b3e0d25e3d65bc2b50f.tar.gz
weston: Switch to 2.0 with i.MX fork
EGL support was removed from the fbdev compositor in Weston 2.0. Add it back via an i.MX fork. This has been verified with imx-gpu-viv v6 only. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> 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, 2 insertions, 4 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index f5df54e6..a19106b3 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -218,6 +218,8 @@ PREFERRED_PROVIDER_virtual/libg2d_mx6ul = ""
218PREFERRED_PROVIDER_virtual/libg2d_mx6ull = "" 218PREFERRED_PROVIDER_virtual/libg2d_mx6ull = ""
219PREFERRED_PROVIDER_virtual/libg2d_mx7ulp ?= "imx-gpu-viv" 219PREFERRED_PROVIDER_virtual/libg2d_mx7ulp ?= "imx-gpu-viv"
220 220
221PREFERRED_VERSION_weston_imxgpu2d = "2.0.0"
222
221# Handle default kernel 223# Handle default kernel
222IMX_DEFAULT_KERNEL = "linux-imx" 224IMX_DEFAULT_KERNEL = "linux-imx"
223IMX_DEFAULT_KERNEL_mxs = "linux-fslc" 225IMX_DEFAULT_KERNEL_mxs = "linux-fslc"
@@ -263,9 +265,5 @@ KERNEL_IMAGETYPE = "zImage"
263 265
264MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" 266MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
265 267
266# Use weston 1.11.1 for mx6 and mx7 machines
267PREFERRED_VERSION_weston_mx6 = "1.11.1"
268PREFERRED_VERSION_weston_mx7 = "1.11.1"
269
270# Add the ability to specify _imx machines 268# Add the ability to specify _imx machines
271MACHINEOVERRIDES =. "imx:" 269MACHINEOVERRIDES =. "imx:"