diff --git a/meta-digi-dey/conf/layer.conf b/meta-digi-dey/conf/layer.conf
index 3fd8b6d7a..3da920142 100644
--- a/meta-digi-dey/conf/layer.conf
+++ b/meta-digi-dey/conf/layer.conf
@@ -15,6 +15,7 @@ BBFILE_PATTERN_digi-dey := "^${LAYERDIR}/"
 BBFILE_PRIORITY_digi-dey = "6"
 
 BBMASK += "meta-freescale/recipes-graphics/drm/libdrm_%.bbappend"
+BBMASK += "meta-freescale/recipes-graphics/wayland/weston-init.bbappend"
 
 LAYERDEPENDS_digi-dey  = "core digi-arm"
 LAYERDEPENDS_digi-dey += "openembedded-layer networking-layer webserver qt5-layer swupdate"
diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend
index abaa1ef2f..87c974938 100644
--- a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend
@@ -1,23 +1,31 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-REQUIRED_DISTRO_FEATURES_remove_mx6sl = "opengl"
+# OpenGL is not required for parts with GPU support for 2D but not 3D
+IMX_REQUIRED_DISTRO_FEATURES_REMOVE          = ""
+IMX_REQUIRED_DISTRO_FEATURES_REMOVE_imxgpu2d = "opengl"
+IMX_REQUIRED_DISTRO_FEATURES_REMOVE_imxgpu3d = ""
+REQUIRED_DISTRO_FEATURES_remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}"
 
-SRC_URI_append = " file://profile"
-SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd wayland x11', 'file://weston.config', '', d)}"
+SRC_URI_append_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd wayland x11', 'file://weston.config', '', d)}"
 
 HAS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
-HAS_XWAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland x11', 'true', 'false', d)}"
 
 do_install_append() {
-    install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh
     if ${HAS_SYSTEMD}; then
         sed -i \
             -e 's,/usr/bin,${bindir},g' \
             -e 's,/etc,${sysconfdir},g' \
             -e 's,/var,${localstatedir},g' \
             ${D}${systemd_system_unitdir}/weston.service
-        if ${HAS_XWAYLAND}; then
-            install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston
-        fi
+    fi
+    if [ -f ${WORKDIR}/weston.config ]; then
+        install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston
     fi
 }
+
+# Add profile support not accepted by upstream
+SRC_URI += "file://profile"
+
+do_install_append() {
+    install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh
+}
diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init/imxdrm/weston.config b/meta-digi-dey/recipes-graphics/wayland/weston-init/imxdrm/weston.config
deleted file mode 100644
index 7c92cf110..000000000
--- a/meta-digi-dey/recipes-graphics/wayland/weston-init/imxdrm/weston.config
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-OPTARGS="--xwayland"
diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init/mx6sl/weston.config b/meta-digi-dey/recipes-graphics/wayland/weston-init/mx6sl/weston.config
new file mode 100755
index 000000000..58749b289
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/wayland/weston-init/mx6sl/weston.config
@@ -0,0 +1,2 @@
+#!/bin/sh
+FB_MULTI_BUFFER=1
diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init/weston.config b/meta-digi-dey/recipes-graphics/wayland/weston-init/weston.config
deleted file mode 100644
index 7c92cf110..000000000
--- a/meta-digi-dey/recipes-graphics/wayland/weston-init/weston.config
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-OPTARGS="--xwayland"