diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
index b2942a8..c3f12f6 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
@@ -1,2 +1,9 @@
 PACKAGECONFIG_zynqmp += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
                          egl glesv2"
+
+# OpenGL comes from libmali on ev/eg
+DEPENDS_append_zynqmpev = " libmali-xlnx"
+DEPENDS_append_zynqmpeg = " libmali-xlnx"
+
+PACKAGE_ARCH_zynqmpev = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH_zynqmpeg = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
index 8a1451e..5c45b2b 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
@@ -12,7 +12,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 REPO ?= "git://github.com/Xilinx/mali-userspace-binaries.git;protocol=https"
-BRANCH ?= "rel-v2020.1"
+BRANCH ?= "rel-v2020.2"
 SRCREV ?= "da73805e3e011382c4d014ac10037cd193aaa9a0"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 
@@ -30,7 +30,7 @@
 COMPATIBLE_MACHINE_zynqmpeg = "zynqmpeg"
 COMPATIBLE_MACHINE_zynqmpev = "zynqmpev"
 
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+PACKAGE_ARCH = "${SOC_VARIANT_ARCH}"
 
 
 S = "${WORKDIR}/git"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend
new file mode 100644
index 0000000..febf163
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -0,0 +1,9 @@
+# OpenGL comes from libmali on ev/eg, when egl is enabled
+DEPENDS_MALI_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', 'libmali-xlnx', '', d)}"
+PKG_ARCH_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}"
+
+DEPENDS_append_zynqmpev = " ${DEPENDS_MALI_XLNX}"
+DEPENDS_append_zynqmpeg = " ${DEPENDS_MALI_XLNX}"
+
+PACKAGE_ARCH_zynqmpev = "${PKG_ARCH_XLNX}"
+PACKAGE_ARCH_zynqmpeg = "${PKG_ARCH_XLNX}"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
new file mode 100644
index 0000000..febf163
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
@@ -0,0 +1,9 @@
+# OpenGL comes from libmali on ev/eg, when egl is enabled
+DEPENDS_MALI_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', 'libmali-xlnx', '', d)}"
+PKG_ARCH_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}"
+
+DEPENDS_append_zynqmpev = " ${DEPENDS_MALI_XLNX}"
+DEPENDS_append_zynqmpeg = " ${DEPENDS_MALI_XLNX}"
+
+PACKAGE_ARCH_zynqmpev = "${PKG_ARCH_XLNX}"
+PACKAGE_ARCH_zynqmpeg = "${PKG_ARCH_XLNX}"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/weston.ini b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/weston.ini
index 783a9c6..2ff8179 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/weston.ini
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/weston.ini
@@ -2,3 +2,5 @@
 idle-time=0
 
 gbm-format=rgb565
+
+require-input=false