Merge remote-tracking branch 'origin/rel-v2023.1' into langdale

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

34 files changed, 573 insertions, 149 deletions

diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 76b3cf1d..1b3e8123 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -19,7 +19,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 077bf0a2..941f0aba 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -19,7 +19,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
index 8eb6dea4..30818313 100644
--- a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk120-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
index 099cd956..dd2dc111 100644
--- a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk180-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 61b2bf2b..c434067d 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -20,7 +20,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index bf38eebe..710078eb 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu104-revc}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 6853edb0..23a936d8 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -20,7 +20,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu106-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 92e80460..5868449f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -20,7 +20,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu111-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 597c05a7..71c94038 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -12,7 +12,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1275-revb}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index 396eafe9..812a283f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1285-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index d7b2f340..273606e2 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu208-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index 5f5856e8..80a15358 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu216-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index fd826feb..c9cd2934 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -67,7 +67,7 @@ PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION',
 
 XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%"
 XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%"
-XILINX_LINUX_VERSION[v2023.1] = "6.1.5-xilinx-v2023.1%"
+XILINX_LINUX_VERSION[v2023.1] = "6.1.30-xilinx-v2023.1%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # Add support to eSDK for gen-machine-conf if it exists
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
index 01082966..72f43f71 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
@@ -1,8 +1,8 @@
 UBOOT_VERSION = "v2023.01"
 
-UBRANCH = "xlnx_rebase_v2023.01"
+UBRANCH = "xlnx_rebase_v2023.01_update"
 
-SRCREV = "40a08d69e749c0472103551c85c02c41f979453d"
+SRCREV = "1689570b68dd3827e527a520805aa0bb7f58ee09"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc
index 4d9a45c0..86ba4fc6 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc
@@ -7,7 +7,9 @@ UBOOT_BLOB_NAME ?= "${MACHINE}-fit-dtb${IMAGE_VERSION_SUFFIX}.blob"
 
 IMPORT_CC_DTBS ?= ""
 CC_DTBS_DUP ?= ""
+IMPORT_CC_UBOOT_DTBS ?= ""
 
+DEPENDS:append:eval-brd-sc-zynqmp = " uboot-device-tree"
 MKIMAGE_DTBLOB_OPTS ?= "-E -B 0x8"
 
 # Everything is swtiched on with UBOOT_IMAGE_BLOB = '1'
@@ -98,9 +100,24 @@ do_blob_generate () {
                 DTBO=$(echo $CC_DTB | cut -d: -f1)
         BASE_DTB=$(echo $CC_DTB | cut -d: -f2)
         OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3)
-        bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${B}/arch/arm/dts/${BASE_DTB} ${B}/arch/arm/dts/${DTBO}"
+        if [ "${SYSTEM_DTB_BLOB}" = "1" ]; then
+                BASE_SYS_DTB="${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME}"
+        else
+                BASE_SYS_DTB="${B}/arch/arm/dts/${BASE_DTB}"
+        fi
+        bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO}"
                 if [ -f ${B}/arch/arm/dts/${DTBO} ]; then
-        fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${B}/arch/arm/dts/${BASE_DTB} ${B}/arch/arm/dts/${DTBO}
+        fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO}
+                fi
+        done
+
+        for CC_DTB in ${IMPORT_CC_UBOOT_DTBS}; do
+                DTBO=$(echo $CC_DTB | cut -d: -f1)
+        OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3)
+        BASE_SYS_DTB="${RECIPE_SYSROOT}/${DTB_PATH}/${PACKAGE_UBOOT_DTB_NAME}"
+                if [ -f ${B}/arch/arm/dts/${DTBO} ] && [ -f ${BASE_SYS_DTB} ]; then
+        bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO}"
+        fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO}
                 fi
         done
 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb
index 91e787bd..dc1feda4 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb
@@ -2,5 +2,5 @@
 require qemu-devicetrees.inc
 
 BRANCH ?= "xlnx_rel_v2023.1"
-SRCREV ?= "1c45adcde1fc06432c01be250bf668c6477d8459"
+SRCREV ?= "56538937584f527fb408347c3b430142e74723e8"
 
diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-GL_EXT_unpack_subimage-not-supported-for-G.patch b/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-GL_EXT_unpack_subimage-not-supported-for-G.patch
deleted file mode 100644
index e2e7dd95..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-GL_EXT_unpack_subimage-not-supported-for-G.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 354bbf9657385519dceeff6a890a71f9d53e6a8f Mon Sep 17 00:00:00 2001
-From: Parth Gajjar <parth.gajjar@amd.com>
-Date: Tue, 17 Jan 2023 02:04:32 -0800
-Subject: [PATCH] libweston: GL_EXT_unpack_subimage not supported for GLES2.0
-
-Removing GL_EXT_unpack_subimage as not supported by GLES2.0
-
-Signed-off-by: Parth Gajjar <parth.gajjar@amd.com>
----
- libweston/renderer-gl/gl-renderer.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
-index 613ddf4..046a26f 100644
---- a/libweston/renderer-gl/gl-renderer.c
-+++ b/libweston/renderer-gl/gl-renderer.c
-@@ -3941,11 +3941,13 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface)
-        else
-                ec->read_format = PIXMAN_a8b8g8r8;
- 
-+#if 0
-        if (gr->gl_version < gr_gl_version(3, 0) &&
-            !weston_check_egl_extension(extensions, "GL_EXT_unpack_subimage")) {
-                weston_log("GL_EXT_unpack_subimage not available.\n");
-                return -1;
-        }
-+#endif
- 
-        if (gr->gl_version >= gr_gl_version(3, 0) ||
-            weston_check_egl_extension(extensions, "GL_EXT_texture_type_2_10_10_10_REV"))
--- 
-2.34.1
-
diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/0002-libmali-does-not-support-gles3.patch b/meta-xilinx-core/recipes-graphics/wayland/files/0002-libmali-does-not-support-gles3.patch
deleted file mode 100644
index d4dadc7c..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/files/0002-libmali-does-not-support-gles3.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-libmali does not support libgles3
-
-Build in compatible ifdefs where necessary to workaround slight differences
-between GLES2 (mali) and GLES3 (mesa) that Weston is expecting.
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-
-diff -urN a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
---- a/libweston/renderer-gl/gl-renderer.c       2022-07-26 03:22:25.000000000 -0700
-+++ b/libweston/renderer-gl/gl-renderer.c       2022-10-26 16:25:13.497247422 -0700
-@@ -29,7 +29,7 @@
- 
- #include <GLES2/gl2.h>
- #include <GLES2/gl2ext.h>
--#include <GLES3/gl3.h>
-+/*#include <GLES3/gl3.h>*/
- 
- #include <stdbool.h>
- #include <stdint.h>
-@@ -1822,7 +1822,13 @@
-                return GL_RED_EXT;
-        case GL_RG8_EXT:
-                return GL_RG_EXT;
-+#ifndef GL_RGBA16F
-+#define GL_RGBA16F GL_RGBA16F_EXT
-+#endif
-        case GL_RGBA16F:
-+#ifndef GL_RGB10_A2
-+#define GL_RGB10_A2 GL_RGB10_A2_EXT
-+#endif
-        case GL_RGB10_A2:
-                return GL_RGBA;
-        default:
-@@ -2023,6 +2029,9 @@
-                gs->shader_variant = SHADER_VARIANT_RGBA;
-                pitch = wl_shm_buffer_get_stride(shm_buffer) / 8;
-                gl_format[0] = GL_RGBA16F;
-+#ifndef GL_HALF_FLOAT
-+#define GL_HALF_FLOAT GL_HALF_FLOAT_OES
-+#endif
-                gl_pixel_type = GL_HALF_FLOAT;
-                es->is_opaque = false;
-                break;
-diff -urN a/libweston/renderer-gl/gl-shader-config-color-transformation.c b/libweston/renderer-gl/gl-shader-config-color-transformation.c
---- a/libweston/renderer-gl/gl-shader-config-color-transformation.c     2022-07-26 03:22:25.000000000 -0700
-+++ b/libweston/renderer-gl/gl-shader-config-color-transformation.c     2022-07-26 03:22:25.000000000 -0700
-@@ -25,7 +25,8 @@
- 
- #include "config.h"
- 
--#include <GLES3/gl3.h>
-+#include <GLES2/gl2.h>
-+/*#include <GLES3/gl3.h>*/
- #include <GLES2/gl2ext.h>
- 
- #include <assert.h>
-@@ -138,6 +139,9 @@
-        glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
-        glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0);
-        glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0);
-+#ifndef GL_R32F
-+#define GL_R32F GL_R32F_EXT
-+#endif
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_R32F, lut_len, nr_rows, 0,
-                     GL_RED_EXT, GL_FLOAT, lut);
- 
-diff -ur a/shared/weston-egl-ext.h b/shared/weston-egl-ext.h
---- a/shared/weston-egl-ext.h   2022-07-26 03:22:25.000000000 -0700
-+++ b/shared/weston-egl-ext.h   2022-10-26 17:11:28.501107772 -0700
-@@ -150,6 +150,7 @@
- #define EGL_NO_DEVICE_EXT                 EGL_CAST(EGLDeviceEXT,0)
- #define EGL_BAD_DEVICE_EXT                0x322B
- #define EGL_DEVICE_EXT                    0x322C
-+#define EGLAttrib EGLAttribKHR
- typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICEATTRIBEXTPROC) (EGLDeviceEXT device, EGLint attribute, EGLAttrib *value);
- typedef const char *(EGLAPIENTRYP PFNEGLQUERYDEVICESTRINGEXTPROC) (EGLDeviceEXT device, EGLint name);
- typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICESEXTPROC) (EGLint max_devices, EGLDeviceEXT *devices, EGLint *num_devices);
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
new file mode 100644
index 00000000..f8f75894
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
@@ -0,0 +1,50 @@
+From c8bfa1f8d576cdc6d515dbbac36c48c6166be0d5 Mon Sep 17 00:00:00 2001
+From: Marius Vlad <marius.vlad@collabora.com>
+Date: Thu, 1 Apr 2021 00:12:00 +0300
+Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at DRM-backend tear down
+
+Tearing down the drm-backend when there are no input devices, would call
+for the gbm device destruction before compositor shutdown. The latter
+would call into the renderer detroy function and assume that the
+EGLDisplay, which was created using the before-mentioned gbm device, is
+still available. This patch re-orders the gbm destruction after the
+compositor shutdown when no one would make use of it.
+
+Fixes: #314
+
+Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
+Suggested-by: Daniel Stone <daniel.stone@collabora.com>
+
+Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commit/d171c7b3ba346c4d0bd6494f45ebf0be3c3cc5fb]
+---
+ libweston/backend-drm/drm.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
+index 2780f3b..fbcfeca 100644
+--- a/libweston/backend-drm/drm.c
++++ b/libweston/backend-drm/drm.c
+@@ -3025,10 +3025,6 @@ err_drm_source:
+ err_udev_input:
+        udev_input_destroy(&b->input);
+ err_sprite:
+-#ifdef BUILD_DRM_GBM
+-       if (b->gbm)
+-               gbm_device_destroy(b->gbm);
+-#endif
+        destroy_sprites(b);
+ err_udev_dev:
+        udev_device_unref(drm_device);
+@@ -3038,6 +3034,10 @@ err_launcher:
+        weston_launcher_destroy(compositor->launcher);
+ err_compositor:
+        weston_compositor_shutdown(compositor);
++#ifdef BUILD_DRM_GBM
++       if (b->gbm)
++               gbm_device_destroy(b->gbm);
++#endif
+        free(b);
+        return NULL;
+ }
+--
+2.33.0
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch
new file mode 100644
index 00000000..06e0f7ba
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch
@@ -0,0 +1,32 @@
+From a2ba4714a6872e547621d29d9ddcb0f374b88cf6 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Tue, 20 Apr 2021 20:42:18 -0700
+Subject: [PATCH] meson.build: fix incorrect header
+
+The wayland.c actually include 'xdg-shell-client-protocol.h' instead of
+the server one, so fix it. Otherwise, it's possible to get build failure
+due to race condition.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ libweston/backend-wayland/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libweston/backend-wayland/meson.build b/libweston/backend-wayland/meson.build
+index 7e82513..29270b5 100644
+--- a/libweston/backend-wayland/meson.build
++++ b/libweston/backend-wayland/meson.build
+@@ -10,7 +10,7 @@ srcs_wlwl = [
+        fullscreen_shell_unstable_v1_protocol_c,
+        presentation_time_protocol_c,
+        presentation_time_server_protocol_h,
+-       xdg_shell_server_protocol_h,
++       xdg_shell_client_protocol_h,
+        xdg_shell_protocol_c,
+ ]
+ 
+-- 
+2.30.2
+
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch
new file mode 100644
index 00000000..6fe86ff3
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch
@@ -0,0 +1,47 @@
+From 58760e09eed662a72da939ff4802d605489cff8e Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Tue, 8 Sep 2020 19:37:42 -0400
+Subject: [PATCH] tests: include fcntl.h for open(), O_RDWR, O_CLOEXEC and
+ O_CREAT
+
+musl libc (unlike glibc) requires explicitly incuding fcntl.h to define open(),
+O_RDWR, O_CLOEXEC and O_CREAT. Otherwise the build fails with the errors:
+
+| ../weston-9.0.0/tests/weston-test-fixture-compositor.c: In function 'wait_for_lock':
+| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:7: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration]
+|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
+|       |       ^~~~
+|       |       popen
+| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: error: 'O_RDWR' undeclared (first use in this function)
+|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
+|       |                       ^~~~~~
+| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: note: each undeclared identifier is reported only once for each function it appears in
+| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:32: error: 'O_CLOEXEC' undeclared (first use in this function)
+|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
+|       |                                ^~~~~~~~~
+| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:44: error: 'O_CREAT' undeclared (first use in this function)
+|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
+|       |                                            ^~~~~~~
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/493/diffs?commit_id=b10c0e843dcb8148bbe869bb15261955b94ac98c]
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ tests/weston-test-fixture-compositor.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c
+index 0c9855f..e0e32c9 100644
+--- a/tests/weston-test-fixture-compositor.c
++++ b/tests/weston-test-fixture-compositor.c
+@@ -31,6 +31,7 @@
+ #include <unistd.h>
+ #include <sys/file.h>
+ #include <errno.h>
++#include <fcntl.h>
+ 
+ #include "shared/helpers.h"
+ #include "weston-test-fixture-compositor.h"
+-- 
+2.7.4
+
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
new file mode 100644
index 00000000..f6ebfd8f
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -0,0 +1,199 @@
+From a1548c742bf2dedbb47282d8a00407b60bbab669 Mon Sep 17 00:00:00 2001
+From: Tom Hochstein <tom.hochstein@nxp.com>
+Date: Wed, 22 Feb 2017 15:53:30 +0200
+Subject: [PATCH] weston-launch: Provide a default version that doesn't require
+
+ PAM
+
+weston-launch requires PAM for starting weston as a non-root user.
+
+Since starting weston as root is a valid use case by itself, if
+PAM is not available, provide a default version of weston-launch
+without non-root-user support.
+
+Upstream-Status: Denied [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/725]
+
+Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+Signed-off-by: Ming Liu <ming.liu@toradex.com>
+
+---
+ libweston/meson.build     | 16 ++++++++++++----
+ libweston/weston-launch.c | 21 +++++++++++++++++++++
+ meson_options.txt         |  7 +++++++
+ 3 files changed, 40 insertions(+), 4 deletions(-)
+
+diff --git a/libweston/meson.build b/libweston/meson.build
+index 08d23ec..cb9fd3f 100644
+--- a/libweston/meson.build
++++ b/libweston/meson.build
+@@ -216,16 +216,24 @@ dep_vertex_clipping = declare_dependency(
+ )
+ 
+ if get_option('weston-launch')
+-       dep_pam = cc.find_library('pam')
++       deps_weston_launch = [systemd_dep, dep_libdrm]
+ 
+-       if not cc.has_function('pam_open_session', dependencies: dep_pam)
+-               error('pam_open_session not found for weston-launch')
++       if get_option('pam')
++               dep_pam = cc.find_library('pam')
++               if not cc.has_function('pam_open_session', dependencies: dep_pam)
++                       error('pam_open_session not found for weston-launch')
++               endif
++
++               if dep_pam.found()
++                       deps_weston_launch += dep_pam
++                       config_h.set('HAVE_PAM', '1')
++               endif
+        endif
+ 
+        executable(
+                'weston-launch',
+                'weston-launch.c',
+-               dependencies: [dep_pam, systemd_dep, dep_libdrm],
++               dependencies: deps_weston_launch,
+                include_directories: common_inc,
+                install: true
+        )
+diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
+index 521cb2c..2d42d33 100644
+--- a/libweston/weston-launch.c
++++ b/libweston/weston-launch.c
+@@ -51,7 +51,9 @@
+ 
+ #include <pwd.h>
+ #include <grp.h>
++#ifdef HAVE_PAM
+ #include <security/pam_appl.h>
++#endif
+ 
+ #ifdef HAVE_SYSTEMD_LOGIN
+ #include <systemd/sd-login.h>
+@@ -100,8 +102,10 @@ drmSetMaster(int drm_fd)
+ #endif
+ 
+ struct weston_launch {
++#ifdef HAVE_PAM
+        struct pam_conv pc;
+        pam_handle_t *ph;
++#endif
+        int tty;
+        int ttynr;
+        int sock[2];
+@@ -192,6 +196,7 @@ weston_launch_allowed(struct weston_launch *wl)
+        return false;
+ }
+ 
++#ifdef HAVE_PAM
+ static int
+ pam_conversation_fn(int msg_count,
+                    const struct pam_message **messages,
+@@ -232,6 +237,7 @@ setup_pam(struct weston_launch *wl)
+ 
+        return 0;
+ }
++#endif
+ 
+ static int
+ setup_launcher_socket(struct weston_launch *wl)
+@@ -466,6 +472,7 @@ quit(struct weston_launch *wl, int status)
+        close(wl->signalfd);
+        close(wl->sock[0]);
+ 
++#ifdef HAVE_PAM
+        if (wl->new_user) {
+                err = pam_close_session(wl->ph, 0);
+                if (err)
+@@ -473,6 +480,7 @@ quit(struct weston_launch *wl, int status)
+                                err, pam_strerror(wl->ph, err));
+                pam_end(wl->ph, err);
+        }
++#endif
+ 
+        /*
+         * Get a fresh handle to the tty as the previous one is in
+@@ -710,6 +718,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+        setenv("HOME", wl->pw->pw_dir, 1);
+        setenv("SHELL", wl->pw->pw_shell, 1);
+ 
++#ifdef HAVE_PAM
+        env = pam_getenvlist(wl->ph);
+        if (env) {
+                for (i = 0; env[i]; ++i) {
+@@ -718,6 +727,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+                }
+                free(env);
+        }
++#endif
+ 
+        /*
+         * We open a new session, so it makes sense
+@@ -789,8 +799,10 @@ static void
+ help(const char *name)
+ {
+        fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
++#ifdef HAVE_PAM
+        fprintf(stderr, "  -u, --user      Start session as specified username,\n"
+                        "                  e.g. -u joe, requires root.\n");
++#endif
+        fprintf(stderr, "  -t, --tty       Start session on alternative tty,\n"
+                        "                  e.g. -t /dev/tty4, requires -u option.\n");
+        fprintf(stderr, "  -v, --verbose   Be verbose\n");
+@@ -804,7 +816,9 @@ main(int argc, char *argv[])
+        int i, c;
+        char *tty = NULL;
+        struct option opts[] = {
++#ifdef HAVE_PAM
+                { "user",    required_argument, NULL, 'u' },
++#endif
+                { "tty",     required_argument, NULL, 't' },
+                { "verbose", no_argument,       NULL, 'v' },
+                { "help",    no_argument,       NULL, 'h' },
+@@ -816,11 +830,16 @@ main(int argc, char *argv[])
+        while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
+                switch (c) {
+                case 'u':
++#ifdef HAVE_PAM
+                        wl.new_user = optarg;
+                        if (getuid() != 0) {
+                                fprintf(stderr, "weston: Permission denied. -u allowed for root only\n");
+                                exit(EXIT_FAILURE);
+                        }
++#else
++                       fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n");
++                       exit(EXIT_FAILURE);
++#endif
+                        break;
+                case 't':
+                        tty = optarg;
+@@ -872,8 +891,10 @@ main(int argc, char *argv[])
+        if (setup_tty(&wl, tty) < 0)
+                exit(EXIT_FAILURE);
+ 
++#ifdef HAVE_PAM
+        if (wl.new_user && setup_pam(&wl) < 0)
+                exit(EXIT_FAILURE);
++#endif
+ 
+        if (setup_launcher_socket(&wl) < 0)
+                exit(EXIT_FAILURE);
+diff --git a/meson_options.txt b/meson_options.txt
+index 239bd2d..99e4ec3 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -73,6 +73,13 @@ option(
+ )
+ 
+ option(
++       'pam',
++       type: 'boolean',
++       value: true,
++       description: 'Define if PAM is available'
++)
++
++option(
+        'xwayland',
+        type: 'boolean',
+        value: true,
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/meta-xilinx-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
new file mode 100644
index 00000000..a4444e5d
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
@@ -0,0 +1,23 @@
+Fix atomic modesetting with musl
+
+atomic modesetting seems to fail with drm weston backend and this patch fixes
+it, below errors are seen before weston exits
+
+atomic: couldn't commit new state: Invalid argument
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/libweston/backend-drm/kms.c
++++ b/libweston/backend-drm/kms.c
+@@ -1168,8 +1168,8 @@ drm_pending_state_apply_atomic(struct dr
+                wl_list_for_each(plane, &b->plane_list, link) {
+                        drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n",
+                                  (unsigned long) plane->plane_id);
+-                       plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
+-                       plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
++                       //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
++                       //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
+                }
+ 
+                flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/systemd-notify.weston-start b/meta-xilinx-core/recipes-graphics/wayland/weston/systemd-notify.weston-start
new file mode 100644
index 00000000..a97e7b38
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston/systemd-notify.weston-start
@@ -0,0 +1,9 @@
+#!/bin/sh
+  
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+
+if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then
+        add_weston_module "systemd-notify.so"
+fi
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/weston.desktop b/meta-xilinx-core/recipes-graphics/wayland/weston/weston.desktop
new file mode 100644
index 00000000..1086ae8b
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston/weston.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Weston
+Comment=Wayland Compostitor
+Exec=weston
+Icon=weston
+Terminal=false
+Categories=Utility;
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/weston.png b/meta-xilinx-core/recipes-graphics/wayland/weston/weston.png
new file mode 100644
index 00000000..ea8b7e0e
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston/weston.png
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/xwayland.weston-start b/meta-xilinx-core/recipes-graphics/wayland/weston/xwayland.weston-start
new file mode 100644
index 00000000..db384b1a
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston/xwayland.weston-start
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if type Xwayland  >/dev/null 2>/dev/null; then
+        mkdir -p /tmp/.X11-unix
+fi
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
index bb6413a8..edb77fc5 100644
--- a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
@@ -9,19 +9,6 @@ DEFAULT_PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}"
 PACKAGE_ARCH = "${DEFAULT_PACKAGE_ARCH}"
 
 
-# mali400 specific items
-LIBMALI_SRC_URI = " \
-    file://0001-libweston-GL_EXT_unpack_subimage-not-supported-for-G.patch \
-    file://0002-libmali-does-not-support-gles3.patch \
-"
-MALI_SRC_URI = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '${LIBMALI_SRC_URI}', '', d)}"
-SRC_URI:append = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', ' ${MALI_SRC_URI}', '', d)}"
-
-# Skip dmabuf-feedback, as it requires gbm >= 21.1.1, mali-xlnx only provides 17.3
-DEFAULT_SIMPLECLIENTS := "${SIMPLECLIENTS}"
-MALI_SIMPLECLIENTS = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', 'damage,im,egl,shm,touch,dmabuf-v4l,dmabuf-egl', '${DEFAULT_SIMPLECLIENTS}', d)}"
-SIMPLECLIENTS = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${MALI_SIMPLECLIENTS}', '${DEFAULT_SIMPLECLIENTS}', d)}"
-
 # Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
 DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
 MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_10.0.2.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_10.0.2.bbappend
new file mode 100644
index 00000000..18396c5e
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston_10.0.2.bbappend
@@ -0,0 +1,8 @@
+ZYNQMP_WARN_DEFAULT = "0"
+ZYNQMP_WARN_DEFAULT:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '1', '0', d)}"
+ZYNQMP_WARN = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${ZYNQMP_WARN_DEFAULT}', '0', d)}"
+
+python() {
+    if d.getVar('ZYNQMP_WARN') == "1":
+        raise bb.parse.SkipRecipe("Weston 10.0.0.2 requires GLES 3 interfaces which are not available when libmali enabled.  Use Weston 9.0.0.0 instead.")
+}
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bb b/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bb
new file mode 100644
index 00000000..a534b1b7
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bb
@@ -0,0 +1,148 @@
+SUMMARY = "Weston, a Wayland compositor"
+DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
+HOMEPAGE = "http://wayland.freedesktop.org"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
+                    file://libweston/compositor.c;endline=27;md5=6c53bbbd99273f4f7c4affa855c33c0a"
+
+# We want this version to be "newer" then 10, only if libmali and mali400 are both enabled
+ORIG_PE := "${PE}"
+MALI_PE = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '1', '${ORIG_PE}', d)}"
+PE = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${MALI_PE}', '${ORIG_PE}', d)}"
+
+SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+           file://weston.png \
+           file://weston.desktop \
+           file://xwayland.weston-start \
+           file://systemd-notify.weston-start \
+           file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
+           file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \
+           file://0001-meson.build-fix-incorrect-header.patch \
+           file://0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch \
+"
+
+SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch "
+
+SRC_URI[sha256sum] = "5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe"
+
+UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
+
+inherit meson pkgconfig useradd features_check
+# depends on virtual/egl
+# weston-init requires pam enabled if started via systemd
+REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}"
+
+DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
+DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
+
+LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
+
+WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
+
+EXTRA_OEMESON += "-Dbackend-default=auto -Dpipewire=false"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
+                   ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \
+                   ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \
+                   launch \
+                   image-jpeg \
+                   screenshare \
+                   shell-desktop \
+                   shell-fullscreen \
+                   shell-ivi"
+
+#
+# Compositor choices
+#
+# Weston on KMS
+PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev"
+# Weston on Wayland (nested Weston)
+PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2"
+# Weston on X11
+PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo"
+# Headless Weston
+PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false"
+# Weston on framebuffer
+PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev"
+# Weston on RDP
+PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp"
+# weston-launch
+PACKAGECONFIG[launch] = "-Dweston-launch=true,-Dweston-launch=false,drm"
+# VA-API desktop recorder
+PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva"
+# Weston with EGL support
+PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl"
+# Weston with lcms support
+PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms"
+# Weston with webp support
+PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
+# Weston with systemd-login support
+PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus"
+# Weston with Xwayland support (requires X11 and Wayland)
+PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false"
+# colord CMS support
+PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord"
+# Clients support
+PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
+# Virtual remote output with GStreamer on DRM backend
+PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base"
+# Weston with PAM support
+PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam"
+# Weston with screen-share support
+PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false"
+# Traditional desktop shell
+PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false"
+# Fullscreen shell
+PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false"
+# In-Vehicle Infotainment (IVI) shell
+PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false"
+# JPEG image loading support
+PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg"
+
+do_install:append() {
+        # Weston doesn't need the .la files to load modules, so wipe them
+        rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
+
+        # If X11, ship a desktop file to launch it
+        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
+                install -d ${D}${datadir}/applications
+                install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
+
+                install -d ${D}${datadir}/icons/hicolor/48x48/apps
+                install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+        fi
+
+        if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
+                install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+        fi
+
+        if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
+                install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+        fi
+
+        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
+                chmod u+s ${D}${bindir}/weston-launch
+        fi
+}
+
+PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
+             libweston-${WESTON_MAJOR_VERSION} ${PN}-examples"
+
+FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so"
+FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}"
+
+FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so"
+SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'."
+
+FILES:${PN}-examples = "${bindir}/*"
+
+FILES:${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so"
+RDEPENDS:${PN}-xwayland += "xwayland"
+
+RDEPENDS:${PN} += "xkeyboard-config"
+RRECOMMENDS:${PN} = "weston-init liberation-fonts"
+RRECOMMENDS:${PN}-dev += "wayland-protocols"
+
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM:${PN} = "--system weston-launch"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
index 14dd2ace..2355d090 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
@@ -3,7 +3,7 @@ LINUX_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE',
 PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}"
 
 # Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits
-KBRANCH ?= "xlnx_rebase_v5.15_LTS"
+KBRANCH ?= "undefined"
 SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}"
 
 FILESOVERRIDES:append := ":${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
index 6740a459..d229f21c 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
@@ -1,7 +1,7 @@
-LINUX_VERSION = "6.1.5"
+LINUX_VERSION = "6.1.30"
 YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta"
-KBRANCH="xlnx_rebase_v6.1_LTS"
-SRCREV = "716921b6d7dc9db49660369428fb61ca96947ccb"
+KBRANCH="xlnx_rebase_v6.1_LTS_2023.1_update"
+SRCREV = "9299ac26ca514a0ccd9f6ae01f50e816d7e79dfa"
 SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f"
 
 KCONF_AUDIT_LEVEL="0"
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index 88b79ef9..bb405e70 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -5,12 +5,12 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https"
 
 ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update"
 ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2"
-ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1"
+ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1_update"
 BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}"
 
 ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01"
 ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2"
-ESW_REV[2023.1] = "86f54b77641f325042a1101fead96b2714e6d3ef"
+ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a"
 SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}"
 
 EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
@@ -19,7 +19,7 @@ EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d'
 LIC_FILES_CHKSUM[xlnx_rel_v2022.2]  = 'ce611484168a6000bd35df68fc4f4290'
-LIC_FILES_CHKSUM[xlnx_rel_v2023.1] = '3c310a3ee2197a4c92c6a0e2937c207c'
+LIC_FILES_CHKSUM[xlnx_rel_v2023.1_update] = '3c310a3ee2197a4c92c6a0e2937c207c'
 LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}"
 
 SRC_URI = "${EMBEDDEDSW_SRCURI}"
diff --git a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
index 479398b0..6a88d757 100644
--- a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
@@ -20,7 +20,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD avnet-ultra96-rev1}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence1"
+ATF_CONSOLE ?= "cadence1"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables