Merge pull request #1537 from thochstein/xwayland

weston upgrade, xwayland compatibility update

1 files changed, 6 insertions, 1 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 6ba779cc8..cd6a077a3 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -515,7 +515,10 @@ PREFERRED_PROVIDER_opencl-headers:imxgpu     ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_opencl-icd-loader:imxgpu  ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv"
 
-PREFERRED_VERSION_weston:imx-nxp-bsp      ??= "10.0.1.imx"
+PREFERRED_VERSION_weston:imx-nxp-bsp      ??= "11.0.1.imx"
+# i.MX 6 & 7 stay on weston 10.0 for fbdev
+PREFERRED_VERSION_weston:mx6-nxp-bsp      ??= "10.0.3.imx"
+PREFERRED_VERSION_weston:mx7-nxp-bsp      ??= "10.0.3.imx"
 PREFERRED_VERSION_weston:imx-mainline-bsp   = ""
 
 PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp  ??= "1.31.imx"
@@ -523,6 +526,8 @@ PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp  ??= "1.31.imx"
 PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp  ??= "1.31.imx"
 PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp  ??= "1.31.imx"
 
+PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx"
+
 # Use i.MX libdrm Version
 PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.114.imx"
 PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.114.imx"