Merge remote-tracking branch 'xilinx/rel-v2024.1' into master-next

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

21 files changed, 202 insertions, 46 deletions

diff --git a/docs/README.booting.storage.md b/docs/README.booting.storage.md
index 2a1f66a7..d9689712 100644
--- a/docs/README.booting.storage.md
+++ b/docs/README.booting.storage.md
@@ -61,18 +61,36 @@ $ sudo lsblk /dev/mmcblk<devnum> -o NAME,FSTYPE,LABEL,PARTLABEL
 $ sudo mount -L boot /mnt/boot; sudo mount -L root /mnt/rootfs` 
 ```
 3. Copy the boot images to the SD card or eMMC device FAT32 partition.
+
+* Linux
    * boot.bin
    * boot.scr
    * Image or uImage (For Zynq7000 only)
    * system.dtb
    * rootfs.cpio.gz.u-boot (If using a ramdisk)
-```
-$ cp ${DEPLOY_DIR_IMAGE}/boot.bin /mnt/boot/boot.bin
-$ cp ${DEPLOY_DIR_IMAGE}/boot.scr /mnt/boot/boot.scr
-$ cp ${DEPLOY_DIR_IMAGE}/Image /mnt/boot/Image
-$ cp ${DEPLOY_DIR_IMAGE}/system.dtb /mnt/boot/system.dtb
-$ cp ${DEPLOY_DIR_IMAGE}/<target-image>-${MACHINE}-${DATETIME}.cpio.gz.u-boot /mnt/boot/rootfs.cpio.gz.u-boot
-```
+   ```
+   $ cp ${DEPLOY_DIR_IMAGE}/boot.bin /mnt/boot/boot.bin
+   $ cp ${DEPLOY_DIR_IMAGE}/boot.scr /mnt/boot/boot.scr
+   $ cp ${DEPLOY_DIR_IMAGE}/Image /mnt/boot/Image
+   $ cp ${DEPLOY_DIR_IMAGE}/system.dtb /mnt/boot/system.dtb
+   $ cp ${DEPLOY_DIR_IMAGE}/<target-image>-${MACHINE}-${DATETIME}.cpio.gz.u-boot /mnt/boot/rootfs.cpio.gz.u-boot
+   ```
+* Xen
+   * boot.bin
+   * boot.scr
+   * Image
+   * xen
+   * system.dtb
+   * rootfs.cpio.gz (If using a ramdisk)
+   ```
+   $ cp ${DEPLOY_DIR_IMAGE}/boot.bin /mnt/boot/boot.bin
+   $ cp ${DEPLOY_DIR_IMAGE}/boot.scr /mnt/boot/boot.scr
+   $ cp ${DEPLOY_DIR_IMAGE}/Image /mnt/boot/Image
+   $ cp ${DEPLOY_DIR_IMAGE}/xen /mnt/boot/xen
+   $ cp ${DEPLOY_DIR_IMAGE}/system.dtb /mnt/boot/system.dtb
+   $ cp ${DEPLOY_DIR_IMAGE}/<target-image>-${MACHINE}-${DATETIME}.cpio.gz /mnt/boot/rootfs.cpio.gz
+   ```
+
 4. Extract `<target-image>-${MACHINE}-${DATETIME}.rootfs.tar.gz` file content to the SD
    card or eMMC device EXT4 partition.
 ```
diff --git a/docs/README.booting.versal.md b/docs/README.booting.versal.md
index ef817bf3..4f673689 100644
--- a/docs/README.booting.versal.md
+++ b/docs/README.booting.versal.md
@@ -57,6 +57,10 @@ Deploying the images can be done in two methods.
 
 #### Using devtool boot-jtag script
 
+> **Note:** For Xen boot flow boot-jtag script doesn't include loading xen, kernel
+> and root filesystem, This step needs to be done manually as mentioned in XSDB
+> or TFTP method below.
+
 1. Run devtool command to generate the boot-jtag.tcl script.
 ```
 $ devtool boot-jtag --help
@@ -125,6 +129,8 @@ Load the images into the target DDR/PL DRR load address i.e.,
 
 Below example uses base DDR address as 0x0 which matches in vivado address editor.
 
+1. **Linux**
+
 | Image Type         | Base DDR Address | Image Offset | Load Address in DDR |
 |--------------------|------------------|--------------|---------------------|
 | Kernel             | 0x0              | 0x200000     | 0x200000            |
@@ -132,6 +138,15 @@ Below example uses base DDR address as 0x0 which matches in vivado address edito
 | Rootfs             | 0x0              | 0x4000000    | 0x4000000           |
 | U-boot boot script | 0x0              | 0x20000000   | 0x20000000          |
 
+2. **Xen**
+
+| Image Type         | Base DDR Address | Image Offset | Load Address in DDR |
+|--------------------|------------------|--------------|---------------------|
+| Kernel             | 0x0              | 0xE00000     | 0xE00000            |
+| Device Tree        | 0x0              | 0xC000000    | 0xc000000           |
+| Rootfs             | 0x0              | 0x02600000   | 0x02600000          |
+| U-boot boot script | 0x0              | 0x20000000   | 0x20000000          |
+
 > **Note:** 
 > 1. `<target-image>` refers to core-image-minimal or petalinux-image-minimal
 > 2. For pxeboot boot create a symlink for `<target-image>-${MACHINE}-${DATETIME}.cpio.gz.u-boot`
@@ -152,13 +167,23 @@ xsdb% stop
 ```
 2. Using the `dow` command to load the images into the target DDR/PL DDR load 
    address.
-```
-xsdb% dow -data ${DEPLOY_DIR_IMAGE}/Image 0x200000
-xsdb% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x1000
-xsdb% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x4000000
-xsdb% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0x20000000
-xsdb% targets -set -nocase -filter {name =~ "*A72*#0"}
-```
+
+   * Linux XSDB
+   ```
+   xsdb% targets -set -nocase -filter {name =~ "*A72*#0"}
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/Image 0x200000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x1000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x4000000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0x20000000
+   ```
+   * Xen XSDB
+   ```
+   xsdb% targets -set -nocase -filter {name =~ "*A72*#0"}
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/Image 0xE00000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0xc000000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz 0x02600000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0x20000000
+   ```
 
 ###### Using TFTP
 
@@ -170,13 +195,25 @@ Versal> set serverip <server ip>
 Versal> set ipaddr <board ip>
 ```
 3. Load the images to DDR address.
-```
-U-Boot> tftpboot 0x200000 Image
-U-Boot> tftpboot 0x1000 system.dtb
-U-Boot> tftpboot 0x4000000 core-image-minimal-${MACHINE}.cpio.gz.u-boot
-U-Boot> tftpboot 0x20000000 boot.scr
 
-```
+   * Linux TFTP
+   ```
+   U-Boot> tftpboot 0x200000 Image
+   U-Boot> tftpboot 0x1000 system.dtb
+   U-Boot> tftpboot 0x4000000 core-image-minimal-${MACHINE}.cpio.gz.u-boot
+   U-Boot> tftpboot 0x20000000 boot.scr
+   ```
+
+   * Xen TFTP
+   ```
+   U-Boot> tftpboot 0xE00000 Image
+   U-Boot> setenv kernel_size 0x$filesize
+   U-Boot> tftpboot 0xc000000 system.dtb
+   U-Boot> tftpboot 0x02600000 core-image-minimal-${MACHINE}.cpio.gz
+   U-Boot> setenv ramdisk_size 0x$filesize
+   U-Boot> tftpboot 0x20000000 boot.scr
+   ```
+
 ##### Booting Linux
 
 Once the images are loaded continue the execution.
@@ -191,10 +228,29 @@ xsdb% con
 xsdb% exit
 ```
 3. In the target Serial Terminal, from U-Boot prompt run `boot` command.
+
+* Linux boot
 ```
 U-Boot> boot
 ```
 
+* XEN JTAG boot
+
+   * XSDB
+   > **Note:** You need to calculate the Kernel(kernel_size) and ramdisk(ramdisk_size)
+   > image size manually from `${DEPLOY_DIR_IMAGE}` directory. For example if your
+   > kernel size is 24269312 bytes you need to convert to hex 0x1725200 and use it.
+   ```
+   U-Boot> setenv kernel_size <filesize>
+   U-Boot> setenv ramdisk_size <filesize>
+   U-Boot> boot
+   ```
+
+   * TFTP
+   ```
+   U-Boot> boot
+   ```
+
 ## Booting from SD
 
 1. Load the SD card into the VCK190 board in the J302 SD slot.
diff --git a/docs/README.booting.zynqmp.md b/docs/README.booting.zynqmp.md
index 80e6d5ae..3b73dbbb 100644
--- a/docs/README.booting.zynqmp.md
+++ b/docs/README.booting.zynqmp.md
@@ -54,6 +54,10 @@ Deploying the images can be done in two methods.
 
 #### Using devtool boot-jtag script
 
+> **Note:** For Xen boot flow boot-jtag script doesn't include loading xen, kernel
+> and root filesystem, This step needs to be done manually as mentioned in XSDB
+> or TFTP method below.
+
 1. Run devtool command to generate the boot-jtag.tcl script.
 ```
 $ devtool boot-jtag --help
@@ -151,6 +155,8 @@ Load the images into the target DDR/PL DRR load address i.e.,
 
 Below example uses base DDR address as 0x0 which matches in vivado address editor.
 
+1. **Linux**
+
 | Image Type         | Base DDR Address | Image Offset | Load Address in DDR |
 |--------------------|------------------|--------------|---------------------|
 | Kernel             | 0x0              | 0x200000     | 0x200000            |
@@ -158,6 +164,15 @@ Below example uses base DDR address as 0x0 which matches in vivado address edito
 | Rootfs             | 0x0              | 0x04000000   | 0x4000000           |
 | U-boot boot script | 0x0              | 0x20000000   | 0x20000000          |
 
+2. **Xen**
+
+| Image Type         | Base DDR Address | Image Offset | Load Address in DDR |
+|--------------------|------------------|--------------|---------------------|
+| Kernel             | 0x0              | 0xE00000     | 0xE00000            |
+| Device Tree        | 0x0              | 0xC000000    | 0xc000000           |
+| Rootfs             | 0x0              | 0x02600000   | 0x02600000          |
+| U-boot boot script | 0x0              | 0x20000000   | 0x20000000          |
+
 > **Note:** 
 > 1. `<target-image>` refers to core-image-minimal or petalinux-image-minimal
 > 2. For pxeboot boot create a symlink for `<target-image>-${MACHINE}-${DATETIME}.cpio.gz.u-boot`
@@ -178,12 +193,23 @@ xsdb% stop
 ```
 2. Using the `dow` command to load the images into the target DDR/PL DDR load 
    address.
-```
-xsdb% dow -data ${DEPLOY_DIR_IMAGE}/Image 0x200000
-xsdb% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x100000
-xsdb% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x4000000
-xsdb% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0x20000000
-```
+
+   * Linux XSDB
+   ```
+   xsdb% targets -set -nocase -filter {name =~ "*A53*#0"}
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/Image 0x200000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x100000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x4000000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0x20000000
+   ```
+   * Xen XSDB
+   ```
+   xsdb% targets -set -nocase -filter {name =~ "*A53*#0"}
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/Image 0xE00000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0xc000000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz 0x02600000
+   xsdb% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0x20000000
+   ```
 
 ###### Using TFTP
 
@@ -216,10 +242,29 @@ xsdb% con
 xsdb% exit
 ```
 3. In the target Serial Terminal, from U-Boot prompt run `boot` command.
+
+* Linux boot
 ```
 U-Boot> boot
 ```
 
+* XEN JTAG boot
+
+   * XSDB
+   > **Note:** You need to calculate the Kernel(kernel_size) and ramdisk(ramdisk_size)
+   > image size manually from `${DEPLOY_DIR_IMAGE}` directory. For example if your
+   > kernel size is 24269312 bytes you need to convert to hex 0x1725200 and use it.
+   ```
+   U-Boot> setenv kernel_size <filesize>
+   U-Boot> setenv ramdisk_size <filesize>
+   U-Boot> boot
+   ```
+
+   * TFTP
+   ```
+   U-Boot> boot
+   ```
+
 ## Booting from SD
 
 1. Load the SD card into the ZCU102 board in the J100 SD slot.
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
index 92af8a7a..62a3b0f2 100644
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
@@ -1,5 +1,5 @@
-SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master;protocol=https"
-SRCREV = "4b687525d2c4785eedbcbd73431bc6d236cb5bc8"
+SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=v0.2024.x;protocol=https"
+SRCREV = "a85a86eba10c7cd0f8aa4c99aa647ae8bdd72d70"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/lopper:"
 
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
index 1f8ae2e3..9367fa2c 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -130,7 +130,7 @@ devicetree_do_install:append() {
         fi
         if [ -e "${D}/boot/devicetree/${DTB_FILE_NAME}" ]; then
             # We need the output to be system.dtb for WIC setup to match XSCT flow
-            ln -sf devicetree/${DTB_FILE_NAME} ${D}/boot/system.dtb
+            cp ${D}/boot/devicetree/${DTB_FILE_NAME} ${D}/boot/system.dtb
         else
             bberror "Expected filename ${DTB_FILE_NAME} doesn't exist in ${DEPLOYDIR}/devicetree"
         fi
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
index 56d65113..08e625c2 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
@@ -2,7 +2,7 @@ UBOOT_VERSION = "v2024.01"
 
 UBRANCH = "xlnx_rebase_v2024.01"
 
-SRCREV = "19348a61f408d61afd7997adf511895d87b0d3ac"
+SRCREV = "c0dbd5ec673441d8d8de4ac03a3b92c9512bfd6e"
 
 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-scr.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
index c3af0185..985ca427 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
@@ -264,10 +264,11 @@ do_compile() {
 do_install() {
     install -d ${D}/boot
     install -m 0644 boot.scr ${D}/boot/${UBOOTSCR_BASE_NAME}.scr
-    ln -sf ${UBOOTSCR_BASE_NAME}.scr ${D}/boot/boot.scr
+    install -m 0644 boot.scr ${D}/boot/
     install -d ${D}/boot/pxeboot/${UBOOTPXE_CONFIG_NAME}
     install -m 0644 pxeboot.pxe ${D}/boot/pxeboot/${UBOOTPXE_CONFIG_NAME}/default
-    ln -sf pxeboot/${UBOOTPXE_CONFIG_NAME} ${D}/boot/${UBOOTPXE_CONFIG}
+    install -d ${D}/boot/${UBOOTPXE_CONFIG}/
+    install -m 0644 pxeboot.pxe ${D}/boot/${UBOOTPXE_CONFIG}/default
 }
 
 FILES:${PN} = "/boot/*"
@@ -275,10 +276,11 @@ FILES:${PN} = "/boot/*"
 do_deploy() {
     install -d ${DEPLOYDIR}
     install -m 0644 boot.scr ${DEPLOYDIR}/${UBOOTSCR_BASE_NAME}.scr
-    ln -sf ${UBOOTSCR_BASE_NAME}.scr ${DEPLOYDIR}/boot.scr
+    install -m 0644 boot.scr ${DEPLOYDIR}/
     install -d ${DEPLOYDIR}/pxeboot/${UBOOTPXE_CONFIG_NAME}
     install -m 0644 pxeboot.pxe ${DEPLOYDIR}/pxeboot/${UBOOTPXE_CONFIG_NAME}/default
-    ln -sf pxeboot/${UBOOTPXE_CONFIG_NAME} ${DEPLOYDIR}/${UBOOTPXE_CONFIG}
+    install -d ${DEPLOYDIR}/${UBOOTPXE_CONFIG}/
+    install -m 0644 pxeboot.pxe ${DEPLOYDIR}/${UBOOTPXE_CONFIG}/default
 }
 
 addtask do_deploy after do_compile before do_build
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs
index dca974ab..fde094cf 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs
@@ -7,6 +7,10 @@
 
 for boot_target in ${boot_targets};
 do
+        echo "Trying to load boot images from ${boot_target}"
+        if test "${boot_target}" = "jtag" ; then
+                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@
+        fi
         if test "${boot_target}" = "xspi0" || test "${boot_target}" = "qspi" || test "${boot_target}" = "qspi0"; then
                 ubifsls @@FIT_IMAGE@@
                 if test $? = 0; then
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0029-Fixed-buildpath-QA-warning.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0029-Fixed-buildpath-QA-warning.patch
new file mode 100644
index 00000000..a3ddafed
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0029-Fixed-buildpath-QA-warning.patch
@@ -0,0 +1,29 @@
+From 7659ba2e251b72aa3c248d3b1f3a23971180ba41 Mon Sep 17 00:00:00 2001
+From: Parth Gajjar <parth.gajjar@amd.com>
+Date: Mon, 18 Mar 2024 13:43:30 +0000
+Subject: [PATCH] Fixed buildpath QA warning
+
+Removed KDIR from buildinfo
+WARNING: kernel-module-mali-r9p0-01rel0-r0 do_package_qa:
+QA Issue: File /lib/modules/6.6.10-xilinx-v2024.1-g2c37bbe14ced/updates/mali.ko
+ in package kernel-module-mali-6.6.10-xilinx-v2024.1-g2c37bbe14ced contains
+ reference to TMPDIR [buildpaths]" from the log file.
+
+Signed-off-by: Parth Gajjar <parth.gajjar@amd.com>
+
+diff --git a/Kbuild b/Kbuild
+index 8c6e6e0..2b8632b 100644
+--- a/Kbuild
++++ b/Kbuild
+@@ -243,7 +243,7 @@ VERSION_STRINGS += BUILD=release
+ endif
+ VERSION_STRINGS += TARGET_PLATFORM=$(TARGET_PLATFORM)
+ VERSION_STRINGS += MALI_PLATFORM=$(MALI_PLATFORM)
+-VERSION_STRINGS += KDIR=$(KDIR)
++#VERSION_STRINGS += KDIR=$(KDIR)
+ VERSION_STRINGS += OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB=$(OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB)
+ VERSION_STRINGS += USING_UMP=$(CONFIG_MALI400_UMP)
+ VERSION_STRINGS += USING_PROFILING=$(CONFIG_MALI400_PROFILING)
+-- 
+2.37.6
+
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2024.1.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2024.1.bb
index 9f17d744..72bd7759 100644
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2024.1.bb
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2024.1.bb
@@ -36,6 +36,7 @@ SRC_URI = " \
         file://0026-Fix-gpu-driver-probe-failure.patch \
         file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \
         file://0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch \
+        file://0029-Fixed-buildpath-QA-warning.patch \
         "
 SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
 SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb
index db593947..019e9de9 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb
@@ -1,7 +1,7 @@
 LINUX_VERSION = "6.6.10"
 YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=yocto-kmeta"
 KBRANCH="xlnx_rebase_v6.6_LTS"
-SRCREV = "6737b74785db6341fba18dc6e3d35da9ab8fcfb7"
+SRCREV = "562194b7c36184701c8774d1a07da07deeae374b"
 SRCREV_meta = "5d0809d0d939c7738cb6e5391126c73fd0e4e865"
 
 KCONF_AUDIT_LEVEL="0"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
index 35dffb16..be8f6075 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
@@ -13,7 +13,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 BRANCH = "master"
 REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "2ae83fc79f8a2db74be65883583cc6ad32d245e5"
+SRCREV = "91d19a16308a438596138d30d8174e148fc45584"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = " \
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2024.1.bb
index 420fdf1d..bff19a9c 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2024.1.bb
@@ -8,7 +8,7 @@ PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE',
 
 BRANCH ?= "master"
 REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "01e45e0ac2f869cd46286307ae94d19010fd46df"
+SRCREV = "dc34204543b89997577bd2c9757b3c218e6caccc"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2024.1.bb
index ac7e4aa3..8c3df7db 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2024.1.bb
@@ -8,7 +8,7 @@ PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE',
 
 BRANCH ?= "master"
 REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "918ec1e87c67b2746fe0f2bfa9f1503d307b9bc2"
+SRCREV = "940f9fa933402de6f959911c236f36add5dd3a40"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2024.1.bb
index cc6cd5bb..3ec61a96 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2024.1.bb
@@ -10,7 +10,7 @@ S  = "${WORKDIR}/git"
 
 BRANCH ?= "master"
 REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "ffe29273f378619a711aa10664612e6c660ee590"
+SRCREV = "6ee1998c53817ab0c137b8b99089337d5caba62c"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
index 0e3afbc1..ccbe77a8 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
@@ -13,7 +13,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 BRANCH ?= "master"
 REPO ?= "git://github.com/Xilinx/vdu-modules.git;protocol=https"
-SRCREV ?= "1529b6aaf784fb5e1cafb11c949c3cb3c69d1dfd"
+SRCREV ?= "25773344ce1e539e7136c5a30cdee98a6cf490a8"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG} \
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb
index 09a06c3e..5186d4fc 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb
@@ -13,7 +13,7 @@ REQUIRED_MACHINE_FEATURES = "vdu"
 
 BRANCH ?= "master"
 REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
-SRCREV ?= "db37dc935785dff57a52eabc41ac0bf26b0a1707"
+SRCREV ?= "7af131e0780d52ebc7bd6173bf1b99fec4dc522f"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2024.1.bb
index 51a03803..91b2a150 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2024.1.bb
@@ -9,7 +9,7 @@ PV .= "+git${SRCPV}"
 
 BRANCH ?= "master"
 REPO   ?= "git://github.com/Xilinx/vdu-omx-il.git;protocol=https"
-SRCREV ?= "a116b0729ace66117ccb7c2aca125c33994b0f41"
+SRCREV ?= "af9c6e8935799f4dcd579b0164dd05eb039b569d"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG} \
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2024.1.bb
index 42806ea4..378a23df 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2024.1.bb
@@ -15,7 +15,7 @@ REQUIRED_MACHINE_FEATURES = "vdu"
 
 BRANCH ?= "master"
 REPO ?= "git://github.com/Xilinx/vdu-firmware.git;protocol=https"
-SRCREV ?= "7c4662d0f5b514cbb0b9890bc3011d9450bf3661"
+SRCREV ?= "724de80630edcb87d865d69f1a6c0dc61c3f9f12"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index 1618bbcd..089888fe 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -1,3 +1,4 @@
+
 # Automatically determnine the version from the bb file
 ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'}"
 
@@ -15,8 +16,8 @@ ESW_REV[git] = "${AUTOREV}"
 ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01"
 ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2"
 ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a"
-ESW_REV[2023.2] = "73f0904e41cc109f18bb19a5329d0e5a66af2434"
-ESW_REV[2024.1] = "e367a6b8df2a30b12e5c88157afd98322a06c8a6"
+ESW_REV[2023.2] = "e847e1935dca630615e5f7dc694365a44b89699c"
+ESW_REV[2024.1] = "bd55a53c2e0bd9d27cd20a2660d14b0024aa8bb4"
 SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or 'INVALID'}"
 
 EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
index 75f94fbc..5b1b6d1d 100644
--- a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
@@ -1,4 +1,4 @@
-SRCREV = "7cb7aac7f570757b67bcd43aec67e0cda9f58b14"
+SRCREV = "dbf966453f3f1f06bc8b7f59a5dc3adabdc8f89f"
 XEN_URI = "git://github.com/Xilinx/xen.git;protocol=https"
 XEN_BRANCH = "xlnx_rebase_4.18"