500 files changed, 16788 insertions, 3670 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..bee8a64b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/README.booting.md b/README.booting.md
index 0f96a138..a632d7f9 100644
--- a/README.booting.md
+++ b/README.booting.md
@@ -5,10 +5,22 @@ AMD Xilinx Devices support different boot modes such as JTAG, SD, eMMC, QSPI etc
 ## Booting Images with QEMU
 
 Once images are built, you can simulate the image using QEMU emulator.
+
+> **Note:** Use `slirp` option if you don't have sudo permissions and tap devices
+  are enabled on your build host.
+
+* Without slirp
 ```
 $ MACHINE=<target_mahcine_name> runqemu nographic
 ```
 
+* With slirp
+```
+$ MACHINE=<target_mahcine_name> runqemu nographic slirp
+```
+
+> **Note:** To terminate qemu, usually the command is ctrl-a x
+
 ## Booting Images with Hardware
 
 Follow booting instructions [README](docs) for more details.
diff --git a/README.building.md b/README.building.md
index 45deadb9..28ba1b24 100644
--- a/README.building.md
+++ b/README.building.md
@@ -17,13 +17,22 @@ $ cd sources
 > **Note:**
 > * *release_branch:* refers to upstream stable release branch.
 > * *rel-version:* refers to amd xilinx release version.
+
 ```
 $ mkdir sources
 $ git clone -b <release-branch> https://git.yoctoproject.org/poky.git
 $ git clone -b <release-branch> https://git.openembedded.org/meta-openembedded.git
+$ git clone -b <release-branch> https://git.yoctoproject.org/git/meta-virtualization
 $ git clone -b <rel-version> https://github.com/Xilinx/meta-xilinx.git
 $ git clone -b <rel-version> https://github.com/Xilinx/meta-xilinx-tools.git
 ```
+> **Note:** When meta-xilinx layer is cloned using git tool by default it will
+> not clone [gen-machine-conf](https://github.com/Xilinx/gen-machine-conf.git)
+> repo as submodules, make sure this repo https://github.com/Xilinx/meta-xilinx.git
+> is cloned using `--recurse-submodules` option as shown.
+> `$ git clone -b <rel-version> https://github.com/Xilinx/meta-xilinx.git --recurse-submodules`
+> Skip this step if you are using yocto-manifests https://github.com/Xilinx/yocto-manifests
+
 3. Initialize a build environment using the `oe-init-build-env` script. 
 ```
 $ source poky/oe-init-build-env
@@ -39,6 +48,7 @@ $ bitbake-layers add-layer ./<path-to-layer>/meta-openembedded/meta-oe
 $ bitbake-layers add-layer ./<path-to-layer>/meta-openembedded/meta-python
 $ bitbake-layers add-layer ./<path-to-layer>/meta-openembedded/meta-filesystems
 $ bitbake-layers add-layer ./<path-to-layer>/meta-openembedded/meta-networking
+$ bitbake-layers add-layer ./<path-to-layer>/meta-virtualization
 $ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-microblaze
 $ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-xilinx-core
 $ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-xilinx-standalone
@@ -55,45 +65,47 @@ $ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx-tools
 ```
 MACHINE = "<target_machine_name>"
 ```
-Available target machines are:
-
-| Device     | target machines     |
-|------------|---------------------|
-| MicroBlaze | microblaze-generic  |
-|            | ac701-microblazeel  |
-|            | kc705-microblazeel  |
-|            | kcu105-microblazeel |
-|            | vcu118-microblazeel |
-| Zynq-7000  | zynq-generic        |
-|            | zc702-zynq7         |
-|            | zc706-zynq7         |
-| ZynqMP     | zynqmp-generic      |
-|            | zcu102-zynqmp       |
-|            | zcu104-zynqmp       |
-|            | zcu106-zynqmp       |
-|            | zcu111-zynqmp       |
-|            | zcu208-zynqmp       |
-|            | zcu216-zynqmp       |
-|            | zcu670-zynqmp       |
-|            | zcu1275-zynqmp      |
-|            | zcu1285-zynqmp      |
-|            | ultra96-zynqmp      |
-| Versal     | versal-generic      |
-|            | versal-net-generic  |
-|            | vck190-versal       |
-|            | vmk180-versal       |
-|            | vek280-versal       |
-|            | vpk120-versal       |
-|            | vpk180-versal       |
-|            | vhk158-versal       |
-
-6. Build an OS image for the target using `bitbake` command.
+* For list of available target machines see meta layer README files.
+
+ * [meta-xilinx-bsp README](https://github.com/Xilinx/meta-xilinx/tree/master/meta-xilinx-bsp#amd-xilinx-evaluation-boards-bsp-machines-files)
+ * [meta-kria README](https://github.com/Xilinx/meta-xilinx/tree/master/meta-xilinx-bsp#amd-xilinx-evaluation-boards-bsp-machines-files)
+
+6. For NFS build host system modify the build/conf/local.conf and add TMPDIR
+   path as shown below. On local storage $TMPDIR will be set to build/tmp
+```
+TMPDIR = "/tmp/$USER/yocto/release_version/build"
+```
+
+7. Modify the build/conf/local.conf file to add wic image to default target
+   image as shown below.
+```
+IMAGE_FSTYPES += "wic"
+WKS_FILES = "xilinx-default-sd.wks"
+```
+
+8. Build the qemu-helper-native package to setup QEMU network tap devices.
+```
+$ bitbake qemu-helper-native
+```
+
+9. Manually configure a tap interface for your build system. As root run
+   <path-to>/sources/poky/scripts/runqemu-gen-tapdevs, which should generate a
+   list of tap devices. Once tap interfaces are successfully create you should
+   be able to see all the interfaces by running ifconfig command.
+
+```
+$ sudo ./<path-to-layer>/poky/scripts/runqemu-gen-tapdevs $(id -u $USER) $(id -g $USER) 4 tmp/sysroots-components/x86_64/qemu-helper-native/usr/bin
+```
+
+10. Build an OS image for the target using `bitbake` command.
 > **Note:** Refer ./<path-to-distro-layer>/conf/templates/default/conf-notes.txt
-> for available target image-name. e.g. core-image-minimal
+> for available target image-name. e.g. core-image-minimal or petalinux-image-minimal
 
 ```
-$ bitbake <image-name>
+$ bitbake <target-image>
 ```
 
 7. Once complete the images for the target machine will be available in the output
    directory `${TMPDIR}/deploy/images/${MACHINE}/`.
+
+8. Follow [Booting Instructions](https://github.com/Xilinx/meta-xilinx/blob/master/README.booting.md)
diff --git a/docs/README.booting.microblaze.md b/docs/README.booting.microblaze.md
index 1ffcc3c8..91c0eda9 100644
--- a/docs/README.booting.microblaze.md
+++ b/docs/README.booting.microblaze.md
@@ -4,11 +4,16 @@ Booting OS images on MicroBlaze target boards can be done using JTAG and QSPI bo
 
 * [Setting Up the Target](#setting-up-the-target)
 * [Booting from JTAG](#booting-from-jtag)
-  * [Loading Bitstream using XSCT](#loading-bitstream-using-xsct)
-  * [Loading U-boot using XSCT](#loading-u-boot-using-xsct)
-  * [Loading Kernel, Device tree, Root Filesystem and U-boot boot script](#loading-kernel-device-tree-root-filesystem-and-u-boot-boot-script)
-    * [Using XSCT](#using-xsct)
-    * [Using TFTP](#using-tftp)
+  * [Sourcing the XSDB tools](#sourcing-the-xsdb-tools)
+  * [Deploying the images to target](#deploying-the-images-to-target)
+    * [Using devtool boot-jtag script](#using-devtool-boot-jtag-script)
+    * [Manually executing xsdb commands](#manually-executing-xsdb-commands)
+      * [Loading Bitstream using XSDB](#loading-bitstream-using-xsdb)
+      * [Loading U-boot using XSDB](#loading-u-boot-using-xsdb)
+      * [Loading Kernel, Device tree, Root Filesystem and U-boot boot script](#loading-kernel-device-tree-root-filesystem-and-u-boot-boot-script)
+        * [Using XSDB](#using-xsdb)
+        * [Using TFTP](#using-tftp)
+      * [Booting Linux](#booting-linux)
 
 ## Setting Up the Target
 
@@ -34,59 +39,79 @@ Booting OS images on MicroBlaze target boards can be done using JTAG and QSPI bo
 
 ## Booting from JTAG
 
-This boot flow requires the use of the AMD Xilinx tools, specifically XSCT and 
+This boot flow requires the use of the AMD Xilinx tools, specifically XSDB and
 the associated JTAG device drivers. This also requires access to the JTAG interface
 on the board, a number of AMD Xilinx and third-party boards come with on-board JTAG
 modules.
 
-1. Source the Vivado or Vitis tools `settings.sh` scripts.
-2. Power on the board, Open the XSCT console in the Vitis IDE by clicking the
-   XSCT button. Alternatively, you can also open the XSCT console by selecting
-   Xilinx -> XSCT Console.
+### Sourcing the XSDB tools
+
+Source the Vivado or Vitis tools `settings.sh` scripts.
+
+### Deploying the images to target
+
+Deploying the images can be done in two methods.
+
+#### Using devtool boot-jtag script
+
+1. Run devtool command to generate the boot-jtag.tcl script.
+```
+$ devtool boot-jtag --help
+$ devtool boot-jtag --image core-image-minimal --hw_server TCP:<hostname/ip-addr>:3121
+```
+2. Script will be generated under ${DEPLOY_DIR_IMAGE}/boot-jtag.tcl
+3. Execute this script using xsdb tool as shown below.
+```
+$ xsdb <absolute-path-to-deploy-dir-image>/boot-jtag.tcl
+```
+
+#### Manually executing xsdb commands
+
+1. Power on the board, Launch the XSDB shell from command line as shown below.
 ```
-$ xsct
+$ xsdb
 ```
-3. In the XSCT console, connect to the target over JTAG using the connect command.
+2. In the XSDB console, connect to the target over JTAG using the connect command.
    Optionally user can use `-url` to specify the local/remote hw_server. The 
    connect command returns the channel ID of the connection.
 ```
-xsct% connect
+xsdb% connect
 ```
-4. The targets command lists the available targets and allows you to select a
+3. The targets command lists the available targets and allows you to select a
    target using its ID. The targets are assigned IDs as they are discovered on
    the JTAG chain, so the IDs can change from session to session.
 ```
-xsct% targets
+xsdb% targets
 ```
 
 > **Note:** For non-interactive usage such as scripting, you can use the `-filter`
    option to select a target instead of selecting the target using its ID.
 
-### Loading Bitstream using XSCT
+##### Loading Bitstream using XSDB
 
-* Download the bitstream for the target using XSCT with the `fpga` command. Microblaze 
+* Download the bitstream for the target using XSDB with the `fpga` command. Microblaze
 bitstream will be located in the `${DEPLOY_DIR_IMAGE}` directory. Optionally user
 can use `fpga -no-revision-check` to skip FPGA silicon revision.
 
 ```
-xsct% fpga -no-revision-check ${DEPLOY_DIR_IMAGE}/system-${MACHINE}.bit
-xsct% after 2000
-xsct% targets -set -nocase -filter {name =~ "microblaze*#0"}
-xsct% catch {stop}
-xsct% after 1000
+xsdb% fpga -no-revision-check ${DEPLOY_DIR_IMAGE}/system-${MACHINE}.bit
+xsdb% after 2000
+xsdb% targets -set -nocase -filter {name =~ "microblaze*#0"}
+xsdb% catch {stop}
+xsdb% after 1000
 ```
-### Loading U-boot using XSCT
+##### Loading U-boot using XSDB
 
-1. Download `u-boot.elf` to the target CPU using XSCT. Microblaze u-boot.elf will be
+1. Download `u-boot.elf` to the target CPU using XSDB. Microblaze u-boot.elf will be
 located in the `${DEPLOY_DIR_IMAGE}` directory. Before u-boot.elf is loaded suspend
 the execution of active target using `stop` command.
 ```
-xsct% dow ${DEPLOY_DIR_IMAGE}/u-boot.elf
+xsdb% dow ${DEPLOY_DIR_IMAGE}/u-boot.elf
 ```
 2. After loading u-boot.elf resume the execution of active target using the `con`
-command in XSCT shell.
+command in XSDB shell.
 ```
-xsct% con
+xsdb% con
 ```
 3. In the target Serial Terminal, press any key to stop the U-Boot auto-boot.
 ```
@@ -95,7 +120,7 @@ Hit any key to stop autoboot: 0
 U-Boot>
 ```
 
-### Loading Kernel, Device tree, Root Filesystem and U-boot boot script
+##### Loading Kernel, Device tree, Root Filesystem and U-boot boot script
 
 Load the images into the target DDR/MIG load address i.e., 
 `DDR base address + <image_offset>`. MicroBlaze U-boot boot script(boot.scr) 
@@ -121,48 +146,50 @@ this process can take a long time to execute (more than 10 minutes). If your
 system has ethernet it is recommended that you use TFTP to load these images
 using U-Boot. 
 
-#### Using XSCT
+###### Using XSDB
 
-1. Suspend the execution of active target using `stop` command in XSCT.
+1. Suspend the execution of active target using `stop` command in XSDB.
 ```
-xsct% stop
+xsdb% stop
 ```
 2. Using the `dow` command to load the images into the target DDR/MIG
 load address.
 ```
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/linux.bin.ub 0x80000000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x81e00000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x82e00000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0xff200000
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/linux.bin.ub 0x80000000
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x81e00000
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x82e00000
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0xff200000
 ```
 
-#### Using TFTP
+###### Using TFTP
 
-1. Configure the `ipaddr` and `serverip` of the U-Boot environment. 
+1. Setup TFTP directory on host machine and copy the images to your TFTP directory
+   so that you can load them from U-Boot.
+2. Configure the `ipaddr` and `serverip` of the U-Boot environment.
 ```
 U-Boot> set serverip <server ip>
 U-Boot> set ipaddr <board ip>
 ```
-2. Load the images to DDR address. Make sure images are copied to tftp directory.
+3. Load the images to DDR address.
 ```
-U-Boot> tftpboot 0x80000000 ${TFTPDIR}/linux.bin.ub
-U-Boot> tftpboot 0x81e00000 ${TFTPDIR}/system.dtb
-U-Boot> tftpboot 0x82e00000 ${TFTPDIR}/core-image-minimal-${MACHINE}.cpio.gz.u-boot
-U-Boot> tftpboot 0xff200000 ${TFTPDIR}/boot.scr
+U-Boot> tftpboot 0x80000000 linux.bin.ub
+U-Boot> tftpboot 0x81e00000 system.dtb
+U-Boot> tftpboot 0x82e00000 core-image-minimal-${MACHINE}.cpio.gz.u-boot
+U-Boot> tftpboot 0xff200000 boot.scr
 ```
 
-### Booting Linux
+##### Booting Linux
 
 Once the images are loaded continue the execution.
 
 1. After loading images resume the execution of active target using the `con`
-command in XSCT shell, Skip step 1 for if you have used TFTP to load images.
+command in XSDB shell, Skip step 1 for if you have used TFTP to load images.
 ```
-xsct% con
+xsdb% con
 ```
-2. Terminate xsct shell.
+2. Terminate xsdb shell.
 ```
-xsct% exit
+xsdb% exit
 ```
 3. In the target Serial Terminal, from U-Boot prompt run `boot` command.
 ```
diff --git a/docs/README.booting.storage.md b/docs/README.booting.storage.md
index 4d33600d..2a1f66a7 100644
--- a/docs/README.booting.storage.md
+++ b/docs/README.booting.storage.md
@@ -22,7 +22,7 @@ This section describes how to manually prepare and populate an SD card image.
 There are automation tools in OpenEmbedded that can generate disk images already
 formatted and prepared such that they can be written directly to a disk. Refer
 to the Yocto Project Manual for more details:
-https://docs.yoctoproject.org/4.1.2/singleindex.html#creating-partitioned-images-using-wic
+https://docs.yoctoproject.org/4.1.4/singleindex.html#creating-partitioned-images-using-wic
 
 ## Writing image to SD or eMMC device
 
@@ -33,11 +33,17 @@ There are two ways to write the images to SD card or eMMC device.
 2. To write image to eMMC device make sure you need to boot Linux from JTAG or 
    SD or QSPI first, then copy the wic image to `<target_rootfs>/tmp` directory.
 
+> **Note:** `<target-image>` refers to core-image-minimal or petalinux-image-minimal
+
 ### Using Wic file
 
-Write wic image file to the SD card or eMMC device.
+Write wic image file to the SD card or eMMC device. Use dd command or balena
+etcher to flash the wic image file to SD card. WIC image will be
+build/tmp/deploy/${MACHINE}/<target-image>-${MACHINE}-${DATETIME}.rootfs.wic, See
+[Flashing Images Using bmaptool](https://docs.yoctoproject.org/singleindex.html#flashing-images-using-bmaptool)
+for fast and easy way to flash the image
 ```
-$ sudo dd if=xilinx-default-sd-${DATETIME}-sda.direct of=/dev/mmcblk<devnum> bs=4M 
+$ sudo dd if=<target-image>-${MACHINE}-${DATETIME}.rootfs.wic of=/dev/mmcblk<devnum> bs=4M
 ```
 
 ### Using Yocto images
@@ -65,12 +71,12 @@ $ 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}/core-image-minimal-${MACHINE}.cpio.gz.u-boot /mnt/boot/rootfs.cpio.gz.u-boot
+$ cp ${DEPLOY_DIR_IMAGE}/<target-image>-${MACHINE}-${DATETIME}.cpio.gz.u-boot /mnt/boot/rootfs.cpio.gz.u-boot
 ```
-4. Extract `core-image-minimal-${MACHINE}-${DATETIME}.rootfs.tar.gz` file content to the SD 
+4. Extract `<target-image>-${MACHINE}-${DATETIME}.rootfs.tar.gz` file content to the SD
    card or eMMC device EXT4 partition.
 ```
-$ sudo tar -xf ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}-${DATETIME}.rootfs.tar.gz -C /mnt/rootfs
+$ sudo tar -xf ${DEPLOY_DIR_IMAGE}/<target-image>-${MACHINE}-${DATETIME}.rootfs.tar.gz -C /mnt/rootfs
 $ sync
 ```
 5. Unmount the SD Card or eMMC device and boot from SD or eMMC boot modes.
@@ -97,10 +103,10 @@ $ sudo lsblk /dev/sd<X> -o NAME,FSTYPE,LABEL,PARTLABEL
 ```
 $ sudo mount -L root /mnt/rootfs` 
 ```
-3. Extract `core-image-minimal-${MACHINE}-${DATETIME}.rootfs.tar.gz` file content
+3. Extract `<target-image>-${MACHINE}-${DATETIME}.rootfs.tar.gz` file content
    to the USB or SATA device EXT4 partition.
 ```
-$ sudo tar -xf ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}-${DATETIME}.rootfs.tar.gz -C /mnt/rootfs
+$ sudo tar -xf ${DEPLOY_DIR_IMAGE}/<target-image>-${MACHINE}-${DATETIME}.rootfs.tar.gz -C /mnt/rootfs
 $ sync
 ```
 4. Unmount the USB or SATA device.
diff --git a/docs/README.booting.versal.md b/docs/README.booting.versal.md
index afdeba2b..ef817bf3 100644
--- a/docs/README.booting.versal.md
+++ b/docs/README.booting.versal.md
@@ -5,10 +5,15 @@ modes.
 
 * [Setting Up the Target](#setting-up-the-target)
 * [Booting from JTAG](#booting-from-jtag)
-  * [Loading boot.bin using XSCT](#loading-bootbin-using-xsct)
-  * [Loading Kernel, Root Filesystem and U-boot boot script](#loading-kernel-root-filesystem-and-u-boot-boot-script)
-    * [Using XSCT](#using-xsct)
-    * [Using TFTP](#using-tftp)
+  * [Sourcing the XSDB tools](#sourcing-the-xsdb-tools)
+  * [Deploying the images to target](#deploying-the-images-to-target)
+    * [Using devtool boot-jtag script](#using-devtool-boot-jtag-script)
+    * [Manually executing xsdb commands](#manually-executing-xsdb-commands)
+      * [Loading boot.bin using XSDB](#loading-bootbin-using-xsdb)
+      * [Loading Kernel, Root Filesystem and U-boot boot script](#loading-kernel-root-filesystem-and-u-boot-boot-script)
+        * [Using XSDB](#using-xsdb)
+        * [Using TFTP](#using-tftp)
+      * [Booting Linux](#booting-linux)
 * [Booting from SD](#booting-from-sd)
 * [Booting from QSPI](#booting-from-qspi)
 
@@ -37,37 +42,57 @@ modes.
 
 ## Booting from JTAG
 
-This boot flow requires the use of the AMD Xilinx tools, specifically XSCT and 
+This boot flow requires the use of the AMD Xilinx tools, specifically XSDB and
 the associated JTAG device drivers. This also requires access to the JTAG interface
 on the board, a number of AMD Xilinx and third-party boards come with on-board JTAG
 modules.
 
-1. Source the Vivado or Vitis tools `settings.sh` scripts.
-2. Power on the board, Open the XSCT console in the Vitis IDE by clicking the
-   XSCT button. Alternatively, you can also open the XSCT console by selecting
-   Xilinx -> XSCT Console.
+### Sourcing the XSDB tools
+
+Source the Vivado or Vitis tools `settings.sh` scripts.
+
+### Deploying the images to target
+
+Deploying the images can be done in two methods.
+
+#### Using devtool boot-jtag script
+
+1. Run devtool command to generate the boot-jtag.tcl script.
+```
+$ devtool boot-jtag --help
+$ devtool boot-jtag --image core-image-minimal --hw_server TCP:<hostname/ip-addr>:3121
+```
+2. Script will be generated under ${DEPLOY_DIR_IMAGE}/boot-jtag.tcl
+3. Execute this script using xsdb tool as shown below.
+```
+$ xsdb <absolute-path-to-deploy-dir-image>/boot-jtag.tcl
+```
+
+#### Manually executing xsdb commands
+
+1. Power on the board, Launch the XSDB shell from command line as shown below.
 ```
-$ xsct
+$ xsdb
 ```
-3. In the XSCT console, connect to the target over JTAG using the connect command.
+2. In the XSDB console, connect to the target over JTAG using the connect command.
    Optionally user can use `-url` to specify the local/remote hw_server. The 
    connect command returns the channel ID of the connection.
 ```
-xsct% connect
+xsdb% connect
 ```
-4. The targets command lists the available targets and allows you to select a
+3. The targets command lists the available targets and allows you to select a
    target using its ID. The targets are assigned IDs as they are discovered on
    the JTAG chain, so the IDs can change from session to session.
 ```
-xsct% targets
+xsdb% targets
 ```
 
 > **Note:** For non-interactive usage such as scripting, you can use the `-filter`
    option to select a target instead of selecting the target using its ID.
 
-### Loading boot.bin using XSCT
+##### Loading boot.bin using XSDB
 
-1. Download the boot.bin for the target using XSCT with the `device program` command.
+1. Download the boot.bin for the target using XSDB with the `device program` command.
 Versal boot.bin will be located in the `${DEPLOY_DIR_IMAGE}` directory. Default
 boot.bin consists of boot pdi, plm.elf, psm.elf, bl31.elf, u-boot.elf and 
 system.dtb. This boot.bin is generated using bootgen tool by passing a .bif file.
@@ -76,15 +101,15 @@ system.dtb. This boot.bin is generated using bootgen tool by passing a .bif file
 > u-boot and kernel.
 
 ```
-xsct% targets -set -nocase -filter {name =~ "*PMC*"}
-xsct% device program ${DEPLOY_DIR_IMAGE}/boot.bin
-xsct% targets -set -nocase -filter {name =~ "*A72*#0"}
-xsct% stop
+xsdb% targets -set -nocase -filter {name =~ "*PMC*"}
+xsdb% device program ${DEPLOY_DIR_IMAGE}/boot.bin
+xsdb% targets -set -nocase -filter {name =~ "*A72*#0"}
+xsdb% stop
 ```
 2. After loading boot.bin resume the execution of active target using the `con`
-command in XSCT shell.
+command in XSDB shell.
 ```
-xsct% con
+xsdb% con
 ```
 3. In the target Serial Terminal, press any key to stop the U-Boot auto-boot.
 ```
@@ -93,7 +118,7 @@ Hit any key to stop autoboot: 0
 U-Boot>
 ```
 
-### Loading Kernel, Root Filesystem and U-boot boot script
+##### Loading Kernel, Root Filesystem and U-boot boot script
 
 Load the images into the target DDR/PL DRR load address i.e.,
 `DDR base address + <image_offset>`. 
@@ -119,49 +144,51 @@ using U-Boot.
 > 4. If common ${DEPLOY_DIR_IMAGE}/system.dtb is used by u-boot and kernel, this
 > is already part of boot.bin we can skip loading dtb, else load kernel dtb.
 
-#### Using XSCT
+###### Using XSDB
 
-1. Suspend the execution of active target using `stop` command in XSCT.
+1. Suspend the execution of active target using `stop` command in XSDB.
 ```
-xsct% stop
+xsdb% stop
 ```
 2. Using the `dow` command to load the images into the target DDR/PL DDR load 
    address.
 ```
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/Image 0x200000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x1000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x4000000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0x20000000
-xsct% 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
+xsdb% targets -set -nocase -filter {name =~ "*A72*#0"}
 ```
 
-#### Using TFTP
+###### Using TFTP
 
-1. Configure the `ipaddr` and `serverip` of the U-Boot environment. 
+1. Setup TFTP directory on host machine and copy the images to your TFTP directory
+   so that you can load them from U-Boot.
+2. Configure the `ipaddr` and `serverip` of the U-Boot environment.
 ```
 Versal> set serverip <server ip>
 Versal> set ipaddr <board ip>
 ```
-2. Load the images to DDR address. Make sure images are copied to tftp directory.
+3. Load the images to DDR address.
 ```
-U-Boot> tftpboot 0x200000 ${TFTPDIR}/Image
-U-Boot> tftpboot 0x1000 ${TFTPDIR}/system.dtb
-U-Boot> tftpboot 0x4000000 ${TFTPDIR}/core-image-minimal-${MACHINE}.cpio.gz.u-boot
-U-Boot> tftpboot 0x20000000 ${TFTPDIR}/boot.scr
+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
 
 ```
-### Booting Linux
+##### Booting Linux
 
 Once the images are loaded continue the execution.
 
 1. After loading images resume the execution of active target using the `con`
-command in XSCT shell, Skip step 1 for if you have used TFTP to load images.
+command in XSDB shell, Skip step 1 for if you have used TFTP to load images.
 ```
-xsct% con
+xsdb% con
 ```
-2. Terminate xsct shell.
+2. Terminate xsdb shell.
 ```
-xsct% exit
+xsdb% exit
 ```
 3. In the target Serial Terminal, from U-Boot prompt run `boot` command.
 ```
@@ -181,9 +208,9 @@ U-Boot> boot
    card (part number: X_EBM-01, REV_A01).
 2. With the card powered off, install the QSPI daughter card.
 3. Power on the VCK190 board and boot using JTAG or SD boot mode, to ensure that
-   U-Boot is running and also have boot.bin copied to DDR location using XSCT
+   U-Boot is running and also have boot.bin copied to DDR location using XSDB
    `dow` or `tftpboot` or `fatload` command.
 4. Follow Flash boot instructions [README](README.booting.flash.md) for more details.
 5. After flashing the images, turn off the power switch on the board, and change
    the SW1 boot mode pin settings to QSPI boot mode (1-ON, 2-OFF, 3-ON, 4-ON) by
-   setting the SW1. Refer [Setting Up the Target](#setting-up-the-target).
\ No newline at end of file
+   setting the SW1. Refer [Setting Up the Target](#setting-up-the-target).
diff --git a/docs/README.booting.zynq.md b/docs/README.booting.zynq.md
index a9b6e8f3..28aad78f 100644
--- a/docs/README.booting.zynq.md
+++ b/docs/README.booting.zynq.md
@@ -5,10 +5,15 @@ boot modes.
 
 * [Setting Up the Target](#setting-up-the-target)
 * [Booting from JTAG](#booting-from-jtag)
-  * [Loading boot components using XSCT](#loading-boot-components-using-xsct)
-  * [Loading Kernel, Root Filesystem and U-boot boot script](#loading-kernel-root-filesystem-and-u-boot-boot-script)
-    * [Using XSCT](#using-xsct)
-    * [Using TFTP](#using-tftp)
+  * [Sourcing the XSDB tools](#sourcing-the-xsdb-tools)
+  * [Deploying the images to target](#deploying-the-images-to-target)
+    * [Using devtool boot-jtag script](#using-devtool-boot-jtag-script)
+    * [Manually executing xsdb commands](#manually-executing-xsdb-commands)
+      * [Loading boot components using XSDB](#loading-boot-components-using-xsdb)
+      * [Loading Kernel, Root Filesystem and U-boot boot script](#loading-kernel-root-filesystem-and-u-boot-boot-script)
+        * [Using XSDB](#using-xsdb)
+        * [Using TFTP](#using-tftp)
+      * [Booting Linux](#booting-linux)
 * [Booting from SD](#booting-from-sd)
 * [Booting from QSPI](#booting-from-qspi)
 
@@ -35,37 +40,58 @@ boot modes.
 ---
 ## Booting from JTAG
 
-This boot flow requires the use of the AMD Xilinx tools, specifically XSCT and 
+This boot flow requires the use of the AMD Xilinx tools, specifically XSDB and
 the associated JTAG device drivers. This also requires access to the JTAG interface
 on the board, a number of AMD Xilinx and third-party boards come with on-board JTAG
 modules.
 
-1. Source the Vivado or Vitis tools `settings.sh` scripts.
-2. Power on the board, Open the XSCT console in the Vitis IDE by clicking the
-   XSCT button. Alternatively, you can also open the XSCT console by selecting
-   Xilinx -> XSCT Console.
+### Sourcing the XSDB tools
+
+Source the Vivado or Vitis tools `settings.sh` scripts.
+
+### Deploying the images to target
+
+Deploying the images can be done in two methods.
+
+#### Using devtool boot-jtag script
+
+1. Run devtool command to generate the boot-jtag.tcl script.
+```
+$ devtool boot-jtag --help
+$ devtool boot-jtag --image core-image-minimal --hw_server TCP:<hostname/ip-addr>:3121
+```
+2. Script will be generated under ${DEPLOY_DIR_IMAGE}/boot-jtag.tcl
+3. Execute this script using xsdb tool as shown below.
 ```
-$ xsct
+$ xsdb <absolute-path-to-deploy-dir-image>/boot-jtag.tcl
 ```
-3. In the XSCT console, connect to the target over JTAG using the connect command.
+
+#### Manually executing xsdb commands
+
+1. Power on the board, Launch the XSDB shell from command line as shown below.
+```
+$ xsdb
+```
+2. In the XSDB console, connect to the target over JTAG using the connect command.
    Optionally user can use `-url` to specify the local/remote hw_server. The 
    connect command returns the channel ID of the connection.
 ```
-xsct% connect
+xsdb% connect
 ```
-4. The targets command lists the available targets and allows you to select a
+3. The targets command lists the available targets and allows you to select a
    target using its ID. The targets are assigned IDs as they are discovered on
    the JTAG chain, so the IDs can change from session to session.
 ```
-xsct% targets
+xsdb% targets
 ```
 
 > **Note:** For non-interactive usage such as scripting, you can use the `-filter`
    option to select a target instead of selecting the target using its ID.
+
 ---
-### Loading boot components using XSCT
+##### Loading boot components using XSDB
 
-1. Download the boot images for the target using XSCT with the `fpga` and `dow` 
+1. Download the boot images for the target using XSDB with the `fpga` and `dow`
    command. Zynq boot images will be located in the `${DEPLOY_DIR_IMAGE}`
    directory. 
 
@@ -74,24 +100,24 @@ xsct% targets
 
 2. Program the bitstream or skip this step if you are loading from u-boot or linux.
 ```
-xsct% fpga -no-revision-check ${DEPLOY_DIR_IMAGE}/download.bit
+xsdb% fpga -no-revision-check ${DEPLOY_DIR_IMAGE}/download.bit
 ```
 3. Select APU Cortex-A9 Core 0 to load and execute FSBL.
 ```
-xsct% targets -set -nocase -filter {name =~ "arm*#0"}
-xsct% catch {stop}
+xsdb% targets -set -nocase -filter {name =~ "arm*#0"}
+xsdb% catch {stop}
 ```
 5. Download and run FSBL from APU Cortex-A9 Core 0
 ```
-xsct% dow ${DEPLOY_DIR_IMAGE}/zynq_fsbl.elf
-xsct% con
+xsdb% dow ${DEPLOY_DIR_IMAGE}/zynq_fsbl.elf
+xsdb% con
 ```
 7. Now download U-boot.elf and Device tree to APU and execute.
 ```
-xsct% stop
-xsct% dow ${DEPLOY_DIR_IMAGE}/u-boot.elf
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x100000
-xsct% con
+xsdb% stop
+xsdb% dow ${DEPLOY_DIR_IMAGE}/u-boot.elf
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x100000
+xsdb% con
 ```
 
 8. In the target Serial Terminal, press any key to stop the U-Boot auto-boot.
@@ -101,7 +127,7 @@ Hit any key to stop autoboot: 0
 U-Boot>
 ```
 ---
-### Loading Kernel, Root Filesystem and U-boot boot script
+##### Loading Kernel, Root Filesystem and U-boot boot script
 
 Load the images into the target DDR load address i.e.,
 `DDR base address + <image_offset>`. 
@@ -127,53 +153,56 @@ using U-Boot.
 > 4. If common ${DEPLOY_DIR_IMAGE}/system.dtb is used by u-boot and kernel, this
 > is already part of boot.bin we can skip loading dtb, else load kernel dtb.
 ---
-#### Using XSCT
+###### Using XSDB
 
-1. Suspend the execution of active target using `stop` command in XSCT.
+1. Suspend the execution of active target using `stop` command in XSDB.
 ```
-xsct% stop
+xsdb% stop
 ```
 2. Using the `dow` command to load the images into the target DDR/PL DDR load 
    address.
 ```
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/uImage 0x200000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x100000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x4000000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0x3000000
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/uImage 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 0x3000000
 ```
 ---
-#### Using TFTP
+###### Using TFTP
 
-1. Configure the `ipaddr` and `serverip` of the U-Boot environment. 
+1. Setup TFTP directory on host machine and copy the images to your TFTP directory
+   so that you can load them from U-Boot.
+2. Configure the `ipaddr` and `serverip` of the U-Boot environment.
 ```
 Versal> set serverip <server ip>
 Versal> set ipaddr <board ip>
 ```
-2. Load the images to DDR address. Make sure images are copied to tftp directory.
+3. Load the images to DDR address.
 ```
-U-Boot> tftpboot 0x200000 ${TFTPDIR}/uImage
-U-Boot> tftpboot 0x100000 ${TFTPDIR}/system.dtb
-U-Boot> tftpboot 0x4000000 ${TFTPDIR}/core-image-minimal-${MACHINE}.cpio.gz.u-boot
-U-Boot> tftpboot 0x3000000 ${TFTPDIR}/boot.scr
+U-Boot> tftpboot 0x200000 uImage
+U-Boot> tftpboot 0x100000 system.dtb
+U-Boot> tftpboot 0x4000000 core-image-minimal-${MACHINE}.cpio.gz.u-boot
+U-Boot> tftpboot 0x3000000 boot.scr
 ```
 ---
-### Booting Linux
+##### Booting Linux
 
 Once the images are loaded continue the execution.
 
 1. After loading images resume the execution of active target using the `con`
-command in XSCT shell, Skip step 1 for if you have used TFTP to load images.
+command in XSDB shell, Skip step 1 for if you have used TFTP to load images.
 ```
-xsct% con
+xsdb% con
 ```
-2. Terminate xsct shell.
+2. Terminate xsdb shell.
 ```
-xsct% exit
+xsdb% exit
 ```
 3. In the target Serial Terminal, from U-Boot prompt run `boot` command.
 ```
 U-Boot> boot
 ```
+
 ---
 ## Booting from SD
 
@@ -181,14 +210,15 @@ U-Boot> boot
 2. Configure the ZC702 board to boot in SD-Boot mode (1-OFF, 2-OFF, 3-ON, 4-ON, 5-OFF)
    by setting the SW6. Refer [Setting Up the Target](#setting-up-the-target).
 3. Follow SD boot instructions [README](README.booting.storage.md) for more details.
+
 ---
 ## Booting from QSPI
 
 1. To boot ZC702 board in QSPI boot mode, Power on the ZCU102 board and boot 
    using JTAG or SD boot mode, to ensure that U-Boot is running and also have 
-   boot.bin copied to DDR location using XSCT `dow` or `tftpboot` or `fatload`
+   boot.bin copied to DDR location using XSDB `dow` or `tftpboot` or `fatload`
    command.
 2. Follow Flash boot instructions [README](README.booting.flash.md) for more details.
 3. After flashing the images, turn off the power switch on the board, and change
    the SW16 boot mode pin settings to QSPI boot mode (1-OFF, 2-ON, 3-OFF, 4-OFF, 5-OFF)
-   by setting the SW16. Refer [Setting Up the Target](#setting-up-the-target).
\ No newline at end of file
+   by setting the SW16. Refer [Setting Up the Target](#setting-up-the-target).
diff --git a/docs/README.booting.zynqmp.md b/docs/README.booting.zynqmp.md
index c8f8aa21..80e6d5ae 100644
--- a/docs/README.booting.zynqmp.md
+++ b/docs/README.booting.zynqmp.md
@@ -5,10 +5,15 @@ NAND boot modes.
 
 * [Setting Up the Target](#setting-up-the-target)
 * [Booting from JTAG](#booting-from-jtag)
-  * [Loading boot components using XSCT](#loading-boot-components-using-xsct)
-  * [Loading Kernel, Root Filesystem and U-boot boot script](#loading-kernel-root-filesystem-and-u-boot-boot-script)
-    * [Using XSCT](#using-xsct)
-    * [Using TFTP](#using-tftp)
+  * [Sourcing the XSDB tools](#sourcing-the-xsdb-tools)
+  * [Deploying the images to target](#deploying-the-images-to-target)
+    * [Using devtool boot-jtag script](#using-devtool-boot-jtag-script)
+    * [Manually executing xsdb commands](#manually-executing-xsdb-commands)
+      * [Loading boot components using XSDB](#loading-boot-components-using-xsdb)
+      * [Loading Kernel, Root Filesystem and U-boot boot script](#loading-kernel-root-filesystem-and-u-boot-boot-script)
+        * [Using XSDB](#using-xsdb)
+        * [Using TFTP](#using-tftp)
+      * [Booting Linux](#booting-linux)
 * [Booting from SD](#booting-from-sd)
 * [Booting from QSPI](#booting-from-qspi)
 
@@ -34,37 +39,57 @@ NAND boot modes.
 
 ## Booting from JTAG
 
-This boot flow requires the use of the AMD Xilinx tools, specifically XSCT and 
+This boot flow requires the use of the AMD Xilinx tools, specifically XSDB and
 the associated JTAG device drivers. This also requires access to the JTAG interface
 on the board, a number of AMD Xilinx and third-party boards come with on-board JTAG
 modules.
 
-1. Source the Vivado or Vitis tools `settings.sh` scripts.
-2. Power on the board, Open the XSCT console in the Vitis IDE by clicking the
-   XSCT button. Alternatively, you can also open the XSCT console by selecting
-   Xilinx -> XSCT Console.
+### Sourcing the XSDB tools
+
+Source the Vivado or Vitis tools `settings.sh` scripts.
+
+### Deploying the images to target
+
+Deploying the images can be done in two methods.
+
+#### Using devtool boot-jtag script
+
+1. Run devtool command to generate the boot-jtag.tcl script.
+```
+$ devtool boot-jtag --help
+$ devtool boot-jtag --image core-image-minimal --hw_server TCP:<hostname/ip-addr>:3121
+```
+2. Script will be generated under ${DEPLOY_DIR_IMAGE}/boot-jtag.tcl
+3. Execute this script using xsdb tool as shown below.
+```
+$ xsdb <absolute-path-to-deploy-dir-image>/boot-jtag.tcl
+```
+
+#### Manually executing xsdb commands
+
+1. Power on the board, Launch the XSDB shell from command line as shown below.
 ```
-$ xsct
+$ xsdb
 ```
-3. In the XSCT console, connect to the target over JTAG using the connect command.
+2. In the XSDB console, connect to the target over JTAG using the connect command.
    Optionally user can use `-url` to specify the local/remote hw_server. The 
    connect command returns the channel ID of the connection.
 ```
-xsct% connect
+xsdb% connect
 ```
-4. The targets command lists the available targets and allows you to select a
+3. The targets command lists the available targets and allows you to select a
    target using its ID. The targets are assigned IDs as they are discovered on
    the JTAG chain, so the IDs can change from session to session.
 ```
-xsct% targets
+xsdb% targets
 ```
 
 > **Note:** For non-interactive usage such as scripting, you can use the `-filter`
    option to select a target instead of selecting the target using its ID.
 
-### Loading boot components using XSCT
+##### Loading boot components using XSDB
 
-1. Download the boot images for the target using XSCT with the `fpga` and `dow` 
+1. Download the boot images for the target using XSDB with the `fpga` and `dow`
    command. ZyqnMP boot images will be located in the `${DEPLOY_DIR_IMAGE}`
    directory. 
 
@@ -73,43 +98,43 @@ xsct% targets
 
 2. Program the bitstream or skip this step if you are loading from u-boot or linux.
 ```
-xsct% fpga -no-revision-check ${DEPLOY_DIR_IMAGE}/download.bit
+xsdb% fpga -no-revision-check ${DEPLOY_DIR_IMAGE}/download.bit
 ```
 3. By default, JTAG security gates are enabled. Disable the security gates for 
    DAP, PL TAP, and PMU (this makes the PMU MB target visible to the debugger).
 ```
-xsct% targets -set -nocase -filter {name =~ "*PSU*"}
-xsct% mask_write 0xFFCA0038 0x1C0 0x1C0
+xsdb% targets -set -nocase -filter {name =~ "*PSU*"}
+xsdb% mask_write 0xFFCA0038 0x1C0 0x1C0
 ```
 3. Verify if the PMU MB target is listed under the PMU device. Now, load the PMU
    firmware.
 ```
-xsct% targets -set -nocase -filter {name =~ "*MicroBlaze PMU*"}
-xsct% catch {stop}
-xsct% dow ${DEPLOY_DIR_IMAGE}/pmufw.elf
-xsct% con
+xsdb% targets -set -nocase -filter {name =~ "*MicroBlaze PMU*"}
+xsdb% catch {stop}
+xsdb% dow ${DEPLOY_DIR_IMAGE}/pmufw.elf
+xsdb% con
 ```
 5. Reset APU Cortex-A53 Core 0 to load and execute FSBL, This step is important, 
    because when the ZynqMP boots up in JTAG boot mode, all the APU and RPU cores
    are held in reset. You must clear the resets on each core before performing 
-   debugging on these cores. You can use the `rst` command in XSCT to clear the
+   debugging on these cores. You can use the `rst` command in XSDB to clear the
    resets.
 ```
-xsct% targets -set -nocase -filter {name =~ "*A53*#0"}
-xsct% rst -processor -clear-registers
+xsdb% targets -set -nocase -filter {name =~ "*A53*#0"}
+xsdb% rst -processor -clear-registers
 ```
 6. Download and run FSBL from APU Cortex-A53 Core 0
 ```
-xsct% dow ${DEPLOY_DIR_IMAGE}/zynqmp_fsbl.elf
-xsct% con
+xsdb% dow ${DEPLOY_DIR_IMAGE}/zynqmp_fsbl.elf
+xsdb% con
 ```
 7. Now download TF-A, U-boot.elf and Device tree to APU and execute.
 ```
-xsct% stop
-xsct% dow ${DEPLOY_DIR_IMAGE}/bl31.elf
-xsct% dow ${DEPLOY_DIR_IMAGE}/u-boot.elf
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x100000
-xsct% con
+xsdb% stop
+xsdb% dow ${DEPLOY_DIR_IMAGE}/bl31.elf
+xsdb% dow ${DEPLOY_DIR_IMAGE}/u-boot.elf
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x100000
+xsdb% con
 ```
 
 8. In the target Serial Terminal, press any key to stop the U-Boot auto-boot.
@@ -119,7 +144,7 @@ Hit any key to stop autoboot: 0
 U-Boot>
 ```
 
-### Loading Kernel, Root Filesystem and U-boot boot script
+##### Loading Kernel, Root Filesystem and U-boot boot script
 
 Load the images into the target DDR/PL DRR load address i.e.,
 `DDR base address + <image_offset>`. 
@@ -145,48 +170,50 @@ using U-Boot.
 > 4. If common ${DEPLOY_DIR_IMAGE}/system.dtb is used by u-boot and kernel, this
 > is already part of boot.bin we can skip loading dtb, else load kernel dtb.
 
-#### Using XSCT
+###### Using XSDB
 
-1. Suspend the execution of active target using `stop` command in XSCT.
+1. Suspend the execution of active target using `stop` command in XSDB.
 ```
-xsct% stop
+xsdb% stop
 ```
 2. Using the `dow` command to load the images into the target DDR/PL DDR load 
    address.
 ```
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/Image 0x200000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x100000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x4000000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0x20000000
+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
 ```
 
-#### Using TFTP
+###### Using TFTP
 
-1. Configure the `ipaddr` and `serverip` of the U-Boot environment. 
+1. Setup TFTP directory on host machine and copy the images to your TFTP directory
+   so that you can load them from U-Boot.
+2. Configure the `ipaddr` and `serverip` of the U-Boot environment.
 ```
-Versal> set serverip <server ip>
-Versal> set ipaddr <board ip>
+ZynqMP> set serverip <host-server-ip-address>
+ZynqMP> set ipaddr <board-ip-address>
 ```
-2. Load the images to DDR address. Make sure images are copied to tftp directory.
+3. Load the images to DDR address.
 ```
-U-Boot> tftpboot 0x200000 ${TFTPDIR}/Image
-U-Boot> tftpboot 0x100000 ${TFTPDIR}/system.dtb
-U-Boot> tftpboot 0x4000000 ${TFTPDIR}/core-image-minimal-${MACHINE}.cpio.gz.u-boot
-U-Boot> tftpboot 0x20000000 ${TFTPDIR}/boot.scr
+U-Boot> tftpboot 0x200000 Image
+U-Boot> tftpboot 0x100000 system.dtb
+U-Boot> tftpboot 0x4000000 core-image-minimal-${MACHINE}.cpio.gz.u-boot
+U-Boot> tftpboot 0x20000000 boot.scr
 
 ```
-### Booting Linux
+##### Booting Linux
 
 Once the images are loaded continue the execution.
 
 1. After loading images resume the execution of active target using the `con`
-command in XSCT shell, Skip step 1 for if you have used TFTP to load images.
+command in XSDB shell, Skip step 1 for if you have used TFTP to load images.
 ```
-xsct% con
+xsdb% con
 ```
-2. Terminate xsct shell.
+2. Terminate xsdb shell.
 ```
-xsct% exit
+xsdb% exit
 ```
 3. In the target Serial Terminal, from U-Boot prompt run `boot` command.
 ```
@@ -204,9 +231,9 @@ U-Boot> boot
 
 1. To boot ZCU012 board in QSPI boot mode, Power on the ZCU102 board and boot 
    using JTAG or SD boot mode, to ensure that U-Boot is running and also have 
-   boot.bin copied to DDR location using XSCT `dow` or `tftpboot` or `fatload`
+   boot.bin copied to DDR location using XSDB `dow` or `tftpboot` or `fatload`
    command.
 2. Follow Flash boot instructions [README](README.booting.flash.md) for more details.
 3. After flashing the images, turn off the power switch on the board, and change
    the SW6 boot mode pin settings to QSPI boot mode (1-ON, 2-ON, 3-OFF, 4-ON) by
-   setting the SW6. Refer [Setting Up the Target](#setting-up-the-target).
\ No newline at end of file
+   setting the SW6. Refer [Setting Up the Target](#setting-up-the-target).
diff --git a/docs/README.dfx.user.dts.md b/docs/README.dfx.user.dts.md
index 69e1e52b..724c1692 100644
--- a/docs/README.dfx.user.dts.md
+++ b/docs/README.dfx.user.dts.md
@@ -16,11 +16,12 @@ following use cases.
 > **Note:** Refer https://github.com/Xilinx/dfx-mgr/blob/master/README.md for
 > shell.json and accel.json file content.
 
-* **Zynq-7000 and ZynqMP**:
-  * Design: Vivado flat design.
-    * Input files to firmware recipes: .bit, .dtsi or dtbo and shell.json (optional)
+* **Zynq 7000, ZynqMP and Versal**:
+  * Design: Vivado flat or Segmented Configuration design.
+    * Input files to firmware recipes: .bit or .bin or _pld.pdi, .dtsi or dtbo and shell.json (optional)
     * Usage Examples:
 ```
+# Zynq 7000 or ZynqMP flat design
 SRC_URI = " \
     file://<flat_design_pl>.bit \
     file://<flat_design_pl>.dtsi \
@@ -29,6 +30,7 @@ SRC_URI = " \
 ```
 
 ```
+# Zynq 7000 or ZynqMP flat design
 SRC_URI = " \
     file://<flat_design_pl>.bit \
     file://<flat_design_pl>.dtbo \
@@ -36,9 +38,69 @@ SRC_URI = " \
     "
 ```
 
+```
+# Zynq 7000 or ZynqMP flat design
+SRC_URI = " \
+    file://<flat_design_pl>.bin \
+    file://<flat_design_pl>.dtsi \
+    file://shell.json \
+    "
+```
+
+```
+# Zynq 7000 or ZynqMP flat design
+SRC_URI = " \
+    file://<flat_design_pl>.bin \
+    file://<flat_design_pl>.dtbo \
+    file://shell.json \
+    "
+```
+
+```
+# Zynq 7000 or ZynqMP flat design
+SRC_URI = " \
+    file://<flat_design_pl>.bit \
+    file://shell.json \
+    "
+```
+
+```
+# Zynq 7000 or ZynqMP flat design
+SRC_URI = " \
+    file://<flat_design_pl>.bin \
+    file://shell.json \
+    "
+```
+
+```
+# Versal Segmented Configuration design
+SRC_URI = " \
+    file://<flat_design>_pld.pdi \
+    file://<flat_design>_pld.dtsi \
+    file://shell.json \
+    "
+```
+
+```
+# Versal Segmented Configuration design
+SRC_URI = " \
+    file://<flat_design>_pld.pdi \
+    file://<flat_design>_pld.dtbo \
+    file://shell.json \
+    "
+```
+
+```
+# Versal Segmented Configuration design
+SRC_URI = " \
+    file://<flat_design>_pld.pdi \
+    file://shell.json \
+    "
+```
+
 * **ZynqMP and Versal**:
   * Design: Vivado DFx design.
-    * Input files to firmware recipes: .bit(ZynqMP) or .pdi(Versal), .dtsi or dtbo
+    * Input files to firmware recipes: .bit/bin(ZynqMP) or .pdi(Versal), .dtsi or dtbo
       shell.json or accel.json (optional) and .xclbin (optional).
     * Usage Examples:
 
@@ -63,6 +125,44 @@ SRC_URI = " \
 ```
 
 ```
+# ZynqMP DFx Static
+SRC_URI = " \
+    file://<dfx_design_static_pl>.bin \
+    file://<dfx_design_static_pl>.dtsi \
+    file://shell.json \
+    file://<dfx_design_static_pl>.xclbin \
+    "
+```
+
+```
+# ZynqMP DFx Static
+SRC_URI = " \
+    file://<dfx_design_static_pl>.bin \
+    file://<dfx_design_static_pl>.dtbo \
+    file://shell.json \
+    file://<dfx_design_static_pl>.xclbin \
+    "
+```
+
+```
+# ZynqMP DFx Static
+SRC_URI = " \
+    file://<dfx_design_static_pl>.bit \
+    file://shell.json \
+    file://<dfx_design_static_pl>.xclbin \
+    "
+```
+
+```
+# ZynqMP DFx Static
+SRC_URI = " \
+    file://<dfx_design_static_pl>.bin \
+    file://shell.json \
+    file://<dfx_design_static_pl>.xclbin \
+    "
+```
+
+```
 # ZynqMP DFx RP
 SRC_URI = " \
     file://<dfx_design_rp_rm_pl>.bit \
@@ -81,6 +181,45 @@ SRC_URI = " \
     file://<dfx_design_rp_rm_pl>.xclbin \
     "
 ```
+
+```
+# ZynqMP DFx RP
+SRC_URI = " \
+    file://<dfx_design_rp_rm_pl>.bin \
+    file://<dfx_design_rp_rm_pl>.dtsi \
+    file://accel.json \
+    file://<dfx_design_rp_rm_pl>.xclbin \
+    "
+```
+
+```
+# ZynqMP DFx RP
+SRC_URI = " \
+    file://<dfx_design_rp_rm_pl>.bin \
+    file://<dfx_design_rp_rm_pl>.dtbo \
+    file://accel.json \
+    file://<dfx_design_rp_rm_pl>.xclbin \
+    "
+```
+
+```
+# ZynqMP DFx RP
+SRC_URI = " \
+    file://<dfx_design_rp_rm_pl>.bit \
+    file://accel.json \
+    file://<dfx_design_rp_rm_pl>.xclbin \
+    "
+```
+
+```
+# ZynqMP DFx RP
+SRC_URI = " \
+    file://<dfx_design_rp_rm_pl>.bin \
+    file://accel.json \
+    file://<dfx_design_rp_rm_pl>.xclbin \
+    "
+```
+
 ```
 # Versal DFx Static
 SRC_URI = " \
@@ -102,6 +241,15 @@ SRC_URI = " \
 ```
 
 ```
+# Versal DFx Static
+SRC_URI = " \
+    file://<dfx_design_static_pl>.pdi \
+    file://shell.json \
+    file://<dfx_design_static_pl>.xclbin \
+    "
+```
+
+```
 # Versal DFx RP
 SRC_URI = " \
     file://<dfx_design_rp_rm_pl>.pdi \
@@ -120,16 +268,29 @@ SRC_URI = " \
     file://<dfx_design_rp_rm_pl>.xclbin \
     "
 ```
+
+```
+# Versal DFx RP
+SRC_URI = " \
+    file://<dfx_design_rp_rm_pl>.pdi \
+    file://accel.json \
+    file://<dfx_design_rp_rm_pl>.xclbin \
+    "
+```
 ---
 
 ## How to create a firmware recipe app
 
-1. Follow [Building Instructions](../README.building.md) upto step 4.
-2. Create recipes-firmware directory in meta layer and copy the .bit/pdi,
+1. Follow SDT or XSCT Build instructions whichever build method is used but not
+   both.
+    a. [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md) upto step 4.
+    b. [XSCT Building Instructions](../README.building.md)
+       upto step 4.b (With SDT overlay).
+2. Create recipes-firmware directory in meta layer and copy the .bit/bin/pdi,
    .dtsi/dtbo, .json and .xclbin file to these directories.
 ```
 $ mkdir -p <meta-layer>/recipes-firmware/<recipes-firmware-app>/files
-$ cp -r <path-to-files>/*.{bit or pdi, dtsi or dtbo, shell.json or accel.json and .xclbin} <meta-layer>/recipes-firmware/<firmware-app-name>/files
+$ cp -r <path-to-files>/*.{bit or bin or pdi, dtsi or dtbo, shell.json or accel.json and .xclbin} <meta-layer>/recipes-firmware/<firmware-app-name>/files
 ```
 3. Now create the recipes for flat or static or partial firmware using recipetool.
 ```
@@ -144,8 +305,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 inherit dfx_user_dts
 
 SRC_URI = "\
-    file://zcu111-pl-demo.bit \
-    file://zcu111-pl-demo.dtsi \
+    file://shell.json \
+    file://zcu111-pl-demo-user-dts.bit \
+    file://zcu111-pl-demo-user-dts.dtsi \
     "
 
 COMPATIBLE_MACHINE ?= "^$"
@@ -153,7 +315,7 @@ COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 ```
 5. Add firmware-recipe app to image and enable fpga-overlay machine features to
    local.conf as shown below.
-> **Note:** fpga-manager-script provides fpgautil tool to load .bit/pdi and dtbo
+> **Note:** fpga-manager-script provides fpgautil tool to load .bin/pdi and dtbo
 > at runtime linux.
 ```
 MACHINE_FEATURES += "fpga-overlay"
@@ -162,7 +324,11 @@ IMAGE_INSTALL:append = " \
   fpga-manager-script \
   "
 ```
-6. Follow [Building Instructions](../README.building.md) and continue from step 5.
+6. Follow SDT or XSCT Build instructions whichever build method is used but not
+   both.
+    a. [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md ) and continue from step 5.
+    b. [XSCT Building Instructions](../README.building.md)
+       and continue from step 5.
 7. Once images are built firmware app files will be installed on target_rootfs.
 ```
 # <target_rootfs>/lib/firmware/xilinx/firmware-app-name
@@ -170,7 +336,7 @@ IMAGE_INSTALL:append = " \
 ---
 
 ## Test Procedure on Target
-* Once Linux boots on target, use fpgautil command to load .bit or .pdi and
+* Once Linux boots on target, use fpgautil command to load .bin or .pdi and
   corresponding dt overlay as shown below.
 > **Note:** firmware can be loaded only with sudo or root permissions.
 ---
@@ -179,11 +345,11 @@ IMAGE_INSTALL:append = " \
 
 * ZynqMP
 ```
-yocto-zynqmp-generic-20231:~$ sudo su
-yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
+yocto-zynqmp-generic:~$ sudo su
+yocto-zynqmp-generic:/home/petalinux# cat /proc/interrupts
            CPU0       CPU1       CPU2       CPU3
- 11:      13309      13021      13673      14170     GICv2  30 Level     arch_timer
- 14:          0          0          0          0     GICv2  67 Level     zynqmp_ipi
+ 11:       5820       5482      14979       6981     GICv2  30 Level     arch_timer
+ 14:          0          0          0          0     GICv2  67 Level     zynqmp-ipi
  15:          0          0          0          0     GICv2 175 Level     arm-pmu
  16:          0          0          0          0     GICv2 176 Level     arm-pmu
  17:          0          0          0          0     GICv2 177 Level     arm-pmu
@@ -193,7 +359,7 @@ yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
  21:          0          0          0          0     GICv2  42 Level     ff960000.memory-controller
  22:          0          0          0          0     GICv2  88 Level     ams-irq
  23:          0          0          0          0     GICv2 155 Level     axi-pmon, axi-pmon
- 24:        327          0          0          0     GICv2  53 Level     xuartps
+ 24:        366          0          0          0     GICv2  53 Level     xuartps
  27:          0          0          0          0     GICv2 156 Level     zynqmp-dma
  28:          0          0          0          0     GICv2 157 Level     zynqmp-dma
  29:          0          0          0          0     GICv2 158 Level     zynqmp-dma
@@ -212,54 +378,55 @@ yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
  42:          0          0          0          0     GICv2 116 Level     zynqmp-dma
  43:          0          0          0          0     GICv2 154 Level     fd4c0000.dma-controller
  44:       5938          0          0          0     GICv2  47 Level     ff0f0000.spi
- 45:         76          0          0          0     GICv2  95 Level     eth0, eth0
+ 45:        325          0          0          0     GICv2  95 Level     eth0, eth0
  46:          0          0          0          0     GICv2  57 Level     axi-pmon, axi-pmon
- 47:       4802          0          0          0     GICv2  49 Level     cdns-i2c
- 48:        501          0          0          0     GICv2  50 Level     cdns-i2c
+ 47:       2798          0          0          0     GICv2  49 Level     cdns-i2c
+ 48:        326          0          0          0     GICv2  50 Level     cdns-i2c
  50:          0          0          0          0     GICv2  84 Edge      ff150000.watchdog
  51:          0          0          0          0     GICv2 151 Level     fd4a0000.display
- 52:        548          0          0          0     GICv2  81 Level     mmc0
+ 52:        551          0          0          0     GICv2  81 Level     mmc0
  53:          0          0          0          0     GICv2 165 Level     ahci-ceva[fd0c0000.ahci]
  54:          0          0          0          0     GICv2  97 Level     xhci-hcd:usb1
  55:          0          0          0          0  zynq-gpio  22 Edge      sw19
-IPI0:        64         25         87         38       Rescheduling interrupts
-IPI1:      1933       6579       1096       5686       Function call interrupts
+IPI0:        51         94        136         48       Rescheduling interrupts
+IPI1:      2295       6271       2952        873       Function call interrupts
 IPI2:         0          0          0          0       CPU stop interrupts
 IPI3:         0          0          0          0       CPU stop (for crash dump) interrupts
 IPI4:         0          0          0          0       Timer broadcast interrupts
 IPI5:         0          0          0          0       IRQ work interrupts
 IPI6:         0          0          0          0       CPU wake-up interrupts
 Err:          0
-yocto-zynqmp-generic-20231:/home/petalinux# tree /lib/firmware/
+yocto-zynqmp-generic:/home/petalinux# tree /lib/firmware/
 /lib/firmware/
 `-- xilinx
-    `-- zcu111-pl-demo
-        |-- zcu111-pl-demo.bit.bin
-        `-- zcu111-pl-demo.dtbo
-
-2 directories, 2 files
-yocto-zynqmp-generic-20231:/home/petalinux# fpgautil -b /lib/firmware/xilinx/zcu111-pl-demo/zcu111-pl-demo.bit -o /lib/firmware/xilinx/zcu111-pl-demo/zcu111-pl-demo.dtbo
-[   91.039773] fpga_manager fpga0: writing zcu111-pl-demo.bit to Xilinx ZynqMP FPGA Manager
-[   91.528214] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/firmware-name
-[   91.538354] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/pid
-[   91.547598] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/resets
-[   91.557087] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/uid
-[   91.566804] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/afi0
-[   91.576312] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/clocking0
-[   91.586255] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_gpio_0
-[   91.596280] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/misc_clk_0
-[   91.606300] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_gpio_1
-[   91.616325] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_gpio_2
-[   91.626342] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_uartlite_0
-[   91.636705] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/ddr4_0
-[   91.661849] gpio gpiochip3: (a0000000.gpio): not an immutable chip, please consider fixing it!
-[   91.662020] gpio gpiochip4: (a0010000.gpio): not an immutable chip, please consider fixing it!
-[   91.863492] a0030000.serial: ttyUL0 at MMIO 0xa0030000 (irq = 58, base_baud = 0) is a uartlite
-[   91.876674] uartlite a0030000.serial: Runtime PM usage count underflow!
-[   91.906539] input: pl-gpio-keys as /devices/platform/pl-gpio-keys/input/input1
-Time taken to load BIN is 901.000000 Milli Seconds
+    `-- zcu111-pl-demo-user-dts
+        |-- shell.json
+        |-- zcu111-pl-demo-user-dts.bin 
+        `-- zcu111-pl-demo-user-dts.dtbo
+
+2 directories, 3 files
+yocto-zynqmp-generic:/home/petalinux# fpgautil -b /lib/firmware/xilinx/zcu111-pl-demo-user-dts/zcu111-pl-demo-user-dts.bin -o /lib/firmware/xilinx/zcu111-pl-demo-user-dts/zcu111-pl-demo-user-dts.dtbo
+[  370.737539] fpga_manager fpga0: writing zcu111-pl-demo-user-dts.bin to Xilinx ZynqMP FPGA Manager
+[  370.960368] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/firmware-name
+[  370.970508] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/pid
+[  370.979755] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/resets
+[  370.989244] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/uid
+[  370.998947] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/afi0
+[  371.008449] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/clocking0
+[  371.018398] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_gpio_0
+[  371.028420] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/misc_clk_0
+[  371.038442] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_gpio_1
+[  371.048467] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_gpio_2
+[  371.058487] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_uartlite_0
+[  371.068852] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/ddr4_0
+[  371.096047] gpio gpiochip3: (a0000000.gpio): not an immutable chip, please consider fixing it!
+[  371.096223] gpio gpiochip4: (a0010000.gpio): not an immutable chip, please consider fixing it!
+[  371.115206] a0030000.serial: ttyUL0 at MMIO 0xa0030000 (irq = 58, base_baud = 0) is a uartlite
+[  371.124178] uartlite a0030000.serial: Runtime PM usage count underflow!
+[  371.133186] input: axi:pl-gpio-keys as /devices/platform/axi/axi:pl-gpio-keys/input/input1
+Time taken to load BIN is 409.000000 Milli Seconds
 BIN FILE loaded through FPGA manager successfully
-yocto-zynqmp-generic-20231:/home/petalinux#
+yocto-zynqmp-generic:/home/petalinux#
 ```
 * Versal (DFx Static)
 ```
@@ -324,10 +491,10 @@ root@yocto-vck190-dfx-2023:~#
 * Verify PL GPIO DIP switches and Push buttons are registered.
 * Move the DIP Switches ON/OFF and verify the interrupt counts.
 ```
-yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
+yocto-zynqmp-generic:/home/petalinux# cat /proc/interrupts
            CPU0       CPU1       CPU2       CPU3
- 11:      23303      22971      24203      24990     GICv2  30 Level     arch_timer
- 14:          0          0          0          0     GICv2  67 Level     zynqmp_ipi
+ 11:       7674       7136      20210       8226     GICv2  30 Level     arch_timer
+ 14:          0          0          0          0     GICv2  67 Level     zynqmp-ipi
  15:          0          0          0          0     GICv2 175 Level     arm-pmu
  16:          0          0          0          0     GICv2 176 Level     arm-pmu
  17:          0          0          0          0     GICv2 177 Level     arm-pmu
@@ -337,7 +504,7 @@ yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
  21:          0          0          0          0     GICv2  42 Level     ff960000.memory-controller
  22:          0          0          0          0     GICv2  88 Level     ams-irq
  23:          0          0          0          0     GICv2 155 Level     axi-pmon, axi-pmon
- 24:        515          0          0          0     GICv2  53 Level     xuartps
+ 24:       1143          0          0          0     GICv2  53 Level     xuartps
  27:          0          0          0          0     GICv2 156 Level     zynqmp-dma
  28:          0          0          0          0     GICv2 157 Level     zynqmp-dma
  29:          0          0          0          0     GICv2 158 Level     zynqmp-dma
@@ -356,13 +523,13 @@ yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
  42:          0          0          0          0     GICv2 116 Level     zynqmp-dma
  43:          0          0          0          0     GICv2 154 Level     fd4c0000.dma-controller
  44:       5938          0          0          0     GICv2  47 Level     ff0f0000.spi
- 45:        110          0          0          0     GICv2  95 Level     eth0, eth0
+ 45:        485          0          0          0     GICv2  95 Level     eth0, eth0
  46:          0          0          0          0     GICv2  57 Level     axi-pmon, axi-pmon
- 47:       4802          0          0          0     GICv2  49 Level     cdns-i2c
- 48:        501          0          0          0     GICv2  50 Level     cdns-i2c
+ 47:       2798          0          0          0     GICv2  49 Level     cdns-i2c
+ 48:        326          0          0          0     GICv2  50 Level     cdns-i2c
  50:          0          0          0          0     GICv2  84 Edge      ff150000.watchdog
  51:          0          0          0          0     GICv2 151 Level     fd4a0000.display
- 52:        548          0          0          0     GICv2  81 Level     mmc0
+ 52:        551          0          0          0     GICv2  81 Level     mmc0
  53:          0          0          0          0     GICv2 165 Level     ahci-ceva[fd0c0000.ahci]
  54:          0          0          0          0     GICv2  97 Level     xhci-hcd:usb1
  55:          0          0          0          0  zynq-gpio  22 Edge      sw19
@@ -379,18 +546,19 @@ yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
  69:          0          0          0          0  gpio-xilinx   2 Edge      PL_GPIO_DIP_SW2
  70:          0          0          0          0  gpio-xilinx   1 Edge      PL_GPIO_DIP_SW1
  71:          0          0          0          0  gpio-xilinx   0 Edge      PL_GPIO_DIP_SW0
-IPI0:        64         25         87         38       Rescheduling interrupts
-IPI1:      2066       6747       1212       5791       Function call interrupts
+IPI0:        64        106        160         56       Rescheduling interrupts
+IPI1:      2712       6721       3259        998       Function call interrupts
 IPI2:         0          0          0          0       CPU stop interrupts
 IPI3:         0          0          0          0       CPU stop (for crash dump) interrupts
 IPI4:         0          0          0          0       Timer broadcast interrupts
 IPI5:         0          0          0          0       IRQ work interrupts
 IPI6:         0          0          0          0       CPU wake-up interrupts
 Err:          0
-yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
+yocto-zcu111-zynqmp:/home/petalinux#
+yocto-zcu111-zynqmp:/home/petalinux# cat /proc/interrupts
            CPU0       CPU1       CPU2       CPU3
- 11:      28169      27725      29250      30190     GICv2  30 Level     arch_timer
- 14:          0          0          0          0     GICv2  67 Level     zynqmp_ipi
+ 11:       8530       7717      22106       8626     GICv2  30 Level     arch_timer
+ 14:          0          0          0          0     GICv2  67 Level     zynqmp-ipi
  15:          0          0          0          0     GICv2 175 Level     arm-pmu
  16:          0          0          0          0     GICv2 176 Level     arm-pmu
  17:          0          0          0          0     GICv2 177 Level     arm-pmu
@@ -400,7 +568,7 @@ yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
  21:          0          0          0          0     GICv2  42 Level     ff960000.memory-controller
  22:          0          0          0          0     GICv2  88 Level     ams-irq
  23:          0          0          0          0     GICv2 155 Level     axi-pmon, axi-pmon
- 24:        603          0          0          0     GICv2  53 Level     xuartps
+ 24:       1234          0          0          0     GICv2  53 Level     xuartps
  27:          0          0          0          0     GICv2 156 Level     zynqmp-dma
  28:          0          0          0          0     GICv2 157 Level     zynqmp-dma
  29:          0          0          0          0     GICv2 158 Level     zynqmp-dma
@@ -419,45 +587,45 @@ yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
  42:          0          0          0          0     GICv2 116 Level     zynqmp-dma
  43:          0          0          0          0     GICv2 154 Level     fd4c0000.dma-controller
  44:       5938          0          0          0     GICv2  47 Level     ff0f0000.spi
- 45:        134          0          0          0     GICv2  95 Level     eth0, eth0
+ 45:        527          0          0          0     GICv2  95 Level     eth0, eth0
  46:          0          0          0          0     GICv2  57 Level     axi-pmon, axi-pmon
- 47:       4802          0          0          0     GICv2  49 Level     cdns-i2c
- 48:        501          0          0          0     GICv2  50 Level     cdns-i2c
+ 47:       2798          0          0          0     GICv2  49 Level     cdns-i2c
+ 48:        326          0          0          0     GICv2  50 Level     cdns-i2c
  50:          0          0          0          0     GICv2  84 Edge      ff150000.watchdog
  51:          0          0          0          0     GICv2 151 Level     fd4a0000.display
- 52:        548          0          0          0     GICv2  81 Level     mmc0
+ 52:        551          0          0          0     GICv2  81 Level     mmc0
  53:          0          0          0          0     GICv2 165 Level     ahci-ceva[fd0c0000.ahci]
  54:          0          0          0          0     GICv2  97 Level     xhci-hcd:usb1
  55:          0          0          0          0  zynq-gpio  22 Edge      sw19
  59:          2          0          0          0  gpio-xilinx   4 Edge      PL_GPIO_PB_SW9_N
  60:          4          0          0          0  gpio-xilinx   3 Edge      PL_GPIO_PB_SW12_E
- 61:          2          0          0          0  gpio-xilinx   2 Edge      PL_GPIO_PB_SW13_S
- 62:          2          0          0          0  gpio-xilinx   1 Edge      PL_GPIO_PB_SW10_W
+ 61:          6          0          0          0  gpio-xilinx   2 Edge      PL_GPIO_PB_SW13_S
+ 62:          4          0          0          0  gpio-xilinx   1 Edge      PL_GPIO_PB_SW10_W
  63:          2          0          0          0  gpio-xilinx   0 Edge      PL_GPIO_PB_SW11_C
- 64:          2          0          0          0  gpio-xilinx   7 Edge      PL_GPIO_DIP_SW7
- 65:          2          0          0          0  gpio-xilinx   6 Edge      PL_GPIO_DIP_SW6
- 66:          4          0          0          0  gpio-xilinx   5 Edge      PL_GPIO_DIP_SW5
- 67:          2          0          0          0  gpio-xilinx   4 Edge      PL_GPIO_DIP_SW4
- 68:          2          0          0          0  gpio-xilinx   3 Edge      PL_GPIO_DIP_SW3
+ 64:         20          0          0          0  gpio-xilinx   7 Edge      PL_GPIO_DIP_SW7
+ 65:         20          0          0          0  gpio-xilinx   6 Edge      PL_GPIO_DIP_SW6
+ 66:          2          0          0          0  gpio-xilinx   5 Edge      PL_GPIO_DIP_SW5
+ 67:          8          0          0          0  gpio-xilinx   4 Edge      PL_GPIO_DIP_SW4
+ 68:          4          0          0          0  gpio-xilinx   3 Edge      PL_GPIO_DIP_SW3
  69:          2          0          0          0  gpio-xilinx   2 Edge      PL_GPIO_DIP_SW2
  70:          2          0          0          0  gpio-xilinx   1 Edge      PL_GPIO_DIP_SW1
  71:          2          0          0          0  gpio-xilinx   0 Edge      PL_GPIO_DIP_SW0
-IPI0:        64         26         87         38       Rescheduling interrupts
-IPI1:      2163       6791       1243       5866       Function call interrupts
+IPI0:        64        107        160         56       Rescheduling interrupts
+IPI1:      2720       6763       3430        998       Function call interrupts
 IPI2:         0          0          0          0       CPU stop interrupts
 IPI3:         0          0          0          0       CPU stop (for crash dump) interrupts
 IPI4:         0          0          0          0       Timer broadcast interrupts
 IPI5:         0          0          0          0       IRQ work interrupts
 IPI6:         0          0          0          0       CPU wake-up interrupts
 Err:          0
-yocto-zynqmp-generic-20231:/home/petalinux#
+yocto-zynqmp-generic:/home/petalinux#
 ```
 ---
 
 ### Unloading PL bitstream or pdi and dt overlay
 * Zynq or ZynqMP
 ```
-yocto-zynqmp-generic-20231:/home/petalinux# fpgautil -R
+yocto-zynqmp-generic:/home/petalinux# fpgautil -R
 ```
 * Versal (DFx RP)
 ```
diff --git a/docs/README.fpgamanager.custom.md b/docs/README.fpgamanager.custom.md
deleted file mode 100644
index dbdf5907..00000000
--- a/docs/README.fpgamanager.custom.md
+++ /dev/null
@@ -1,478 +0,0 @@
-# Build Instructions to create firmware recipes using fpgamanager_custom bbclass
-
-* [Introduction](#introduction)
-* [How to create a firmware recipe app](#how-to-create-a-firmware-recipe-app)
-* [Test Procedure on Target](#test-procedure-on-target)
-  * [Loading PL bitstream or pdi and dt overlay](#loading-pl-bitstream-or-pdi-and-dt-overlay)
-  * [Testing PL functionality](#testing-pl-functionality)
-  * [Unloading PL bitstream or pdi and dt overlay](#unloading-pl-bitstream-or-pdi-and-dt-overlay)
-* [References](#references)
-
-> **Note:** This README will be deprecated in 2024.1 release. User sthould start
-> using [DFx User DTS README](README.dfx.user.dts.md)
-
-## Introduction
-This readme describes the build instructions to create firmware recipes using
-fpgamanager_custom.bbclass for dynamic configuration. This bitbake class supports
-following use cases.
-
-> **Note:** Refer https://github.com/Xilinx/dfx-mgr/blob/master/README.md for
-> shell.json and accel.json file content.
-
-* **Zynq-7000 and ZynqMP**:
-  * Design: Vivado flat design.
-    * Input files to firmware recipes: .bit, .dtsi or dtbo and shell.json (optional)
-    * Usage Examples:
-```
-SRC_URI = " \
-    file://<flat_design_pl>.bit \
-    file://<flat_design_pl>.dtsi \
-    file://shell.json \
-    "
-```
-
-```
-SRC_URI = " \
-    file://<flat_design_pl>.bit \
-    file://<flat_design_pl>.dtbo \
-    file://shell.json \
-    "
-```
-
-* **ZynqMP and Versal**:
-  * Design: Vivado DFx design.
-    * Input files to firmware recipes: .bit(ZynqMP) or .pdi(Versal), .dtsi or dtbo
-      shell.json or accel.json (optional) and .xclbin (optional).
-    * Usage Examples:
-
-```
-# ZynqMP DFx Static
-SRC_URI = " \
-    file://<dfx_design_static_pl>.bit \
-    file://<dfx_design_static_pl>.dtsi \
-    file://shell.json \
-    file://<dfx_design_static_pl>.xclbin \
-    "
-```
-
-```
-# ZynqMP DFx Static
-SRC_URI = " \
-    file://<dfx_design_static_pl>.bit \
-    file://<dfx_design_static_pl>.dtbo \
-    file://shell.json \
-    file://<dfx_design_static_pl>.xclbin \
-    "
-```
-
-```
-# ZynqMP DFx RP
-SRC_URI = " \
-    file://<dfx_design_rp_rm_pl>.bit \
-    file://<dfx_design_rp_rm_pl>.dtsi \
-    file://accel.json \
-    file://<dfx_design_rp_rm_pl>.xclbin \
-    "
-```
-
-```
-# ZynqMP DFx RP
-SRC_URI = " \
-    file://<dfx_design_rp_rm_pl>.bit \
-    file://<dfx_design_rp_rm_pl>.dtbo \
-    file://accel.json \
-    file://<dfx_design_rp_rm_pl>.xclbin \
-    "
-```
-```
-# Versal DFx Static
-SRC_URI = " \
-    file://<dfx_design_static_pl>.pdi \
-    file://<dfx_design_static_pl>.dtsi \
-    file://shell.json \
-    file://<dfx_design_static_pl>.xclbin \
-    "
-```
-
-```
-# Versal DFx Static
-SRC_URI = " \
-    file://<dfx_design_static_pl>.pdi \
-    file://<dfx_design_static_pl>.dtbo \
-    file://shell.json \
-    file://<dfx_design_static_pl>.xclbin \
-    "
-```
-
-```
-# Versal DFx RP
-SRC_URI = " \
-    file://<dfx_design_rp_rm_pl>.pdi \
-    file://<dfx_design_rp_rm_pl>.dtsi \
-    file://accel.json \
-    file://<dfx_design_rp_rm_pl>.xclbin \
-    "
-```
-
-```
-# Versal DFx RP
-SRC_URI = " \
-    file://<dfx_design_rp_rm_pl>.pdi \
-    file://<dfx_design_rp_rm_pl>.dtbo \
-    file://accel.json \
-    file://<dfx_design_rp_rm_pl>.xclbin \
-    "
-```
----
-
-## How to create a firmware recipe app
-
-1. Follow [Building Instructions](../README.building.md) upto step 4.
-2. Create recipes-firmware directory in meta layer and copy the .bit/pdi,
-   .dtsi/dtbo, .json and .xclbin file to these directories.
-```
-$ mkdir -p <meta-layer>/recipes-firmware/<recipes-firmware-app>/files
-$ cp -r <path-to-files>/*.{bit or pdi, dtsi or dtbo, shell.json or accel.json and .xclbin} <meta-layer>/recipes-firmware/<firmware-app-name>/files
-```
-3. Now create the recipes for flat or static or partial firmware using recipetool.
-```
-$ recipetool create -o <meta-layer>/recipes-firmware/<firmware-app-name>/firmware-app-name.bb file:///<meta-layer>/recipes-firmware/<firmware-app-name>/files
-```
-4. Modify the recipe and inherit fpgamanager_custom bbclass as shown below.
-```
-SUMMARY = "Full Bitstream loading zcu111-pl-demo firmware using fpgamanager_custom bbclass"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-inherit fpgamanager_custom
-
-SRC_URI = "\
-    file://zcu111-pl-demo.bit \
-    file://zcu111-pl-demo.dtsi \
-    "
-
-COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-```
-5. Add firmware-recipe app to image and enable fpga-overlay machine features to
-   local.conf as shown below.
-> **Note:** fpga-manager-script provides fpgautil tool to load .bit/pdi and dtbo
-> at runtime linux.
-```
-MACHINE_FEATURES += "fpga-overlay"
-IMAGE_INSTALL:append = " \
-  firmware-app-name \
-  fpga-manager-script \
-  "
-```
-6. Follow [Building Instructions](../README.building.md) and continue from step 5.
-7. Once images are built firmware app files will be installed on target_rootfs.
-```
-# <target_rootfs>/lib/firmware/xilinx/firmware-app-name
-```
----
-
-## Test Procedure on Target
-* Once Linux boots on target, use fpgautil command to load .bit or .pdi and
-  corresponding dt overlay as shown below.
-> **Note:** firmware can be loaded only with sudo or root permissions.
----
-
-### Loading PL bitstream or pdi and dt overlay
-
-* ZynqMP
-```
-yocto-zynqmp-generic-20231:~$ sudo su
-yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
-           CPU0       CPU1       CPU2       CPU3
- 11:      13309      13021      13673      14170     GICv2  30 Level     arch_timer
- 14:          0          0          0          0     GICv2  67 Level     zynqmp_ipi
- 15:          0          0          0          0     GICv2 175 Level     arm-pmu
- 16:          0          0          0          0     GICv2 176 Level     arm-pmu
- 17:          0          0          0          0     GICv2 177 Level     arm-pmu
- 18:          0          0          0          0     GICv2 178 Level     arm-pmu
- 19:          0          0          0          0     GICv2  58 Level     ffa60000.rtc
- 20:          0          0          0          0     GICv2  59 Level     ffa60000.rtc
- 21:          0          0          0          0     GICv2  42 Level     ff960000.memory-controller
- 22:          0          0          0          0     GICv2  88 Level     ams-irq
- 23:          0          0          0          0     GICv2 155 Level     axi-pmon, axi-pmon
- 24:        327          0          0          0     GICv2  53 Level     xuartps
- 27:          0          0          0          0     GICv2 156 Level     zynqmp-dma
- 28:          0          0          0          0     GICv2 157 Level     zynqmp-dma
- 29:          0          0          0          0     GICv2 158 Level     zynqmp-dma
- 30:          0          0          0          0     GICv2 159 Level     zynqmp-dma
- 31:          0          0          0          0     GICv2 160 Level     zynqmp-dma
- 32:          0          0          0          0     GICv2 161 Level     zynqmp-dma
- 33:          0          0          0          0     GICv2 162 Level     zynqmp-dma
- 34:          0          0          0          0     GICv2 163 Level     zynqmp-dma
- 35:          0          0          0          0     GICv2 109 Level     zynqmp-dma
- 36:          0          0          0          0     GICv2 110 Level     zynqmp-dma
- 37:          0          0          0          0     GICv2 111 Level     zynqmp-dma
- 38:          0          0          0          0     GICv2 112 Level     zynqmp-dma
- 39:          0          0          0          0     GICv2 113 Level     zynqmp-dma
- 40:          0          0          0          0     GICv2 114 Level     zynqmp-dma
- 41:          0          0          0          0     GICv2 115 Level     zynqmp-dma
- 42:          0          0          0          0     GICv2 116 Level     zynqmp-dma
- 43:          0          0          0          0     GICv2 154 Level     fd4c0000.dma-controller
- 44:       5938          0          0          0     GICv2  47 Level     ff0f0000.spi
- 45:         76          0          0          0     GICv2  95 Level     eth0, eth0
- 46:          0          0          0          0     GICv2  57 Level     axi-pmon, axi-pmon
- 47:       4802          0          0          0     GICv2  49 Level     cdns-i2c
- 48:        501          0          0          0     GICv2  50 Level     cdns-i2c
- 50:          0          0          0          0     GICv2  84 Edge      ff150000.watchdog
- 51:          0          0          0          0     GICv2 151 Level     fd4a0000.display
- 52:        548          0          0          0     GICv2  81 Level     mmc0
- 53:          0          0          0          0     GICv2 165 Level     ahci-ceva[fd0c0000.ahci]
- 54:          0          0          0          0     GICv2  97 Level     xhci-hcd:usb1
- 55:          0          0          0          0  zynq-gpio  22 Edge      sw19
-IPI0:        64         25         87         38       Rescheduling interrupts
-IPI1:      1933       6579       1096       5686       Function call interrupts
-IPI2:         0          0          0          0       CPU stop interrupts
-IPI3:         0          0          0          0       CPU stop (for crash dump) interrupts
-IPI4:         0          0          0          0       Timer broadcast interrupts
-IPI5:         0          0          0          0       IRQ work interrupts
-IPI6:         0          0          0          0       CPU wake-up interrupts
-Err:          0
-yocto-zynqmp-generic-20231:/home/petalinux# tree /lib/firmware/
-/lib/firmware/
-`-- xilinx
-    `-- zcu111-pl-demo
-        |-- zcu111-pl-demo.bit.bin
-        `-- zcu111-pl-demo.dtbo
-
-2 directories, 2 files
-yocto-zynqmp-generic-20231:/home/petalinux# fpgautil -b /lib/firmware/xilinx/zcu111-pl-demo/zcu111-pl-demo.bit -o /lib/firmware/xilinx/zcu111-pl-demo/zcu111-pl-demo.dtbo
-[   91.039773] fpga_manager fpga0: writing zcu111-pl-demo.bit to Xilinx ZynqMP FPGA Manager
-[   91.528214] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/firmware-name
-[   91.538354] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/pid
-[   91.547598] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/resets
-[   91.557087] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga-full/uid
-[   91.566804] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/afi0
-[   91.576312] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/clocking0
-[   91.586255] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_gpio_0
-[   91.596280] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/misc_clk_0
-[   91.606300] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_gpio_1
-[   91.616325] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_gpio_2
-[   91.626342] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/axi_uartlite_0
-[   91.636705] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/ddr4_0
-[   91.661849] gpio gpiochip3: (a0000000.gpio): not an immutable chip, please consider fixing it!
-[   91.662020] gpio gpiochip4: (a0010000.gpio): not an immutable chip, please consider fixing it!
-[   91.863492] a0030000.serial: ttyUL0 at MMIO 0xa0030000 (irq = 58, base_baud = 0) is a uartlite
-[   91.876674] uartlite a0030000.serial: Runtime PM usage count underflow!
-[   91.906539] input: pl-gpio-keys as /devices/platform/pl-gpio-keys/input/input1
-Time taken to load BIN is 901.000000 Milli Seconds
-BIN FILE loaded through FPGA manager successfully
-yocto-zynqmp-generic-20231:/home/petalinux#
-```
-* Versal (DFx Static)
-```
-yocto-vck190-dfx-2023:~$ sudo su
-root@yocto-vck190-dfx-2023:~# 
-root@yocto-vck190-dfx-2023:~# fpgautil -o /lib/firmware/xilinx/vck190-dfx-static/vck190-dfx-static.dtbo
-[  257.555571] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga/external-fpga-config
-[  257.565879] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga/pid
-[  257.574670] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga/uid
-[  257.583599] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/fpga_PR0
-[  257.593434] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/fpga_PR1
-[  257.603268] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/fpga_PR2
-[  257.613100] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/static_region_axi_bram_ctrl_0
-[  257.624762] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/static_region_dfx_decoupler_rp1
-[  257.636589] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/static_region_dfx_decoupler_rp2
-[  257.648415] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/static_region_dfx_decoupler_rp3
-[  257.663234] of-fpga-region fpga:fpga-PR0: FPGA Region probed
-[  257.669135] of-fpga-region fpga:fpga-PR1: FPGA Region probed
-[  257.675022] of-fpga-region fpga:fpga-PR2: FPGA Region probed
-root@yocto-vck190-dfx-2023:~#
-```
-* Versal (DFx RP)
-```
-root@yocto-vck190-dfx-2023:~# fpgautil -b /lib/firmware/xilinx/vck190-dfx-static/rp1/vck190-dfx-rp1rm1-dipsw/vck190-dfx-rp1rm1-dipsw.pdi -o /lib/firmware/xilinx/vck190-dfx-static/rp1/vck190-dfx-rp1rm1-dipsw/vck190-dfx-rp1rm1-dipsw.dtbo -f Partial -n PR0
-[  273.511455] fpga_manager fpga0: writing vck190-dfx-rp1rm1-dipsw.pdi to Xilinx Versal FPGA Manager
-[284052.461]Loading PDI from DDR
-[284052.566]Monolithic/Master Device
-[284055.847]3.365 ms: PDI initialization time
-[284059.809]+++Loading Image#: 0x0, Name: pl_cfi, Id: 0x18700002
-[284065.432]---Loading Partition#: 0x0, Id: 0x103
-[284069.829] 0.033 ms for Partition#: 0x0, Size: 1312 Bytes
-[284074.973]---Loading Partition#: 0x1, Id: 0x105
-[284079.344] 0.007 ms for Partition#: 0x1, Size: 160 Bytes
-[284084.430]---Loading Partition#: 0x2, Id: 0x205
-[284088.844] 0.049 ms for Partition#: 0x2, Size: 960 Bytes
-[284093.887]---Loading Partition#: 0x3, Id: 0x203
-[284098.280] 0.030 ms for Partition#: 0x3, Size: 688 Bytes
-[284103.342]---Loading Partition#: 0x4, Id: 0x303
-[284108.863] 1.156 ms for Partition#: 0x4, Size: 209440 Bytes
-[284113.052]---Loading Partition#: 0x5, Id: 0x305
-[284117.712] 0.296 ms for Partition#: 0x5, Size: 3536 Bytes
-[284122.594]---Loading Partition#: 0x6, Id: 0x403
-[284126.991] 0.034 ms for Partition#: 0x6, Size: 8096 Bytes
-[284132.136]---Loading Partition#: 0x7, Id: 0x405
-[284136.507] 0.007 ms for Partition#: 0x7, Size: 160 Bytes
-[284141.636]Subsystem PDI Load: Done
-[  273.615503] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga/firmware-name
-[  273.627382] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga/fpga-bridges
-[  273.636953] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /fpga/partial-fpga-config
-[  273.647241] OF: overlay: WARNING: memory leak will occur if overlay removed, property: /__symbols__/rp1_axi_gpio_0
-[  273.660826] gpio gpiochip1: (a4010000.gpio): not an immutable chip, please consider fixing it!
-[  273.670490] input: pl-gpio-keys as /devices/platform/pl-gpio-keys/input/input0
-Time taken to load BIN is 171.000000 Milli Seconds
-BIN FILE loaded through FPGA manager successfully
-root@yocto-vck190-dfx-2023:~#
-```
----
-
-### Testing PL functionality 
-
-* This examples uses PL GPIO DIP switches and Push buttons to capture interrupts.
-* Verify PL GPIO DIP switches and Push buttons are registered.
-* Move the DIP Switches ON/OFF and verify the interrupt counts.
-```
-yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
-           CPU0       CPU1       CPU2       CPU3
- 11:      23303      22971      24203      24990     GICv2  30 Level     arch_timer
- 14:          0          0          0          0     GICv2  67 Level     zynqmp_ipi
- 15:          0          0          0          0     GICv2 175 Level     arm-pmu
- 16:          0          0          0          0     GICv2 176 Level     arm-pmu
- 17:          0          0          0          0     GICv2 177 Level     arm-pmu
- 18:          0          0          0          0     GICv2 178 Level     arm-pmu
- 19:          0          0          0          0     GICv2  58 Level     ffa60000.rtc
- 20:          0          0          0          0     GICv2  59 Level     ffa60000.rtc
- 21:          0          0          0          0     GICv2  42 Level     ff960000.memory-controller
- 22:          0          0          0          0     GICv2  88 Level     ams-irq
- 23:          0          0          0          0     GICv2 155 Level     axi-pmon, axi-pmon
- 24:        515          0          0          0     GICv2  53 Level     xuartps
- 27:          0          0          0          0     GICv2 156 Level     zynqmp-dma
- 28:          0          0          0          0     GICv2 157 Level     zynqmp-dma
- 29:          0          0          0          0     GICv2 158 Level     zynqmp-dma
- 30:          0          0          0          0     GICv2 159 Level     zynqmp-dma
- 31:          0          0          0          0     GICv2 160 Level     zynqmp-dma
- 32:          0          0          0          0     GICv2 161 Level     zynqmp-dma
- 33:          0          0          0          0     GICv2 162 Level     zynqmp-dma
- 34:          0          0          0          0     GICv2 163 Level     zynqmp-dma
- 35:          0          0          0          0     GICv2 109 Level     zynqmp-dma
- 36:          0          0          0          0     GICv2 110 Level     zynqmp-dma
- 37:          0          0          0          0     GICv2 111 Level     zynqmp-dma
- 38:          0          0          0          0     GICv2 112 Level     zynqmp-dma
- 39:          0          0          0          0     GICv2 113 Level     zynqmp-dma
- 40:          0          0          0          0     GICv2 114 Level     zynqmp-dma
- 41:          0          0          0          0     GICv2 115 Level     zynqmp-dma
- 42:          0          0          0          0     GICv2 116 Level     zynqmp-dma
- 43:          0          0          0          0     GICv2 154 Level     fd4c0000.dma-controller
- 44:       5938          0          0          0     GICv2  47 Level     ff0f0000.spi
- 45:        110          0          0          0     GICv2  95 Level     eth0, eth0
- 46:          0          0          0          0     GICv2  57 Level     axi-pmon, axi-pmon
- 47:       4802          0          0          0     GICv2  49 Level     cdns-i2c
- 48:        501          0          0          0     GICv2  50 Level     cdns-i2c
- 50:          0          0          0          0     GICv2  84 Edge      ff150000.watchdog
- 51:          0          0          0          0     GICv2 151 Level     fd4a0000.display
- 52:        548          0          0          0     GICv2  81 Level     mmc0
- 53:          0          0          0          0     GICv2 165 Level     ahci-ceva[fd0c0000.ahci]
- 54:          0          0          0          0     GICv2  97 Level     xhci-hcd:usb1
- 55:          0          0          0          0  zynq-gpio  22 Edge      sw19
- 59:          0          0          0          0  gpio-xilinx   4 Edge      PL_GPIO_PB_SW9_N
- 60:          0          0          0          0  gpio-xilinx   3 Edge      PL_GPIO_PB_SW12_E
- 61:          0          0          0          0  gpio-xilinx   2 Edge      PL_GPIO_PB_SW13_S
- 62:          0          0          0          0  gpio-xilinx   1 Edge      PL_GPIO_PB_SW10_W
- 63:          0          0          0          0  gpio-xilinx   0 Edge      PL_GPIO_PB_SW11_C
- 64:          0          0          0          0  gpio-xilinx   7 Edge      PL_GPIO_DIP_SW7
- 65:          0          0          0          0  gpio-xilinx   6 Edge      PL_GPIO_DIP_SW6
- 66:          0          0          0          0  gpio-xilinx   5 Edge      PL_GPIO_DIP_SW5
- 67:          0          0          0          0  gpio-xilinx   4 Edge      PL_GPIO_DIP_SW4
- 68:          0          0          0          0  gpio-xilinx   3 Edge      PL_GPIO_DIP_SW3
- 69:          0          0          0          0  gpio-xilinx   2 Edge      PL_GPIO_DIP_SW2
- 70:          0          0          0          0  gpio-xilinx   1 Edge      PL_GPIO_DIP_SW1
- 71:          0          0          0          0  gpio-xilinx   0 Edge      PL_GPIO_DIP_SW0
-IPI0:        64         25         87         38       Rescheduling interrupts
-IPI1:      2066       6747       1212       5791       Function call interrupts
-IPI2:         0          0          0          0       CPU stop interrupts
-IPI3:         0          0          0          0       CPU stop (for crash dump) interrupts
-IPI4:         0          0          0          0       Timer broadcast interrupts
-IPI5:         0          0          0          0       IRQ work interrupts
-IPI6:         0          0          0          0       CPU wake-up interrupts
-Err:          0
-yocto-zynqmp-generic-20231:/home/petalinux# cat /proc/interrupts
-           CPU0       CPU1       CPU2       CPU3
- 11:      28169      27725      29250      30190     GICv2  30 Level     arch_timer
- 14:          0          0          0          0     GICv2  67 Level     zynqmp_ipi
- 15:          0          0          0          0     GICv2 175 Level     arm-pmu
- 16:          0          0          0          0     GICv2 176 Level     arm-pmu
- 17:          0          0          0          0     GICv2 177 Level     arm-pmu
- 18:          0          0          0          0     GICv2 178 Level     arm-pmu
- 19:          0          0          0          0     GICv2  58 Level     ffa60000.rtc
- 20:          0          0          0          0     GICv2  59 Level     ffa60000.rtc
- 21:          0          0          0          0     GICv2  42 Level     ff960000.memory-controller
- 22:          0          0          0          0     GICv2  88 Level     ams-irq
- 23:          0          0          0          0     GICv2 155 Level     axi-pmon, axi-pmon
- 24:        603          0          0          0     GICv2  53 Level     xuartps
- 27:          0          0          0          0     GICv2 156 Level     zynqmp-dma
- 28:          0          0          0          0     GICv2 157 Level     zynqmp-dma
- 29:          0          0          0          0     GICv2 158 Level     zynqmp-dma
- 30:          0          0          0          0     GICv2 159 Level     zynqmp-dma
- 31:          0          0          0          0     GICv2 160 Level     zynqmp-dma
- 32:          0          0          0          0     GICv2 161 Level     zynqmp-dma
- 33:          0          0          0          0     GICv2 162 Level     zynqmp-dma
- 34:          0          0          0          0     GICv2 163 Level     zynqmp-dma
- 35:          0          0          0          0     GICv2 109 Level     zynqmp-dma
- 36:          0          0          0          0     GICv2 110 Level     zynqmp-dma
- 37:          0          0          0          0     GICv2 111 Level     zynqmp-dma
- 38:          0          0          0          0     GICv2 112 Level     zynqmp-dma
- 39:          0          0          0          0     GICv2 113 Level     zynqmp-dma
- 40:          0          0          0          0     GICv2 114 Level     zynqmp-dma
- 41:          0          0          0          0     GICv2 115 Level     zynqmp-dma
- 42:          0          0          0          0     GICv2 116 Level     zynqmp-dma
- 43:          0          0          0          0     GICv2 154 Level     fd4c0000.dma-controller
- 44:       5938          0          0          0     GICv2  47 Level     ff0f0000.spi
- 45:        134          0          0          0     GICv2  95 Level     eth0, eth0
- 46:          0          0          0          0     GICv2  57 Level     axi-pmon, axi-pmon
- 47:       4802          0          0          0     GICv2  49 Level     cdns-i2c
- 48:        501          0          0          0     GICv2  50 Level     cdns-i2c
- 50:          0          0          0          0     GICv2  84 Edge      ff150000.watchdog
- 51:          0          0          0          0     GICv2 151 Level     fd4a0000.display
- 52:        548          0          0          0     GICv2  81 Level     mmc0
- 53:          0          0          0          0     GICv2 165 Level     ahci-ceva[fd0c0000.ahci]
- 54:          0          0          0          0     GICv2  97 Level     xhci-hcd:usb1
- 55:          0          0          0          0  zynq-gpio  22 Edge      sw19
- 59:          2          0          0          0  gpio-xilinx   4 Edge      PL_GPIO_PB_SW9_N
- 60:          4          0          0          0  gpio-xilinx   3 Edge      PL_GPIO_PB_SW12_E
- 61:          2          0          0          0  gpio-xilinx   2 Edge      PL_GPIO_PB_SW13_S
- 62:          2          0          0          0  gpio-xilinx   1 Edge      PL_GPIO_PB_SW10_W
- 63:          2          0          0          0  gpio-xilinx   0 Edge      PL_GPIO_PB_SW11_C
- 64:          2          0          0          0  gpio-xilinx   7 Edge      PL_GPIO_DIP_SW7
- 65:          2          0          0          0  gpio-xilinx   6 Edge      PL_GPIO_DIP_SW6
- 66:          4          0          0          0  gpio-xilinx   5 Edge      PL_GPIO_DIP_SW5
- 67:          2          0          0          0  gpio-xilinx   4 Edge      PL_GPIO_DIP_SW4
- 68:          2          0          0          0  gpio-xilinx   3 Edge      PL_GPIO_DIP_SW3
- 69:          2          0          0          0  gpio-xilinx   2 Edge      PL_GPIO_DIP_SW2
- 70:          2          0          0          0  gpio-xilinx   1 Edge      PL_GPIO_DIP_SW1
- 71:          2          0          0          0  gpio-xilinx   0 Edge      PL_GPIO_DIP_SW0
-IPI0:        64         26         87         38       Rescheduling interrupts
-IPI1:      2163       6791       1243       5866       Function call interrupts
-IPI2:         0          0          0          0       CPU stop interrupts
-IPI3:         0          0          0          0       CPU stop (for crash dump) interrupts
-IPI4:         0          0          0          0       Timer broadcast interrupts
-IPI5:         0          0          0          0       IRQ work interrupts
-IPI6:         0          0          0          0       CPU wake-up interrupts
-Err:          0
-yocto-zynqmp-generic-20231:/home/petalinux#
-```
----
-
-### Unloading PL bitstream or pdi and dt overlay
-* Zynq or ZynqMP
-```
-yocto-zynqmp-generic-20231:/home/petalinux# fpgautil -R
-```
-* Versal (DFx RP)
-```
-root@yocto-vck190-dfx-2023:~# fpgautil -R -n PR0
-```
-* Versal (DFx Static)
-```
-root@yocto-vck190-dfx-2023:~# fpgautil -R -n Full
-```
----
-
-## References
-* https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/18841645/Solution+Zynq+PL+Programming+With+FPGA+Manager
-* https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/18841847/Solution+ZynqMP+PL+Programming
-* https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1188397412/Solution+Versal+PL+Programming
diff --git a/docs/README.fw.package.md b/docs/README.fw.package.md
new file mode 100644
index 00000000..a7e54402
--- /dev/null
+++ b/docs/README.fw.package.md
@@ -0,0 +1,61 @@
+# How to package and depoly firmware elf or bin to linux root filesystem
+
+* [Introduction](#introduction)
+* [How to create and install firmware package recipe](#how-to-create-and-install-firmware-package-recipe)
+
+## Introduction
+This readme describes how to package and deploy firmware baremetal or freertos
+application elf or bin files to linux root filesystem under /lib/firmware directory.
+Packaging an firmware baremetal or freertos application elf or bin files to linux
+root filesystem is not automated from multiconfig baremetal or freertos recipes.
+Hence user has to create a linux recipe and inherit fw-package which provides
+infrastructure to package and deploy firmware elf or bin files to linux root
+filesystem.
+
+## How to create and install firmware package recipe
+
+1. Follow [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md ) upto step 4.
+
+2. Create recipes-firmware directory in distribution meta layer.
+```
+$ mkdir -p <meta-layer>/recipes-firmware/<firmware-package-name>/
+```
+3. Now create the recipes firmware package using recipetool.
+```
+$ recipetool create -o <meta-layer>/recipes-firmware/<firmware-package-name>/firmware-package-name.bb 
+```
+4. Modify the recipe and inherit fw-package bbclass as shown below.
+
+> **Note:** 
+> * **DESTDIR:** Variable to specify elf or bin directory path. Default is set to
+>                /lib/firmware directory from fw-package,bbclass and user can
+>                change this value to /boot directory depending on requirement.
+> * **FW_NAME:** Variable to define firmware baremetal or freertos application
+>                recipe name.
+> * **TARGET_MC:** Variable to define one of the multiconfig target name
+>                  (ex: cortexr5-0-zynqmp-baremetal) from the BBMULTICONFIG list
+>                  generated at [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md )
+>                  step 4.
+
+```
+SUMMARY = "Recipe to package and deploy baremetal or freertos elf or bin to linux rootfs"
+LICENSE = "CLOSED"
+
+inherit fw-package
+
+FW_NAME = "hello-world"
+
+TARGET_MC = "cortexr5-0-zynqmp-baremetal"
+
+FW_MCDEPENDS := "mc::${TARGET_MC}:${FW_NAME}:do_deploy"
+FW_DEPLOY_DIR := "${TOPDIR}/tmp-${TARGET_MC}/deploy/images/${MACHINE}"
+```
+5. Add firmware-package recipe to image to local.conf as shown below.
+
+```
+IMAGE_INSTALL:append = " \
+    firmware-package-name \
+    "
+```
+6. Follow [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md ) and continue from
+   step 5.
diff --git a/meta-xilinx-bsp/conf/machine/sp701-microblazeel.conf b/meta-xilinx-bsp/conf/machine/sp701-microblazeel.conf
new file mode 100644
index 00000000..e3df1d26
--- /dev/null
+++ b/meta-xilinx-bsp/conf/machine/sp701-microblazeel.conf
@@ -0,0 +1,52 @@
+#@TYPE: Machine
+#@NAME: sp701-microblazeel
+#@DESCRIPTION: Machine configuration for the SP701 boards.
+
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'sp701-microblazeel:']['sp701-microblazeel' !='${MACHINE}']}"
+#### Regular settings follow
+
+# Variables that changes based on hw design or board specific requirement must be
+# defined before calling the required inclusion file else pre-expansion value
+# defined in microblazeel-generic.conf will be set.
+
+# Yocto device-tree variables
+YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
+YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0"
+DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
+DTC_FLAGS:pn-device-tree ?= ""
+XSCTH_PROC:pn-device-tree ?= "microblaze_0"
+YAML_DT_BOARD_FLAGS ?= "{BOARD sp701-rev1.0}"
+
+# Yocto u-boot-xlnx variables
+
+# Yocto FS-Boot variables
+YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
+YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
+YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0"
+YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
+XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
+
+# Yocto KERNEL Variables
+UBOOT_ENTRYPOINT  ?= "0x80000000"
+UBOOT_LOADADDRESS ?= "0x80000000"
+
+# xilinx-sp701 Serial Console
+SERIAL_CONSOLES ?= "115200;ttyUL0"
+YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
+
+# Set DDR Base address for u-boot-xlnx-scr variables
+DDR_BASEADDR ?= "0x80000000"
+SKIP_APPEND_BASEADDR ?= "0"
+
+# Required generic machine inclusion
+require conf/machine/microblaze-generic.conf
+
+# This machine conf file uses sp701-microblazeel xsa as reference input.
+# User can override with kc705 custom xsa using HDF_BASE and HDF_PATH variables
+# from local.conf.
+HDF_MACHINE = "sp701-microblazeel"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' sp701_microblazeel']['sp701-microblazeel' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
index fa4816af..7acda75e 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
@@ -5,3 +5,5 @@ COMPATIBLE_MACHINE:qemu-zynq7 = ".*"
 SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts"
 
 EXTRA_OVERLAYS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'provencore', ' pnc.dtsi', '', d)}"
+
+EXTRA_OVERLAYS:append:vek280-versal = " system-vek280.dtsi"
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-vek280.dtsi b/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-vek280.dtsi
new file mode 100644
index 00000000..0d2ca87d
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-vek280.dtsi
@@ -0,0 +1,20 @@
+/ {
+/* Reserve the bad block DDR memory for linux to not touch it, refer:CR-1143646 */
+reserved-memory {
+        #address-cells = <2>;
+        #size-cells = <2>;
+        ranges;
+        pl_ddr: buffer@0
+        {
+        no-map;
+        reg = <0x08 0x00 0x00 0x80000000>;
+        };
+
+        lpddr_memory: buffer@1
+        {
+        no-map;
+        reg = <0x500 0x0 0x2 0x0>;
+        };
+
+};
+};
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
new file mode 100644
index 00000000..660bc218
--- /dev/null
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
@@ -0,0 +1,305 @@
+From 21cc8144efdaa3cd8dbd7279f87b14fa3432fae4 Mon Sep 17 00:00:00 2001
+From: Jason Wu <jason.wu.misc@gmail.com>
+Date: Sun, 10 Apr 2016 13:14:13 +1000
+Subject: [PATCH 1/3] drm: xilinx: Add encoder for Digilent boards
+
+Add the dglnt_encoder driver that enables DRM support for the VGA and
+HDMI output ports found on many Digilent boards.
+
+Upstream-Status: Pending
+
+Signed-off-by: Sam Bobrowicz <sbobrowicz@digilentinc.com>
+Signed-off-by: Jason Wu <jason.wu.misc@gmail.com>
+---
+ .../bindings/drm/xilinx/dglnt_encoder.txt          |  23 +++
+ drivers/gpu/drm/xilinx/Kconfig                     |   6 +
+ drivers/gpu/drm/xilinx/Makefile                    |   1 +
+ drivers/gpu/drm/xilinx/dglnt_encoder.c             | 217 +++++++++++++++++++++
+ 4 files changed, 247 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt
+ create mode 100644 drivers/gpu/drm/xilinx/dglnt_encoder.c
+
+diff --git a/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt
+new file mode 100644
+index 0000000..242b24e
+--- /dev/null
++++ b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt
+@@ -0,0 +1,23 @@
++Device-Tree bindings for Digilent DRM Encoder Slave
++
++This driver provides support for VGA and HDMI outputs on Digilent FPGA boards.
++The VGA or HDMI port must be connected to a Xilinx display pipeline via an
++axi2vid IP core.
++
++Required properties:
++ - compatible: Should be "digilent,drm-encoder".
++
++Optional properties:
++ - dglnt,edid-i2c: The I2C device connected to the DDC bus on the video
++                   connector. This is used to obtain the supported resolutions
++                   of an attached monitor. If not defined, then a default
++                   set of resolutions is used and the display will initialize
++                   to 720p. Note most VGA connectors on Digilent boards do
++                   not have the DDC bus routed out.
++
++Example:
++
++       encoder_0: digilent_encoder {
++               compatible = "digilent,drm-encoder";
++               dglnt,edid-i2c = <&i2c1>;
++       };
+diff --git a/drivers/gpu/drm/xilinx/Kconfig b/drivers/gpu/drm/xilinx/Kconfig
+index 57e18a9..d9ecff2 100644
+--- a/drivers/gpu/drm/xilinx/Kconfig
++++ b/drivers/gpu/drm/xilinx/Kconfig
+@@ -33,6 +33,12 @@ config DRM_XILINX_DP_SUB
+        help
+          DRM driver for Xilinx Display Port Subsystem.
+ 
++config DRM_DIGILENT_ENCODER
++   tristate "Digilent VGA/HDMI DRM Encoder Driver"
++   depends on DRM_XILINX
++   help
++     DRM slave encoder for Video-out on Digilent boards.
++
+ config DRM_XILINX_DP_SUB_DEBUG_FS
+        bool "Xilinx DRM DPSUB debugfs"
+        depends on DEBUG_FS && DRM_XILINX_DP_SUB
+diff --git a/drivers/gpu/drm/xilinx/Makefile b/drivers/gpu/drm/xilinx/Makefile
+index 19bc154..c2717e40 100644
+--- a/drivers/gpu/drm/xilinx/Makefile
++++ b/drivers/gpu/drm/xilinx/Makefile
+@@ -7,6 +7,7 @@ xilinx_drm-y := xilinx_drm_crtc.o xilinx_drm_connector.o xilinx_drm_drv.o \
+                xilinx_drm_plane.o
+ xilinx_drm-y += xilinx_cresample.o xilinx_osd.o xilinx_rgb2yuv.o xilinx_vtc.o
+ 
++obj-$(CONFIG_DRM_DIGILENT_ENCODER) += dglnt_encoder.o
+ obj-$(CONFIG_DRM_XILINX) += xilinx_drm.o
+ obj-$(CONFIG_DRM_XILINX_DP) += xilinx_drm_dp.o
+ obj-$(CONFIG_DRM_XILINX_DP_SUB) += xilinx_drm_dp_sub.o
+diff --git a/drivers/gpu/drm/xilinx/dglnt_encoder.c b/drivers/gpu/drm/xilinx/dglnt_encoder.c
+new file mode 100644
+index 0000000..cb9fc7d
+--- /dev/null
++++ b/drivers/gpu/drm/xilinx/dglnt_encoder.c
+@@ -0,0 +1,217 @@
++/*
++ * dglnt_encoder.c - DRM slave encoder for Video-out on Digilent boards
++ *
++ * Copyright (C) 2015 Digilent
++ * Author: Sam Bobrowicz <sbobrowicz@digilentinc.com>
++ *
++ * Based on udl_encoder.c and udl_connector.c, Copyright (C) 2012 Red Hat.
++ * Also based on xilinx_drm_dp.c, Copyright (C) 2014 Xilinx, Inc.
++ *
++ * This software is licensed under the terms of the GNU General Public
++ * License version 2, as published by the Free Software Foundation, and
++ * may be copied, distributed, and modified under those terms.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ */
++
++#include <drm/drmP.h>
++#include <drm/drm_edid.h>
++#include <drm/drm_encoder_slave.h>
++
++#include <linux/device.h>
++#include <linux/module.h>
++#include <linux/err.h>
++#include <linux/i2c.h>
++#include <linux/of.h>
++#include <linux/of_platform.h>
++#include <linux/platform_device.h>
++
++#define DGLNT_ENC_MAX_FREQ 150000
++#define DGLNT_ENC_MAX_H 1920
++#define DGLNT_ENC_MAX_V 1080
++#define DGLNT_ENC_PREF_H 1280
++#define DGLNT_ENC_PREF_V 720
++
++struct dglnt_encoder {
++       struct drm_encoder *encoder;
++       struct i2c_adapter *i2c_bus;
++       bool i2c_present;
++};
++
++static inline struct dglnt_encoder *to_dglnt_encoder(
++                                       struct drm_encoder *encoder)
++{
++       return to_encoder_slave(encoder)->slave_priv;
++}
++
++static bool dglnt_mode_fixup(struct drm_encoder *encoder,
++                               const struct drm_display_mode *mode,
++                               struct drm_display_mode *adjusted_mode)
++{
++       return true;
++}
++
++static void dglnt_encoder_mode_set(struct drm_encoder *encoder,
++                               struct drm_display_mode *mode,
++                               struct drm_display_mode *adjusted_mode)
++{
++}
++
++static void
++dglnt_encoder_dpms(struct drm_encoder *encoder, int mode)
++{
++}
++
++static void dglnt_encoder_save(struct drm_encoder *encoder)
++{
++}
++
++static void dglnt_encoder_restore(struct drm_encoder *encoder)
++{
++}
++
++static int dglnt_encoder_mode_valid(struct drm_encoder *encoder,
++                               struct drm_display_mode *mode)
++{
++       if (mode &&
++               !(mode->flags & ((DRM_MODE_FLAG_INTERLACE |
++                       DRM_MODE_FLAG_DBLCLK) | DRM_MODE_FLAG_3D_MASK)) &&
++               (mode->clock <= DGLNT_ENC_MAX_FREQ) &&
++               (mode->hdisplay <= DGLNT_ENC_MAX_H) &&
++               (mode->vdisplay <= DGLNT_ENC_MAX_V))
++               return MODE_OK;
++       return MODE_BAD;
++}
++
++static int dglnt_encoder_get_modes(struct drm_encoder *encoder,
++                               struct drm_connector *connector)
++{
++       struct dglnt_encoder *dglnt = to_dglnt_encoder(encoder);
++       struct edid *edid;
++       int num_modes = 0;
++
++       if (dglnt->i2c_present) {
++               edid = drm_get_edid(connector, dglnt->i2c_bus);
++               drm_connector_update_edid_property(connector, edid);
++               if (edid) {
++                       num_modes = drm_add_edid_modes(connector, edid);
++                       kfree(edid);
++               }
++       } else {
++               num_modes = drm_add_modes_noedid(connector, DGLNT_ENC_MAX_H,
++                                               DGLNT_ENC_MAX_V);
++               drm_set_preferred_mode(connector, DGLNT_ENC_PREF_H,
++                                       DGLNT_ENC_PREF_V);
++       }
++       return num_modes;
++}
++
++static enum drm_connector_status dglnt_encoder_detect(
++                                       struct drm_encoder *encoder,
++                                       struct drm_connector *connector)
++{
++       struct dglnt_encoder *dglnt = to_dglnt_encoder(encoder);
++
++       if (dglnt->i2c_present) {
++               if (drm_probe_ddc(dglnt->i2c_bus))
++                       return connector_status_connected;
++               return connector_status_disconnected;
++       } else
++               return connector_status_unknown;
++}
++
++static struct drm_encoder_slave_funcs dglnt_encoder_slave_funcs = {
++       .dpms                   = dglnt_encoder_dpms,
++       .save                   = dglnt_encoder_save,
++       .restore                = dglnt_encoder_restore,
++       .mode_fixup             = dglnt_mode_fixup,
++       .mode_valid             = dglnt_encoder_mode_valid,
++       .mode_set               = dglnt_encoder_mode_set,
++       .detect                 = dglnt_encoder_detect,
++       .get_modes              = dglnt_encoder_get_modes,
++};
++
++static int dglnt_encoder_encoder_init(struct platform_device *pdev,
++                               struct drm_device *dev,
++                               struct drm_encoder_slave *encoder)
++{
++       struct dglnt_encoder *dglnt = platform_get_drvdata(pdev);
++       struct device_node *sub_node;
++
++       encoder->slave_priv = dglnt;
++       encoder->slave_funcs = &dglnt_encoder_slave_funcs;
++
++       dglnt->encoder = &encoder->base;
++
++       /* get i2c adapter for edid */
++       dglnt->i2c_present = false;
++       sub_node = of_parse_phandle(pdev->dev.of_node, "dglnt,edid-i2c", 0);
++       if (sub_node) {
++               dglnt->i2c_bus = of_find_i2c_adapter_by_node(sub_node);
++               if (!dglnt->i2c_bus)
++                       DRM_INFO("failed to get the edid i2c adapter, using default modes\n");
++               else
++                       dglnt->i2c_present = true;
++               of_node_put(sub_node);
++       }
++
++       return 0;
++}
++
++static int dglnt_encoder_probe(struct platform_device *pdev)
++{
++       struct dglnt_encoder *dglnt;
++
++       dglnt = devm_kzalloc(&pdev->dev, sizeof(*dglnt), GFP_KERNEL);
++       if (!dglnt)
++               return -ENOMEM;
++
++       platform_set_drvdata(pdev, dglnt);
++
++       return 0;
++}
++
++static int dglnt_encoder_remove(struct platform_device *pdev)
++{
++       return 0;
++}
++
++static const struct of_device_id dglnt_encoder_of_match[] = {
++       { .compatible = "digilent,drm-encoder", },
++       { /* end of table */ },
++};
++MODULE_DEVICE_TABLE(of, dglnt_encoder_of_match);
++
++static struct drm_platform_encoder_driver dglnt_encoder_driver = {
++       .platform_driver = {
++               .probe                  = dglnt_encoder_probe,
++               .remove                 = dglnt_encoder_remove,
++               .driver                 = {
++                       .owner          = THIS_MODULE,
++                       .name           = "dglnt-drm-enc",
++                       .of_match_table = dglnt_encoder_of_match,
++               },
++       },
++
++       .encoder_init = dglnt_encoder_encoder_init,
++};
++
++static int __init dglnt_encoder_init(void)
++{
++       return platform_driver_register(&dglnt_encoder_driver.platform_driver);
++}
++
++static void __exit dglnt_encoder_exit(void)
++{
++       platform_driver_unregister(&dglnt_encoder_driver.platform_driver);
++}
++
++module_init(dglnt_encoder_init);
++module_exit(dglnt_encoder_exit);
++
++MODULE_AUTHOR("Digilent, Inc.");
++MODULE_DESCRIPTION("DRM slave encoder for Video-out on Digilent boards");
++MODULE_LICENSE("GPL v2");
+-- 
+2.7.4
+
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
new file mode 100644
index 00000000..9b6229db
--- /dev/null
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
@@ -0,0 +1,607 @@
+From 217e3b6f4393926b8dcad841381527ef3fc808c2 Mon Sep 17 00:00:00 2001
+From: Jason Wu <jason.wu.misc@gmail.com>
+Date: Sun, 10 Apr 2016 13:16:06 +1000
+Subject: [PATCH 2/3] clk: Add driver for axi_dynclk IP Core
+
+Add support for the axi_dynclk IP Core available from Digilent. This IP
+core dynamically configures the clock resources inside a Xilinx FPGA to
+generate a clock with a software programmable frequency.
+
+Upstream-Status: Pending
+
+Signed-off-by: Sam Bobrowicz <sbobrowicz@digilentinc.com>
+Signed-off-by: Jason Wu <jason.wu.misc@gmail.com>
+---
+ drivers/clk/Kconfig            |   8 +
+ drivers/clk/Makefile           |   1 +
+ drivers/clk/clk-dglnt-dynclk.c | 547 +++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 556 insertions(+)
+ create mode 100644 drivers/clk/clk-dglnt-dynclk.c
+
+diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
+index dccb111100..7fe65a702b 100644
+--- a/drivers/clk/Kconfig
++++ b/drivers/clk/Kconfig
+@@ -148,6 +148,14 @@ config CLK_QORIQ
+          This adds the clock driver support for Freescale QorIQ platforms
+          using common clock framework.
+ 
++config COMMON_CLK_DGLNT_DYNCLK
++       tristate "Digilent axi_dynclk Driver"
++       depends on ARCH_ZYNQ || MICROBLAZE
++       help
++       ---help---
++         Support for the Digilent AXI Dynamic Clock core for Xilinx
++         FPGAs.
++
+ config COMMON_CLK_XGENE
+        bool "Clock driver for APM XGene SoC"
+        default y
+diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
+index 0760449dde..45ce97d053 100644
+--- a/drivers/clk/Makefile
++++ b/drivers/clk/Makefile
+@@ -24,6 +24,7 @@ obj-$(CONFIG_COMMON_CLK_CDCE706)      += clk-cdce706.o
+ obj-$(CONFIG_COMMON_CLK_CDCE925)       += clk-cdce925.o
+ obj-$(CONFIG_ARCH_CLPS711X)            += clk-clps711x.o
+ obj-$(CONFIG_COMMON_CLK_CS2000_CP)     += clk-cs2000-cp.o
++obj-$(CONFIG_COMMON_CLK_DGLNT_DYNCLK)  += clk-dglnt-dynclk.o
+ obj-$(CONFIG_ARCH_EFM32)               += clk-efm32gg.o
+ obj-$(CONFIG_ARCH_HIGHBANK)            += clk-highbank.o
+ obj-$(CONFIG_COMMON_CLK_MAX77686)      += clk-max77686.o
+diff --git a/drivers/clk/clk-dglnt-dynclk.c b/drivers/clk/clk-dglnt-dynclk.c
+new file mode 100644
+index 0000000000..496ad5fc90
+--- /dev/null
++++ b/drivers/clk/clk-dglnt-dynclk.c
+@@ -0,0 +1,547 @@
++/*
++ * clk-dglnt-dynclk.c - Digilent AXI Dynamic Clock (axi_dynclk) Driver
++ *
++ * Copyright (C) 2015 Digilent
++ * Author: Sam Bobrowicz <sbobrowicz@digilentinc.com>
++ *
++ * Reused code from clk-axi-clkgen.c, Copyright (C) 2012-2013 Analog Devices Inc.
++ *
++ * This software is licensed under the terms of the GNU General Public
++ * License version 2, as published by the Free Software Foundation, and
++ * may be copied, distributed, and modified under those terms.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ */
++
++#include <linux/platform_device.h>
++#include <linux/clk-provider.h>
++#include <linux/clk.h>
++#include <linux/slab.h>
++#include <linux/io.h>
++#include <linux/of.h>
++#include <linux/module.h>
++#include <linux/err.h>
++#include <linux/kernel.h>
++
++#define CLK_BIT_WEDGE 13
++#define CLK_BIT_NOCOUNT 12
++
++/* This value is used to signal an error */
++#define ERR_CLKCOUNTCALC 0xFFFFFFFF
++#define ERR_CLKDIVIDER (1 << CLK_BIT_WEDGE | 1 << CLK_BIT_NOCOUNT)
++
++#define DYNCLK_DIV_1_REGMASK 0x1041
++/* 25 MHz (125 KHz / 5) */
++#define DYNCLK_DEFAULT_FREQ 125000
++
++#define MMCM_FREQ_VCOMIN 600000
++#define MMCM_FREQ_VCOMAX 1200000
++#define MMCM_FREQ_PFDMIN 10000
++#define MMCM_FREQ_PFDMAX 450000
++#define MMCM_FREQ_OUTMIN 4000
++#define MMCM_FREQ_OUTMAX 800000
++#define MMCM_DIV_MAX 106
++#define MMCM_FB_MIN 2
++#define MMCM_FB_MAX 64
++#define MMCM_CLKDIV_MAX 128
++#define MMCM_CLKDIV_MIN 1
++
++#define OFST_DISPLAY_CTRL 0x0
++#define OFST_DISPLAY_STATUS 0x4
++#define OFST_DISPLAY_CLK_L 0x8
++#define OFST_DISPLAY_FB_L 0x0C
++#define OFST_DISPLAY_FB_H_CLK_H 0x10
++#define OFST_DISPLAY_DIV 0x14
++#define OFST_DISPLAY_LOCK_L 0x18
++#define OFST_DISPLAY_FLTR_LOCK_H 0x1C
++
++static const u64 lock_lookup[64] = {
++       0b0011000110111110100011111010010000000001,
++       0b0011000110111110100011111010010000000001,
++       0b0100001000111110100011111010010000000001,
++       0b0101101011111110100011111010010000000001,
++       0b0111001110111110100011111010010000000001,
++       0b1000110001111110100011111010010000000001,
++       0b1001110011111110100011111010010000000001,
++       0b1011010110111110100011111010010000000001,
++       0b1100111001111110100011111010010000000001,
++       0b1110011100111110100011111010010000000001,
++       0b1111111111111000010011111010010000000001,
++       0b1111111111110011100111111010010000000001,
++       0b1111111111101110111011111010010000000001,
++       0b1111111111101011110011111010010000000001,
++       0b1111111111101000101011111010010000000001,
++       0b1111111111100111000111111010010000000001,
++       0b1111111111100011111111111010010000000001,
++       0b1111111111100010011011111010010000000001,
++       0b1111111111100000110111111010010000000001,
++       0b1111111111011111010011111010010000000001,
++       0b1111111111011101101111111010010000000001,
++       0b1111111111011100001011111010010000000001,
++       0b1111111111011010100111111010010000000001,
++       0b1111111111011001000011111010010000000001,
++       0b1111111111011001000011111010010000000001,
++       0b1111111111010111011111111010010000000001,
++       0b1111111111010101111011111010010000000001,
++       0b1111111111010101111011111010010000000001,
++       0b1111111111010100010111111010010000000001,
++       0b1111111111010100010111111010010000000001,
++       0b1111111111010010110011111010010000000001,
++       0b1111111111010010110011111010010000000001,
++       0b1111111111010010110011111010010000000001,
++       0b1111111111010001001111111010010000000001,
++       0b1111111111010001001111111010010000000001,
++       0b1111111111010001001111111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001,
++       0b1111111111001111101011111010010000000001
++};
++
++static const u32 filter_lookup_low[64] = {
++       0b0001011111,
++       0b0001010111,
++       0b0001111011,
++       0b0001011011,
++       0b0001101011,
++       0b0001110011,
++       0b0001110011,
++       0b0001110011,
++       0b0001110011,
++       0b0001001011,
++       0b0001001011,
++       0b0001001011,
++       0b0010110011,
++       0b0001010011,
++       0b0001010011,
++       0b0001010011,
++       0b0001010011,
++       0b0001010011,
++       0b0001010011,
++       0b0001010011,
++       0b0001010011,
++       0b0001010011,
++       0b0001010011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0001100011,
++       0b0010010011,
++       0b0010010011,
++       0b0010010011,
++       0b0010010011,
++       0b0010010011,
++       0b0010010011,
++       0b0010010011,
++       0b0010010011,
++       0b0010010011,
++       0b0010010011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011,
++       0b0010100011
++};
++
++struct dglnt_dynclk_reg;
++struct dglnt_dynclk_mode;
++struct dglnt_dynclk;
++
++struct dglnt_dynclk_reg {
++       u32 clk0L;
++       u32 clkFBL;
++       u32 clkFBH_clk0H;
++       u32 divclk;
++       u32 lockL;
++       u32 fltr_lockH;
++};
++
++struct dglnt_dynclk_mode {
++       u32 freq;
++       u32 fbmult;
++       u32 clkdiv;
++       u32 maindiv;
++};
++
++struct dglnt_dynclk {
++       void __iomem *base;
++       struct clk_hw clk_hw;
++       unsigned long freq;
++};
++
++u32 dglnt_dynclk_divider(u32 divide)
++{
++       u32 output = 0;
++       u32 highTime = 0;
++       u32 lowTime = 0;
++
++       if ((divide < 1) || (divide > 128))
++               return ERR_CLKDIVIDER;
++
++       if (divide == 1)
++               return DYNCLK_DIV_1_REGMASK;
++
++       highTime = divide / 2;
++       /* if divide is odd */
++       if (divide & 0x1) {
++               lowTime = highTime + 1;
++               output = 1 << CLK_BIT_WEDGE;
++       } else {
++               lowTime = highTime;
++       }
++
++       output |= 0x03F & lowTime;
++       output |= 0xFC0 & (highTime << 6);
++       return output;
++}
++
++u32 dglnt_dynclk_count_calc(u32 divide)
++{
++       u32 output = 0;
++       u32 divCalc = 0;
++
++       divCalc = dglnt_dynclk_divider(divide);
++       if (divCalc == ERR_CLKDIVIDER)
++               output = ERR_CLKCOUNTCALC;
++       else
++               output = (0xFFF & divCalc) | ((divCalc << 10) & 0x00C00000);
++       return output;
++}
++
++
++int dglnt_dynclk_find_reg(struct dglnt_dynclk_reg *regValues,
++                         struct dglnt_dynclk_mode *clkParams)
++{
++       if ((clkParams->fbmult < 2) || clkParams->fbmult > 64)
++               return -EINVAL;
++
++       regValues->clk0L = dglnt_dynclk_count_calc(clkParams->clkdiv);
++       if (regValues->clk0L == ERR_CLKCOUNTCALC)
++               return -EINVAL;
++
++       regValues->clkFBL = dglnt_dynclk_count_calc(clkParams->fbmult);
++       if (regValues->clkFBL == ERR_CLKCOUNTCALC)
++               return -EINVAL;
++
++       regValues->clkFBH_clk0H = 0;
++
++       regValues->divclk = dglnt_dynclk_divider(clkParams->maindiv);
++       if (regValues->divclk == ERR_CLKDIVIDER)
++               return -EINVAL;
++
++       regValues->lockL = (u32)(lock_lookup[clkParams->fbmult - 1] &
++                                0xFFFFFFFF);
++
++       regValues->fltr_lockH = (u32)((lock_lookup[clkParams->fbmult - 1] >>
++                                      32) & 0x000000FF);
++       regValues->fltr_lockH |= ((filter_lookup_low[clkParams->fbmult - 1] <<
++                                  16) & 0x03FF0000);
++
++       return 0;
++}
++
++void dglnt_dynclk_write_reg(struct dglnt_dynclk_reg *regValues,
++                           void __iomem *baseaddr)
++{
++       writel(regValues->clk0L, baseaddr + OFST_DISPLAY_CLK_L);
++       writel(regValues->clkFBL, baseaddr + OFST_DISPLAY_FB_L);
++       writel(regValues->clkFBH_clk0H, baseaddr + OFST_DISPLAY_FB_H_CLK_H);
++       writel(regValues->divclk, baseaddr + OFST_DISPLAY_DIV);
++       writel(regValues->lockL, baseaddr + OFST_DISPLAY_LOCK_L);
++       writel(regValues->fltr_lockH, baseaddr + OFST_DISPLAY_FLTR_LOCK_H);
++}
++
++u32 dglnt_dynclk_find_mode(u32 freq, u32 parentFreq,
++                          struct dglnt_dynclk_mode *bestPick)
++{
++       u32 bestError = MMCM_FREQ_OUTMAX;
++       u32 curError;
++       u32 curClkMult;
++       u32 curFreq;
++       u32 divVal;
++       u32 curFb, curClkDiv;
++       u32 minFb = 0;
++       u32 maxFb = 0;
++       u32 curDiv = 1;
++       u32 maxDiv;
++       bool freq_found = false;
++
++       bestPick->freq = 0;
++       if (parentFreq == 0)
++               return 0;
++
++       /* minimum frequency is actually dictated by VCOmin */
++       if (freq < MMCM_FREQ_OUTMIN)
++               freq = MMCM_FREQ_OUTMIN;
++       if (freq > MMCM_FREQ_OUTMAX)
++               freq = MMCM_FREQ_OUTMAX;
++
++       if (parentFreq > MMCM_FREQ_PFDMAX)
++               curDiv = 2;
++       maxDiv = parentFreq / MMCM_FREQ_PFDMIN;
++       if (maxDiv > MMCM_DIV_MAX)
++               maxDiv = MMCM_DIV_MAX;
++
++       while (curDiv <= maxDiv && !freq_found) {
++               minFb = curDiv * DIV_ROUND_UP(MMCM_FREQ_VCOMIN, parentFreq);
++               maxFb = curDiv * (MMCM_FREQ_VCOMAX / parentFreq);
++               if (maxFb > MMCM_FB_MAX)
++                       maxFb = MMCM_FB_MAX;
++               if (minFb < MMCM_FB_MIN)
++                       minFb = MMCM_FB_MIN;
++
++               divVal = curDiv * freq;
++               /*
++                * This multiplier is used to find the best clkDiv value for
++                * each FB value
++                */
++               curClkMult = ((parentFreq * 1000) + (divVal / 2)) / divVal;
++
++               curFb = minFb;
++               while (curFb <= maxFb && !freq_found) {
++                       curClkDiv = ((curClkMult * curFb) + 500) / 1000;
++                       if (curClkDiv > MMCM_CLKDIV_MAX)
++                               curClkDiv = MMCM_CLKDIV_MAX;
++                       if (curClkDiv < MMCM_CLKDIV_MIN)
++                               curClkDiv = MMCM_CLKDIV_MIN;
++                       curFreq = (((parentFreq * curFb) / curDiv) / curClkDiv);
++                       if (curFreq >= freq)
++                               curError = curFreq - freq;
++                       else
++                               curError = freq - curFreq;
++                       if (curError < bestError) {
++                               bestError = curError;
++                               bestPick->clkdiv = curClkDiv;
++                               bestPick->fbmult = curFb;
++                               bestPick->maindiv = curDiv;
++                               bestPick->freq = curFreq;
++                       }
++                       if (!curError)
++                               freq_found = true;
++                       curFb++;
++               }
++               curDiv++;
++       }
++       return bestPick->freq;
++}
++
++static struct dglnt_dynclk *clk_hw_to_dglnt_dynclk(struct clk_hw *clk_hw)
++{
++       return container_of(clk_hw, struct dglnt_dynclk, clk_hw);
++}
++
++
++static int dglnt_dynclk_enable(struct clk_hw *clk_hw)
++{
++       struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw);
++       unsigned int clock_state;
++
++       if (dglnt_dynclk->freq) {
++               writel(1, dglnt_dynclk->base + OFST_DISPLAY_CTRL);
++               do {
++                       clock_state = readl(dglnt_dynclk->base +
++                                           OFST_DISPLAY_STATUS);
++               } while (!clock_state);
++       }
++       return 0;
++}
++
++static void dglnt_dynclk_disable(struct clk_hw *clk_hw)
++{
++       struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw);
++
++       writel(0, dglnt_dynclk->base + OFST_DISPLAY_CTRL);
++}
++
++static int dglnt_dynclk_set_rate(struct clk_hw *clk_hw,
++       unsigned long rate, unsigned long parent_rate)
++{
++       struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw);
++       struct dglnt_dynclk_reg clkReg;
++       struct dglnt_dynclk_mode clkMode;
++
++       if (parent_rate == 0 || rate == 0)
++               return -EINVAL;
++       if (rate == dglnt_dynclk->freq)
++               return 0;
++
++       /*
++        * Convert from Hz to KHz, then multiply by five to account for
++        * BUFR division
++        */
++       rate = (rate + 100) / 200;
++       /* convert from Hz to KHz */
++       parent_rate = (parent_rate + 500) / 1000;
++       if (!dglnt_dynclk_find_mode(rate, parent_rate, &clkMode))
++               return -EINVAL;
++
++       /*
++        * Write to the PLL dynamic configuration registers to configure it
++        * with the calculated parameters.
++        */
++       dglnt_dynclk_find_reg(&clkReg, &clkMode);
++       dglnt_dynclk_write_reg(&clkReg, dglnt_dynclk->base);
++       dglnt_dynclk->freq = clkMode.freq * 200;
++       dglnt_dynclk_disable(clk_hw);
++       dglnt_dynclk_enable(clk_hw);
++
++       return 0;
++}
++
++static long dglnt_dynclk_round_rate(struct clk_hw *hw, unsigned long rate,
++       unsigned long *parent_rate)
++{
++       struct dglnt_dynclk_mode clkMode;
++
++       dglnt_dynclk_find_mode(((rate + 100) / 200),
++               ((*parent_rate) + 500) / 1000, &clkMode);
++
++       return (clkMode.freq * 200);
++}
++
++static unsigned long dglnt_dynclk_recalc_rate(struct clk_hw *clk_hw,
++       unsigned long parent_rate)
++{
++       struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw);
++
++       return dglnt_dynclk->freq;
++}
++
++
++static const struct clk_ops dglnt_dynclk_ops = {
++       .recalc_rate = dglnt_dynclk_recalc_rate,
++       .round_rate = dglnt_dynclk_round_rate,
++       .set_rate = dglnt_dynclk_set_rate,
++       .enable = dglnt_dynclk_enable,
++       .disable = dglnt_dynclk_disable,
++};
++
++static const struct of_device_id dglnt_dynclk_ids[] = {
++       { .compatible = "digilent,axi-dynclk", },
++       { },
++};
++MODULE_DEVICE_TABLE(of, dglnt_dynclk_ids);
++
++static int dglnt_dynclk_probe(struct platform_device *pdev)
++{
++       const struct of_device_id *id;
++       struct dglnt_dynclk *dglnt_dynclk;
++       struct clk_init_data init;
++       const char *parent_name;
++       const char *clk_name;
++       struct resource *mem;
++       struct clk *clk;
++
++       if (!pdev->dev.of_node)
++               return -ENODEV;
++
++       id = of_match_node(dglnt_dynclk_ids, pdev->dev.of_node);
++       if (!id)
++               return -ENODEV;
++
++       dglnt_dynclk = devm_kzalloc(&pdev->dev, sizeof(*dglnt_dynclk),
++                                   GFP_KERNEL);
++       if (!dglnt_dynclk)
++               return -ENOMEM;
++
++       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++       dglnt_dynclk->base = devm_ioremap_resource(&pdev->dev, mem);
++       if (IS_ERR(dglnt_dynclk->base))
++               return PTR_ERR(dglnt_dynclk->base);
++
++       parent_name = of_clk_get_parent_name(pdev->dev.of_node, 0);
++       if (!parent_name)
++               return -EINVAL;
++
++       clk_name = pdev->dev.of_node->name;
++       of_property_read_string(pdev->dev.of_node, "clock-output-names",
++               &clk_name);
++
++       init.name = clk_name;
++       init.ops = &dglnt_dynclk_ops;
++       init.flags = 0;
++       init.parent_names = &parent_name;
++       init.num_parents = 1;
++
++       dglnt_dynclk->freq = 0;
++       dglnt_dynclk_disable(&dglnt_dynclk->clk_hw);
++
++       dglnt_dynclk->clk_hw.init = &init;
++       clk = devm_clk_register(&pdev->dev, &dglnt_dynclk->clk_hw);
++       if (IS_ERR(clk))
++               return PTR_ERR(clk);
++
++       return of_clk_add_provider(pdev->dev.of_node, of_clk_src_simple_get,
++                                  clk);
++}
++
++static int dglnt_dynclk_remove(struct platform_device *pdev)
++{
++       of_clk_del_provider(pdev->dev.of_node);
++
++       return 0;
++}
++
++static struct platform_driver dglnt_dynclk_driver = {
++       .driver = {
++               .name = "dglnt-dynclk",
++               .owner = THIS_MODULE,
++               .of_match_table = dglnt_dynclk_ids,
++       },
++       .probe = dglnt_dynclk_probe,
++       .remove = dglnt_dynclk_remove,
++};
++module_platform_driver(dglnt_dynclk_driver);
++
++MODULE_LICENSE("GPL v2");
++MODULE_AUTHOR("Sam Bobrowicz <sbobrowicz@digilentinc.com>");
++MODULE_DESCRIPTION("CCF Driver for Digilent axi_dynclk IP Core");
+-- 
+2.14.2
+
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
new file mode 100644
index 00000000..a98d84c5
--- /dev/null
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
@@ -0,0 +1,54 @@
+From 1a18e2b514ae9e75145597ac509a87f656c976ba Mon Sep 17 00:00:00 2001
+From: Nathan Rossi <nathan@nathanrossi.com>
+Date: Mon, 2 May 2016 23:46:42 +1000
+Subject: [PATCH 3/3] drm: xilinx: Fix DPMS transition to on
+
+Fix the issues where the VTC is reset (losing its timing config).
+
+Also fix the issue where the plane destroys its DMA descriptors and
+marks the DMA channels as inactive but never recreates the descriptors
+and never updates the active state when turning DPMS back on.
+
+Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
+Upstream-Status: Pending [This is a workaround]
+---
+ drivers/gpu/drm/xilinx/xilinx_drm_crtc.c  | 1 -
+ drivers/gpu/drm/xilinx/xilinx_drm_plane.c | 3 ++-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c b/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c
+index 631d35b921..93dbd4b58a 100644
+--- a/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c
++++ b/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c
+@@ -88,7 +88,6 @@ static void xilinx_drm_crtc_dpms(struct drm_crtc *base_crtc, int dpms)
+        default:
+                if (crtc->vtc) {
+                        xilinx_vtc_disable(crtc->vtc);
+-                       xilinx_vtc_reset(crtc->vtc);
+                }
+                if (crtc->cresample) {
+                        xilinx_cresample_disable(crtc->cresample);
+diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_plane.c b/drivers/gpu/drm/xilinx/xilinx_drm_plane.c
+index 6a248b72d4..d2518a4bdf 100644
+--- a/drivers/gpu/drm/xilinx/xilinx_drm_plane.c
++++ b/drivers/gpu/drm/xilinx/xilinx_drm_plane.c
+@@ -140,7 +140,7 @@ void xilinx_drm_plane_commit(struct drm_plane *base_plane)
+        for (i = 0; i < MAX_NUM_SUB_PLANES; i++) {
+                struct xilinx_drm_plane_dma *dma = &plane->dma[i];
+ 
+-               if (dma->chan && dma->is_active) {
++               if (dma->chan) {
+                        flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;
+                        desc = dmaengine_prep_interleaved_dma(dma->chan,
+                                                              &dma->xt,
+@@ -153,6 +153,7 @@ void xilinx_drm_plane_commit(struct drm_plane *base_plane)
+                        dmaengine_submit(desc);
+ 
+                        dma_async_issue_pending(dma->chan);
++                       dma->is_active = true;
+                }
+        }
+ }
+-- 
+2.14.2
+
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0004-minized-wifi-bluetooth.cfg b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0004-minized-wifi-bluetooth.cfg
new file mode 100644
index 00000000..f71e53ab
--- /dev/null
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2024.1/0004-minized-wifi-bluetooth.cfg
@@ -0,0 +1,33 @@
+#
+# Bluetooth config
+#
+CONFIG_BT=y
+CONFIG_BT_BREDR=y
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_BCM=y
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HIDP=y
+CONFIG_CFG80211=y
+CONFIG_CFG80211_DEFAULT_PS=y
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_BRCMUTIL=y
+CONFIG_BRCMFMAC=y
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CMAC=y
+CONFIG_CRYPTO_SHA256=y
+
+#
+# Regulator config
+#
+CONFIG_REGMAP_IRQ=y
+CONFIG_I2C_XILINX=y
+CONFIG_MFD_DA9062=y
+CONFIG_REGULATOR_DA9062=y
+
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2024.1.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2024.1.bbappend
new file mode 100644
index 00000000..c789c7a9
--- /dev/null
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2024.1.bbappend
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx/v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}:"
+
+# Note: These patches are very old and doesn't apply on top of 5.x
+#       kernel. For more details refer README.md file.
+
+#SRC_URI:append:zybo-linux-bd-zynq7 = " \
+#       file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \
+#       file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \
+#       file://0003-drm-xilinx-Fix-DPMS-transition-to-on.patch \
+#       "
+
+SRC_URI:append:minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg"
diff --git a/meta-xilinx-core/classes/xilinx-microblaze.bbclass b/meta-xilinx-core/classes-global/xilinx-microblaze.bbclass
index ed231a3a..ed231a3a 100644
--- a/meta-xilinx-core/classes/xilinx-microblaze.bbclass
+++ b/meta-xilinx-core/classes-global/xilinx-microblaze.bbclass
diff --git a/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass b/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
new file mode 100644
index 00000000..ed4c1f87
--- /dev/null
+++ b/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
@@ -0,0 +1,142 @@
+#
+# Copyright (C) 2023, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+
+QSPI_SIZE ?= "0x2280000"
+
+# Register values
+IDN_REG ?= "0x4D554241"
+VERSION_REG ?= "0x1"
+LENGTH_REG ?= "0x4"
+PERSISTENT_REG ?= "0x01010000"
+
+# QSPI Offsets
+IMAGE_SELECTOR_OFFSET ?= "0x0"
+IMAGE_SELECTOR_BACKUP_OFFSET ?= "0x80000"
+PERSISTENT_REG_OFFSET ?= "0x100000"
+PERSISTENT_REG_BACKUP_OFFSET ?= "0x120000"
+IMAGE_A_OFFSET ?= "0x200000"
+IMAGE_A_IMGSEL_OFFSET ?= "0xF00000"
+IMAGE_B_OFFSET ?= "0xF80000"
+IMAGE_B_IMGSEL_OFFSET ?= "0x1C80000"
+IMAGE_RCVRY_OFFSET ?= "0x1E00000"
+IMAGE_RCVRY_BACKUP_OFFSET ?= "0x2000000"
+VERSION_OFFSET ?= "0x2240000"
+CHECKSUM_OFFSET ?= "0x2250000"
+
+def generate_spi_image(d):
+
+    import io
+    import hashlib
+    import time
+
+    qspi_size = int(d.getVar("QSPI_SIZE") or '0', 0)
+    int(d.getVar("QSPI_SIZE") or '0', 0)
+
+    # Register values
+    idn_reg = int(d.getVar("IDN_REG") or '0', 0)
+    version_reg = int(d.getVar("VERSION_REG") or '0', 0)
+    length_reg = int(d.getVar("LENGTH_REG") or '0', 0)
+    persistent_reg = int(d.getVar("PERSISTENT_REG") or '0', 0)
+
+    # QSPI Offsets
+    image_selector_offset = int(d.getVar("IMAGE_SELECTOR_OFFSET") or '0', 0)
+    image_selector_backup_offset = int(d.getVar("IMAGE_SELECTOR_BACKUP_OFFSET") or '0', 0)
+    persistent_reg_offset = int(d.getVar("PERSISTENT_REG_OFFSET") or '0', 0)
+    persistent_reg_backup_offset = int(d.getVar("PERSISTENT_REG_BACKUP_OFFSET") or '0', 0)
+    image_a_offset = int(d.getVar("IMAGE_A_OFFSET") or '0', 0)
+    image_a_imgsel_offset = int(d.getVar("IMAGE_A_IMGSEL_OFFSET") or '0', 0)
+    image_b_offset = int(d.getVar("IMAGE_B_OFFSET") or '0', 0)
+    image_b_imgsel_offset = int(d.getVar("IMAGE_B_IMGSEL_OFFSET") or '0', 0)
+    image_rcvry_offset = int(d.getVar("IMAGE_RCVRY_OFFSET") or '0', 0)
+    image_rcvry_backup_offset = int(d.getVar("IMAGE_RCVRY_BACKUP_OFFSET") or '0', 0)
+    version_offset = int(d.getVar("VERSION_OFFSET") or '0', 0)
+    checksum_offset = int(d.getVar("CHECKSUM_OFFSET") or '0', 0)
+
+    # QSPI data
+    qspi_data = io.BytesIO()
+    qspi_data.write(b'\xFF' * qspi_size)
+
+    # Image Selector - Primary, Backup, Image A and Image B
+    imgsel_file = d.getVar("DEPLOY_DIR_IMAGE")+"/imgsel-"+d.getVar("MACHINE")+".bin"
+    try:
+        with open(imgsel_file, "rb") as il:
+            imgsel = il.read(-1)
+    except OSError as err:
+        bb.fatal("Unable to open imgsel file: " + str(err))
+
+    qspi_data.seek(image_selector_offset)
+    qspi_data.write(imgsel)
+    qspi_data.seek(image_selector_backup_offset)
+    qspi_data.write(imgsel)
+    qspi_data.seek(image_a_imgsel_offset)
+    qspi_data.write(imgsel)
+    qspi_data.seek(image_b_imgsel_offset)
+    qspi_data.write(imgsel)
+
+    # Persistent Registers - Primary and Backup
+    p_reg = [idn_reg, version_reg, length_reg, persistent_reg, \
+            image_a_offset, image_b_offset, image_rcvry_offset]
+    checksum = 0xffffffff - (0xffffffff & sum(p_reg))
+    p_reg.insert(3, checksum)
+
+    qspi_data.seek(persistent_reg_offset)
+    for value in p_reg:
+        qspi_data.write(value.to_bytes(4, byteorder="little"))
+
+    qspi_data.seek(persistent_reg_backup_offset)
+    for value in p_reg:
+        qspi_data.write(value.to_bytes(4, byteorder="little"))
+
+    # Image A and B - boot.bin
+    try:
+        with open(d.getVar("DEPLOY_DIR_IMAGE")+"/boot.bin", "rb") as bo:
+            bootbin = bo.read(-1)
+    except OSError as err:
+        bb.fatal("Unable to open boot.bin file: " + str(err))
+
+    qspi_data.seek(image_a_offset)
+    qspi_data.write(bootbin)
+    qspi_data.seek(image_b_offset)
+    qspi_data.write(bootbin)
+
+    # Recovery Image & Recovery Image Backup
+    imgrcry_file = d.getVar("DEPLOY_DIR_IMAGE")+"/imgrcry-"+d.getVar("MACHINE")+".bin"
+    try:
+        with open(imgrcry_file, "rb") as iy:
+            imgrcry = iy.read(-1)
+    except OSError as err:
+        bb.fatal("Unable to open imgrcry file: " + str(err))
+
+    qspi_data.seek(image_rcvry_offset)
+    qspi_data.write(imgrcry)
+    qspi_data.seek(image_rcvry_backup_offset)
+    qspi_data.write(imgrcry)
+
+    # Version string and checksum
+    version = d.getVar("QSPI_IMAGE_VERSION")
+    date = time.strftime("%m%d%H%M")
+    machine = d.getVar("MACHINE")[:3]
+    image_name = d.getVar("QSPI_IMAGE_NAME")
+
+    qspi_version = f"{image_name}-{machine}-v{version}-{date}\x00"
+    qspi_data.seek(version_offset)
+    qspi_data.write(qspi_version.encode())
+
+    qspi_sha = hashlib.sha256(qspi_data.getbuffer())
+    qspi_data.seek(checksum_offset)
+    qspi_data.write(qspi_sha.digest())
+
+    # Write the QSPI data to file
+    with open(d.getVar("B") + "/" + d.getVar("IMAGE_NAME") + ".bin", "wb") as sq:
+        sq.write(qspi_data.getbuffer())
+
+do_compile[depends] += "virtual/boot-bin:do_deploy virtual/imgsel:do_deploy virtual/imgrcry:do_deploy"
+
+python amd_spi_image_do_compile() {
+    generate_spi_image(d)
+}
+
+EXPORT_FUNCTIONS do_compile
diff --git a/meta-xilinx-core/classes/dfx_user_dts.bbclass b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
index 4404aa05..2b699d9d 100644
--- a/meta-xilinx-core/classes/dfx_user_dts.bbclass
+++ b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
@@ -1,3 +1,8 @@
+#
+# Copyright (C) 2023-2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
 # This bbclass is inherited by flat, DFx Static and DFx RP firmware recipes.
 # dfx_user_dts.bbclass expects user to generate pl dtsi for flat, DFx Static
 # and DFx RP xsa outside of yocto.
@@ -25,12 +30,23 @@ S ?= "${WORKDIR}"
 FW_DIR ?= ""
 DTSI_PATH ?= ""
 DTBO_PATH ?= ""
+BIT_PATH ?= ""
+BIN_PATH ?= ""
+PDI_PATH ?= ""
+JSON_PATH ?= ""
+XCl_PATH ?= ""
 DT_FILES_PATH = "${S}/${DTSI_PATH}"
 FIRMWARE_NAME_DT_FILE ?= ""
 USER_DTS_FILE ?= ""
 
 FIRMWARE_NAME_DT_FILE[doc] = "DT file which has firmware-name device-tree property"
 USER_DTS_FILE[doc] = "Final DTSI or DTS file which is used for packaging final DT overlay"
+DTSI_PATH[doc] = "Absolute '.dtsi' or ''.dts' file path as input to SRC_URI"
+DTBO_PATH[doc] = "Absolute '.dtbo' file path as input to SRC_URI"
+BIT_PATH[doc] = "Absolute '.bit' file path as input to SRC_URI"
+BIN_PATH[doc] = "Absolute '.bin' file path as input to SRC_URI"
+JSON_PATH[doc] = "Absolute '.json' file path as input to SRC_URI"
+XCL_PATH[doc] = "Absolute '.xclbin' file path as input to SRC_URI"
 
 python() {
     import re
@@ -45,37 +61,59 @@ python() {
         pdi_found = False
 
         # Required Inputs
-        if '.dtsi' in d.getVar("SRC_URI") or '.dts' in d.getVar("SRC_URI"):
-            dtsi_found = True
-            d.setVar("DTSI_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.dtsi' in a or '.dts' in a][0].lstrip('file://')))
-
-        if '.dtbo' in d.getVar("SRC_URI"):
-            dtbo_found = True
-            d.setVar("DTBO_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.dtbo' in a][0].lstrip('file://')))
-
-        if '.bit' in d.getVar("SRC_URI") and soc_family != "versal":
-            bit_found = True
-            d.setVar("BIT_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.bit' in a][0].lstrip('file://')))
+        for s in d.getVar("SRC_URI").split():
+            if s.endswith(('.dtsi', '.dts')):
+                dtsi_found = True
+                d.setVar("DTSI_PATH",os.path.dirname(s.lstrip('file://')))
+            if s.endswith('.dtbo'):
+                if dtbo_found:
+                    bb.warn("More then one '.dtbo' file specified in SRC_URI.")
+                dtbo_found = True
+                d.setVar("DTBO_PATH",os.path.dirname(s.lstrip('file://')))
+            if soc_family == "zynq" or soc_family == "zynqmp":
+                if s.endswith('.bit'):
+                    if bit_found:
+                        bb.warn("More then one '.bit' file specified in SRC_URI.")
+                    bit_found = True
+                    d.setVar("BIT_PATH",os.path.dirname(s.lstrip('file://')))
+                if s.endswith('.bin'):
+                    if bin_found:
+                        bb.warn("More then one '.bin' file specified in SRC_URI.")
+                    bin_found = True
+                    d.setVar("BIN_PATH",os.path.dirname(s.lstrip('file://')))
+            else:
+                if s.endswith('.pdi'):
+                    if pdi_found:
+                        bb.warn("More then one '.pdi' file specified in SRC_URI.")
+                    pdi_found = True
+                    d.setVar("PDI_PATH",os.path.dirname(s.lstrip('file://')))
 
-        if '.bin' in d.getVar("SRC_URI") and soc_family != "versal":
-            bin_found = True
-            d.setVar("BIT_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.bin' in a][0].lstrip('file://')))
+            # Optional input
+            if s.endswith('.json'):
+                d.setVar("JSON_PATH",os.path.dirname(s.lstrip('file://')))
 
-        if '.pdi' in d.getVar("SRC_URI") and soc_family == "versal":
-            pdi_found = True
-            d.setVar("PDI_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.pdi' in a][0].lstrip('file://')))
+            if s.endswith('.xclbin'):
+                d.setVar("XCL_PATH",os.path.dirname(s.lstrip('file://')))
 
         # Check for valid combination of input files in SRC_URI
-        if dtsi_found or dtbo_found:
-            bb.debug(2, "dtsi or dtbo found in SRC_URI")
-            if bit_found or pdi_found or bin_found:
-                bb.debug(2, "bitstream or pdi found in SRC_URI")
-            elif bit_found and bin_found:
+        # Skip recipe if any of the below conditions are not satisfied.
+        # 1. At least one bit or bin or pdi or dts or dtsi or dtbo should exists.
+        # 2. More than one dtbo.
+        # 3. More than one bit or bin or pdi.
+        # 4. More than one dts and zero dtsi.
+        # 5. More than one dtsi and zero dts.
+        if dtsi_found or dtbo_found or bit_found or bin_found or pdi_found:
+            bb.debug(2, "dtsi or dtbo or bitstream or pdi found in SRC_URI")
+            if bit_found and pdi_found :
+                raise bb.parse.SkipRecipe("Both '.bit' and '.pdi' file found in SRC_URI, this is invalid use case.")
+
+            if bin_found and pdi_found :
+                raise bb.parse.SkipRecipe("Both '.bin' and '.pdi' file found in SRC_URI, this is invalid use case.")
+
+            if bit_found and bin_found:
                 raise bb.parse.SkipRecipe("Both '.bit' and '.bin' file found in SRC_URI, either .bit or .bin file is supported but not both.")
-            else:
-                raise bb.parse.SkipRecipe("Need one '.bit' or one '.pdi' file added to SRC_URI ")
         else:
-            raise bb.parse.SkipRecipe("Need one '.dtsi' or one '.dtbo' file added to SRC_URI ")
+            raise bb.parse.SkipRecipe("Need one '.dtsi' or '.dtbo' or '.bit' or '.bin' or '.pdi' file added to SRC_URI ")
 
         # Check for valid combination of dtsi and dts files in SRC_URI
         # Following file combinations are not supported use case.
@@ -90,27 +128,14 @@ python() {
             raise bb.parse.SkipRecipe("Recipe has more than one '.dtsi' and zero '.dts' found, this is an unsupported use case")
         elif dts_count > 1:
             raise bb.parse.SkipRecipe("Recipe has more than one '.dts' and zero or more than one '.dtsi' found, this is an unsupported use case")
-
-        # Optional input
-        if '.json' in d.getVar("SRC_URI"):
-            d.setVar("JSON_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.json' in a][0].lstrip('file://')))
-
-        if '.xclbin' in d.getVar("SRC_URI"):
-            d.setVar("XCL_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.xclbin' in a][0].lstrip('file://')))
 }
 
-# Function to get dts or dtsi file count.
-def get_dt_count(d, dt_ext):
-    import glob
-    dt_count = sum(1 for f in glob.iglob((d.getVar('S') + (d.getVar('DTSI_PATH')) + '/*.' + dt_ext),recursive=True) if os.path.isfile(f))
-    return dt_count
-
 # Function to search for dt firmware-name property in dts or dtsi file.
 python find_firmware_file() {
     import glob
     pattern_fw = 'firmware-name'
     search_count = 0
-    for dt_files in glob.iglob((d.getVar('S') + (d.getVar('DTSI_PATH')) + '/*.dts*'),recursive=True):
+    for dt_files in glob.iglob((d.getVar('S') + '/' + (d.getVar('DTSI_PATH')) + '/*.dts*'),recursive=True):
         with open(dt_files, "r") as f:
             current_fd = f.read()
             if pattern_fw in current_fd:
@@ -129,20 +154,20 @@ python do_configure() {
     soc_family = d.getVar("SOC_FAMILY")
 
     if bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', False, True, d):
-        bb.warn("Using fpga-manager.bbclass requires fpga-overlay MACHINE_FEATURE to be enabled")
+        bb.warn("Using dfx_user_dts.bbclass requires fpga-overlay MACHINE_FEATURE to be enabled")
 
     # Renaming firmware-name using $PN as bitstream/PDI will be renamed using
     # $PN when generating the bin/pdi file.
-    if os.path.isfile(d.getVar('S') + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
-        orig_dtsi = glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE'))[0]
-        new_dtsi = d.getVar('S') + '/pl.dtsi_firmwarename'
+    if os.path.isfile(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
+        orig_dtsi = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE'))[0]
+        new_dtsi = d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/pl.dtsi_firmwarename'
         with open(new_dtsi, 'w') as newdtsi:
             with open(orig_dtsi) as olddtsi:
                 for line in olddtsi:
-                    if soc_family == 'versal':
-                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.pdi\"',line))
+                    if soc_family == 'zynq' or soc_family == 'zynqmp':
+                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.bin\"',line))
                     else:
-                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.bit.bin\"',line))
+                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.pdi\"',line))
         shutil.move(new_dtsi,orig_dtsi)
 }
 
@@ -153,38 +178,37 @@ python devicetree_do_compile:append() {
     soc_family = d.getVar("SOC_FAMILY")
 
     dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
-
-    # Skip devicetree do_compile task if input file is dtbo in SRC_URI
-    if not dtbo_count:
-        # Convert .bit to bit.bin format only if dtsi is input.
-        # In case of dtbo as input, bbclass doesn't know if firmware-name is .bit or
-        # .bit.bin format and corresponding file name. Hence we are not doing
-        # bit.bin conversion.
-        if soc_family != 'versal' and glob.glob(d.getVar('S') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
+    bin_count = sum(1 for f in glob.iglob((d.getVar('S') + '/*.bin'),recursive=True) if os.path.isfile(f))
+    # Skip devicetree do_compile task if input file is dtbo or bin in SRC_URI
+    if not dtbo_count and not bin_count:
+        # Convert .bit to .bin format only if dtsi is input.
+        # In case of dtbo as input, bbclass doesn't know if firmware-name is .bit
+        # or .bin format and corresponding file name. Hence we are not doing .bin
+        # conversion.
+        if soc_family == 'zynq' or soc_family == 'zynqmp' and glob.glob(d.getVar('S') + '/' +(d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
             pn = d.getVar('PN')
             biffile = pn + '.bif'
-
             with open(biffile, 'w') as f:
-                f.write('all:\n{\n\t' + glob.glob(d.getVar('S')+(d.getVar('BIT_PATH') or '') + '/*.bit')[0] + '\n}')
+                f.write('all:\n{\n\t' + glob.glob(d.getVar('S') + '/' + (d.getVar('BIT_PATH') or '') + '/*.bit')[0] + '\n}')
 
             bootgenargs = ["bootgen"] + (d.getVar("BOOTGEN_FLAGS") or "").split()
-            bootgenargs += ["-image", biffile, "-o", pn + ".bit.bin"]
+            bootgenargs += ["-image", biffile, "-o", pn + ".bin"]
             subprocess.run(bootgenargs, check = True)
 
             # In Zynq7k using both "-process_bitstream bin" and "-o" in bootgen flag,
             # to convert bit file to bin format, "-o" option will not be effective
-            # and generated output file name is ${S}+${BIT_PATH}/<bit_file_name>.bit.bin
-            # file, Hence we need to rename this file from <bit_file_name>.bit.bin to
-            # ${PN}.bit.bin which matches the firmware name in dtbo and move
-            # ${PN}.bit.bin to ${B} directory.
+            # and generated output file name is ${S}+${BIT_PATH}/<bit_file_name>.bin
+            # file, Hence we need to rename this file from <bit_file_name>.bin to
+            # ${PN}.bin which matches the firmware name in dtbo and move
+            # ${PN}.bin to ${B} directory.
             if soc_family == 'zynq':
-                src_bitbin_file = glob.glob(d.getVar('S') + (d.getVar('BIT_PATH') or '') + '/*.bit.bin')[0]
-                dst_bitbin_file = d.getVar('B') + '/' + pn + '.bit.bin'
+                src_bitbin_file = glob.glob(d.getVar('S') + '/' + (d.getVar('BIT_PATH') or '') + '/*.bin')[0]
+                dst_bitbin_file = d.getVar('B') + '/' + pn + '.bin'
                 shutil.move(src_bitbin_file, dst_bitbin_file)
 
-            if not os.path.isfile(pn + ".bit.bin"):
+            if not os.path.isfile(pn + ".bin"):
                 bb.fatal("Couldn't find %s file, Enable '-log trace' in BOOTGEN_FLAGS" \
-                    "and check bootgen_log.txt" % (d.getVar('B') + '/' + pn + '.bit.bin'))
+                    "and check bootgen_log.txt" % (d.getVar('B') + '/' + pn + '.bin'))
 }
 
 # If user inputs both dtsi and dts files then device-tree will generate dtbo
@@ -192,17 +216,23 @@ python devicetree_do_compile:append() {
 # overlay file.
 python find_user_dts_overlay_file() {
     import glob
-    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
-    # Skip if input file is dtbo in SRC_URI
-    if not dtbo_count:
-        dts_count = get_dt_count(d, 'dts')
-        dtsi_count = get_dt_count(d, 'dtsi')
+    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTBO_PATH') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
+    dts_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTSI_PATH') + '/*.dts'),recursive=True) if os.path.isfile(f))
+    dtsi_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTSI_PATH') + '/*.dtsi'),recursive=True) if os.path.isfile(f))
+    # Set USER_DTS_FILE if input file is dts/dtsi in SRC_URI else skip operation.
+    if not dtbo_count and dts_count or dtsi_count:
         if dtsi_count == 1 and dts_count == 0:
-            dts_file =glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/*.dtsi')[0]
+            dts_file = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/*.dtsi')[0]
         elif dtsi_count >=0 and dts_count == 1:
-            dts_file = glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/*.dts')[0]
+            dts_file = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/*.dts')[0]
+        else:
+            dts_file = ''
 
         d.setVar('USER_DTS_FILE', os.path.splitext(os.path.basename(dts_file))[0])
+    elif dtbo_count:
+        bb.debug(2, "Firmware recipe input file is dtbo in SRC_URI")
+    else:
+        bb.debug(2, "Firmware recipe input file is bit/bin/pdi in SRC_URI")
 }
 
 do_install[prefuncs] += "find_user_dts_overlay_file"
@@ -210,8 +240,12 @@ do_install[prefuncs] += "find_user_dts_overlay_file"
 do_install() {
     install -d ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
 
+    # Install dtbo
     # In case of dtbo as input, dtbo will be copied from directly from ${S}
     # In case of dtsi as input, dtbo will be copied from directly from ${B}
+    # If more than one dtbo file is found then fatal the task.
+    # If no dtbo file is found add warning message as in some use case if IP
+    # doesn't have any driver then user can load pdi/bit/bin file.
     if [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
         install -Dm 0644 ${S}/*.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
     elif [ `ls ${S}/*.dtbo | wc -l` -gt 1 ]; then
@@ -219,44 +253,56 @@ do_install() {
     elif [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
         install -Dm 0644 ${B}/${USER_DTS_FILE}.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.dtbo
     else
-        bbfatal "A dtbo ending '.dtbo' expected but not found"
+        bbnote "A dtbo ending '.dtbo' expected but not found in ${S} or ${B}, This means firmware can be loaded without dtbo dependency."
     fi
 
-    if [ "${SOC_FAMILY}" == "versal" ]; then
-        # In case of dtbo as input, pdi will be copied from directly from ${S}
-        # without renaming the pdi name to ${PN}.pdi
-        if [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
-            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ `ls ${S}/*.pdi | wc -l` -gt 1 ]; then
-            bbfatal "Multiple PDI found, use the right PDI in SRC_URI from the following:\n$(basename -a ${S}/*.pdi)"
-        elif [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
-            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.pdi
-        else
-            bbfatal "A PDI file with '.pdi' expected but not found"
-        fi
-    else
-        # In case of dtbo as input, .bit or .bin will be copied from directly
-        # from ${S} without renaming the .bit/.bin name to ${PN}.bit/${PN}.bin
-        # if more than one .bit/.bin file is found then fail the task.
+    # Install bit or bin if soc family is zynq-7000 or zynqmp.
+    # In case of dtbo as input or no dtbo exists in ${B}, then .bit or .bin will
+    # be copied from directly from ${S} without renaming the .bit/.bin name to
+    # ${PN}.bit/${PN}.bin.
+    # if more than one .bit/.bin file is found then fatal the task.
+    # if no .bit/.bin file is found then fatal the task.
+    if [ "${SOC_FAMILY}" = "zynq" ] || [ "${SOC_FAMILY}" = "zynqmp" ]; then
         if [ `ls ${S}/*.bit | wc -l` -gt 1 ]; then
             bbfatal "Multiple .bit found, use the right .bit in SRC_URI from the following:\n$(basename -a ${S}/*.bit)"
         elif [ `ls ${S}/*.bin | wc -l` -gt 1 ]; then
             bbfatal "Multiple .bin found, use the right .bin in SRC_URI from the following:\n$(basename -a ${S}/*.bin)"
-        elif [ `ls ${S}/*.bit | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
+        elif [ `ls ${S}/*.bit | wc -l` -eq 1 ] && [ ! -f ${B}/${USER_DTS_FILE}.dtbo ]; then
             install -Dm 0644 ${S}/*.bit ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ `ls ${S}/*.bin | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
+        elif [ `ls ${S}/*.bin | wc -l` -eq 1 ]; then
             install -Dm 0644 ${S}/*.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ -f ${B}/${PN}.bit.bin ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
-            install -Dm 0644 ${B}/${PN}.bit.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.bit.bin
+        elif [ -f ${B}/${PN}.bin ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${B}/${PN}.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.bin
         else
             bbfatal "A bitstream file with '.bit' or '.bin' expected but not found"
         fi
     fi
 
+    # Install pdi if soc family is versal or new silicon.
+    # In case of dtbo as input or no dtbo exists in ${B}, then .pdi will be copied
+    # from directly from ${S} without renaming the pdi name to ${PN}.pdi
+    # if more than one .pdi file is found then fail the task.
+    # In case of Versal DFx Static, only static dtbo can be loaded as BOOT.bin
+    # already contains static pdi. bbclass is not smart enough to determine
+    # whether it is static pdi or not, hence change fatal to warn if no PDI is found.
+    if [ "${SOC_FAMILY}" != "zynq" ] && [ "${SOC_FAMILY}" != "zynqmp" ]; then
+        if [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ ! -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+        elif [ `ls ${S}/*.pdi | wc -l` -gt 1 ]; then
+            bbfatal "Multiple PDI found, use the right PDI in SRC_URI from the following:\n$(basename -a ${S}/*.pdi)"
+        elif [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.pdi
+        else
+            bbwarn "A PDI file with '.pdi' expected but not found"
+        fi
+    fi
+
+    # Install xclbin
     if ls ${S}/${XCL_PATH}/*.xclbin >/dev/null 2>&1; then
         install -Dm 0644 ${S}/${XCL_PATH}/*.xclbin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.xclbin
     fi
 
+    # Install shell.json or accel.json
     if [ -f ${S}/${JSON_PATH}/shell.json ] || [ -f ${S}/${JSON_PATH}/accel.json ]; then
         install -Dm 0644 ${S}/${JSON_PATH}/*.json ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
     fi
diff --git a/meta-xilinx-core/classes-recipe/fw-package.bbclass b/meta-xilinx-core/classes-recipe/fw-package.bbclass
new file mode 100644
index 00000000..e9847d33
--- /dev/null
+++ b/meta-xilinx-core/classes-recipe/fw-package.bbclass
@@ -0,0 +1,94 @@
+#
+# Copyright (C) 2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This bbclass provides infrastructure to package and deploy firmware baremetal
+# or freertos application elf or bin files to linux root filesystem under
+# /lib/firmware directory.
+
+inherit deploy
+
+INHERIT_DEFAULT_DEPENDS = "1"
+
+# Since we're just copying, we can run any config.
+COMPATIBLE_HOST = ".*"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# Default expects the user to provide the fw app in the deploy directory.
+# A machine, multiconfig, or local.conf should override this.
+FW_NAME ??= ""
+TARGET_MC ??= ""
+FW_DEPENDS ??= ""
+FW_MCDEPENDS ??= ""
+FW_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+FW_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+FW_IMAGE_NAME ??= "${FW_NAME}-${MACHINE}-${TARGET_MC}"
+
+# Default is for the multilib case (without the extension .elf/.bin)
+FW_FILE ??= "${FW_DEPLOY_DIR}/${FW_IMAGE_NAME}"
+FW_FILE[vardepsexclude] = "FW_DEPLOY_DIR"
+
+do_fetch[depends] += "${FW_DEPENDS}"
+do_fetch[mcdepends] += "${FW_MCDEPENDS}"
+
+# Set default destination directory is /lib/firmware, user can change this value
+# to /boot directory depending on requirement.
+DESTDIR ??= "${nonarch_base_libdir}/firmware/xilinx"
+SYSROOT_DIRS += "/boot"
+
+INSANE_SKIP:${PN} = "arch"
+INSANE_SKIP:${PN}-dbg = "arch"
+
+# Disable buildpaths QA check warnings.
+INSANE_SKIP:${PN} += "buildpaths"
+
+do_install() {
+    if [ ! -e ${FW_FILE}.elf ]; then
+        echo "Unable to find FW_FILE (${FW_FILE}.elf)"
+        exit 1
+    fi
+
+    install -Dm 0644 ${FW_FILE}.elf ${D}${DESTDIR}/${FW_IMAGE_NAME}.elf
+}
+
+# If the item is already in OUR deploy_image_dir, nothing to deploy!
+SHOULD_DEPLOY = "${@'false' if (d.getVar('FW_FILE')).startswith(d.getVar('DEPLOY_DIR_IMAGE')) else 'true'}"
+do_deploy() {
+    # If the item is already in OUR deploy_image_dir, nothing to deploy!
+    if ${SHOULD_DEPLOY}; then
+        install -Dm 0644 ${FW_FILE}.elf ${DEPLOYDIR}/${FW_IMAGE_NAME}.elf
+        install -Dm 0644 ${FW_FILE}.bin ${DEPLOYDIR}/${FW_IMAGE_NAME}.bin
+    fi
+}
+
+FILES:${PN} += "${DESTDIR}/${FW_IMAGE_NAME}*"
+
+def check_fw_vars(d):
+    # If both are blank, the user MUST pass in the path to the firmware!
+    if not d.getVar('FW_DEPENDS') and not d.getVar('FW_MCDEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+
+        msg = ""
+        fail = False
+        if not os.path.exists(d.getVar('FW_FILE') + ".elf"):
+            msg = msg + "The expected file %s.elf is not available.  " % d.getVar('FW_FILE')
+            fail = True
+        if not os.path.exists(d.getVar('FW_FILE') + ".bin"):
+            msg = msg + "The expected file %s.bin is not available.  " % d.getVar('FW_FILE')
+            fail = True
+        if fail:
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("%s\nSee the meta-xilinx-core README." % msg)
+        else:
+            # We found the file, so be sure to track it
+            d.setVar('SRC_URI', 'file://${FW_FILE}.elf file://${FW_FILE}.bin')
+            d.setVarFlag('do_install', 'file-checksums', '${FW_FILE}.elf:True ${FW_FILE}.bin:True')
+            d.setVarFlag('do_deploy', 'file-checksums', '${FW_FILE}.elf:True ${FW_FILE}.bin:True')
+
+python() {
+    # Need to allow bbappends to change the check
+    check_fw_vars(d)
+}
diff --git a/meta-xilinx-core/classes/image-wic-utils.bbclass b/meta-xilinx-core/classes-recipe/image-wic-utils.bbclass
index 41ad8148..41ad8148 100644
--- a/meta-xilinx-core/classes/image-wic-utils.bbclass
+++ b/meta-xilinx-core/classes-recipe/image-wic-utils.bbclass
diff --git a/meta-xilinx-core/classes/kernel-simpleimage.bbclass b/meta-xilinx-core/classes-recipe/kernel-simpleimage.bbclass
index 110ee254..110ee254 100644
--- a/meta-xilinx-core/classes/kernel-simpleimage.bbclass
+++ b/meta-xilinx-core/classes-recipe/kernel-simpleimage.bbclass
diff --git a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
index 7466ab5e..7466ab5e 100644
--- a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
+++ b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
diff --git a/meta-xilinx-core/classes/xilinx-fetch-restricted.bbclass b/meta-xilinx-core/classes-recipe/xilinx-fetch-restricted.bbclass
index a778ec7d..a778ec7d 100644
--- a/meta-xilinx-core/classes/xilinx-fetch-restricted.bbclass
+++ b/meta-xilinx-core/classes-recipe/xilinx-fetch-restricted.bbclass
diff --git a/meta-xilinx-core/classes/xilinx-platform-init.bbclass b/meta-xilinx-core/classes-recipe/xilinx-platform-init.bbclass
index 99f7863a..99f7863a 100644
--- a/meta-xilinx-core/classes/xilinx-platform-init.bbclass
+++ b/meta-xilinx-core/classes-recipe/xilinx-platform-init.bbclass
diff --git a/meta-xilinx-core/classes/fpgamanager_custom.bbclass b/meta-xilinx-core/classes/fpgamanager_custom.bbclass
deleted file mode 100644
index 8c8997a1..00000000
--- a/meta-xilinx-core/classes/fpgamanager_custom.bbclass
+++ /dev/null
@@ -1,24 +0,0 @@
-# This class inherits dfx_user_dts.bbclass for below use cases.
-# Zynq-7000 and ZynqMP: Full bitstream loading.
-# ZynqMP: DFx Static and Partial bitstream loading.
-# Versal: DFx Static and Parial pdi loading.
-# Versal: Full PDI loading.
-
-inherit dfx_user_dts
-
-python fpgamanager_warn_msg () {
-    if not d.getVar("FPGAMANAGER_NO_WARN"):
-        arch = d.getVar('SOC_FAMILY')
-        pn = d.getVar('PN')        
-        warn_msg = 'Users should start using dfx_user_dts bbclass for '
-        if arch == 'zynq':
-            warn_msg += 'Zynq-7000 Full bitstream loading use case.'
-        elif arch == 'zynqmp':
-            warn_msg += 'ZynqMP Full or DFx Static or DFx Partial bitstream loading use case.'
-        elif arch == 'versal':
-            warn_msg += 'Versal DFx Static or DFx Partial or Full PDI loading use case.'
-
-        bb.warn("Recipe %s has inherited fpgamanager_custom bbclass which will be deprecated in 2024.1 release. \n%s" % (pn, warn_msg))
-}
-
-do_install[postfuncs] += "fpgamanager_warn_msg"
\ No newline at end of file
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index b9804261..d6b93f9d 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -42,7 +42,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   *->xserver-xorg \
 "
 
-XILINX_RELEASE_VERSION ??= "v2023.2"
+XILINX_RELEASE_VERSION ??= "v2024.1"
 
 BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION"
 
@@ -50,6 +50,8 @@ XILINX_QEMU_VERSION[v2022.1] = "v7.1.0-xilinx-v2022.1%"
 XILINX_QEMU_VERSION[v2022.2] = "v7.1.0-xilinx-v2022.2%"
 XILINX_QEMU_VERSION[v2023.1] = "v7.1.0-xilinx-v2023.1%"
 XILINX_QEMU_VERSION[v2023.2] = "v7.1.0-xilinx-v2023.2%"
+XILINX_QEMU_VERSION[v2024.1] = "v8.1.0-xilinx-v2024.1%"
+PREFERRED_VERSION_qemu ?= "${@ '7.1%' if not (d.getVar('XILINX_RELEASE_VERSION') or 'undefined').startswith('v2024') else '8.1%'}"
 PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
@@ -59,12 +61,18 @@ DEFAULT_XILINX_QEMU = "qemu-xilinx"
 DEFAULT_XILINX_QEMU:arm = "qemu"
 PREFERRED_PROVIDER_qemu ?= "${DEFAULT_XILINX_QEMU}"
 
+XILINX_ATF_VERSION[v2022.1] = "2.6-xilinx-v2022.1%"
+XILINX_ATF_VERSION[v2022.2] = "2.6-xilinx-v2022.2%"
 XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%"
 XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%"
+XILINX_ATF_VERSION[v2024.1] = "2.10-xilinx-v2024.1%"
 PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
+XILINX_UBOOT_VERSION[v2022.1] = "v2021.01-xilinx-v2022.1%"
+XILINX_UBOOT_VERSION[v2022.2] = "v2022.01-xilinx-v2022.2%"
 XILINX_UBOOT_VERSION[v2023.1] = "v2023.01-xilinx-v2023.1%"
 XILINX_UBOOT_VERSION[v2023.2] = "v2023.01-xilinx-v2023.2%"
+XILINX_UBOOT_VERSION[v2024.1] = "v2024.01-xilinx-v2024.1%"
 
 PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
@@ -73,6 +81,7 @@ 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.30-xilinx-v2023.1%"
 XILINX_LINUX_VERSION[v2023.2] = "6.1.60-xilinx-v2023.2%"
+XILINX_LINUX_VERSION[v2024.1] = "6.6.10-xilinx-v2024.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/conf/machine/include/arm/armv7r/tune-cortexr5hf.inc b/meta-xilinx-core/conf/machine/include/arm/armv7r/tune-cortexr5hf.inc
new file mode 100644
index 00000000..5679b989
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/include/arm/armv7r/tune-cortexr5hf.inc
@@ -0,0 +1,6 @@
+include conf/machine/include/arm/armv7r/tune-cortexr5.inc
+
+AVAILTUNES                            += "cortexr5hf"
+ARMPKGARCH:tune-cortexr5hf             = "cortexr5"
+TUNE_FEATURES:tune-cortexr5hf          = "${TUNE_FEATURES:tune-cortexr5} callconvention-hard"
+PACKAGE_EXTRA_ARCHS:tune-cortexr5hf    = "cortexr5hf-vfpv3d16"
diff --git a/meta-xilinx-core/conf/machine/include/arm/armv8-2a/tune-cortexa78.inc b/meta-xilinx-core/conf/machine/include/arm/armv8-2a/tune-cortexa78.inc
new file mode 100644
index 00000000..8c85d98e
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/include/arm/armv8-2a/tune-cortexa78.inc
@@ -0,0 +1,16 @@
+#
+# Tune Settings for Cortex-A78
+#
+DEFAULTTUNE                                        ?= "cortexa78"
+
+TUNEVALID[cortexa78] = "Enable Cortex-A78 specific processor optimizations"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexa78', ' -mcpu=cortex-a78', '', d)}"
+
+require conf/machine/include/arm/arch-armv8-2a.inc
+
+# Little Endian base configs
+AVAILTUNES                                         += "cortexa78"
+ARMPKGARCH:tune-cortexa78                           = "cortexa78"
+TUNE_FEATURES:tune-cortexa78                        = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa78"
+PACKAGE_EXTRA_ARCHS:tune-cortexa78                  = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa78"
+BASE_LIB:tune-cortexa78                             = "lib64"
diff --git a/meta-xilinx-core/conf/machine/include/arm/armv8r/tune-cortexr52hf.inc b/meta-xilinx-core/conf/machine/include/arm/armv8r/tune-cortexr52hf.inc
new file mode 100644
index 00000000..42c6fb37
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/include/arm/armv8r/tune-cortexr52hf.inc
@@ -0,0 +1,9 @@
+require conf/machine/include/arm/armv8r/tune-cortexr52.inc
+
+# simd is special, we don't pass this to the -mfpu, it's implied
+TUNE_CCARGS_MFLOAT = "${@ bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hard', 'softfp', d) if (d.getVar('TUNE_CCARGS_MFPU') != '' or bb.utils.contains('TUNE_FEATURES', 'simd', True, False, d)) else '' }"
+
+AVAILTUNES                             += "cortexr52hf"
+ARMPKGARCH:tune-cortexr52hf             = "cortexr52"
+TUNE_FEATURES:tune-cortexr52hf          = "${TUNE_FEATURES:tune-cortexr52} callconvention-hard"
+PACKAGE_EXTRA_ARCHS:tune-cortexr52hf    = "cortexr52hf"
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
index e99b1f0e..c732523c 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -28,8 +28,7 @@ do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC
 UBOOT_SUFFIX ?= "bin"
 
 UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
-UBOOT_ELF ?= "u-boot"
-UBOOT_ELF:aarch64 ?= "u-boot.elf"
+UBOOT_ELF ?= "u-boot.elf"
 
 # libmali is selected by DISTRO_FEATURE of libmali & MACHINE_FEATURES of mali400
 # lima is selected by DISTRO_FEATURE != libmali & MACHINE_FEATURES of mali400
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index 9945d301..eb450bbf 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -1,5 +1,3 @@
-XILINX_DEPRECATED[versal-net] = "Versal-net is not supported in 2023.2"
-
 #@TYPE: Machine
 #@NAME: versal-net-generic
 #@DESCRIPTION: Machine configuration for the versal-net-generic devices
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi
index 694a2fd0..a918faf2 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi
@@ -28,6 +28,24 @@
                         no-map;
                         reg = <0x0 0x3ed48000 0x0 0x100000>;
                 };
+
+                rproc_1_reserved: rproc@3ef00000 {
+                        no-map;
+                        reg = <0x0 0x3ef00000 0x0 0x40000>;
+                };
+                rpu1vdev0vring0: rpu1vdev0vring0@3ef40000 {
+                        no-map;
+                        reg = <0x0 0x3ef40000 0x0 0x4000>;
+                };
+                rpu1vdev0vring1: rpu1vdev0vring1@3ef44000 {
+                        no-map;
+                        reg = <0x0 0x3ef44000 0x0 0x4000>;
+                };
+                rpu1vdev0buffer: rpu1vdev0buffer@3ef48000 {
+                        no-map;
+                        compatible = "shared-dma-pool";
+                        reg = <0x0 0x3ef48000 0x0 0x100000>;
+                };
         };
 
         tcm_0a: tcm_0a@eba00000 {
@@ -54,6 +72,30 @@
                 power-domain = <&versal_net_firmware 0x183180cd>;
         };
 
+        tcm_1a: tcm_0a@eba40000 {
+                no-map;
+                reg = <0x0 0xeba40000 0x0 0x10000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domain = <&versal_net_firmware 0x183180ce>;
+        };
+
+        tcm_1b: tcm_0b@eba50000 {
+                no-map;
+                reg = <0x0 0xeba50000 0x0 0x8000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domain = <&versal_net_firmware 0x183180cf>;
+        };
+
+        tcm_1c: tcm_0b@eba60000 {
+                no-map;
+                reg = <0x0 0xeba60000 0x0 0x8000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domain = <&versal_net_firmware 0x183180d0>;
+        };
+
         r52ss {
                 compatible = "xlnx,versal-net-r52-remoteproc";
                 #address-cells = <0x2>;
@@ -72,7 +114,18 @@
                         mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>;
                         mbox-names = "tx", "rx";
                 };
-        };
+                r52_1 {
+                        compatible = "xilinx,r52";
+                        #address-cells = <0x2>;
+                        #size-cells = <0x2>;
+                        ranges;
+                        sram = <&tcm_1a>, <&tcm_1b>, <&tcm_1c>;
+                        memory-region = <&rproc_1_reserved>, <&rpu1vdev0buffer>, <&rpu1vdev0vring0>, <&rpu1vdev0vring1>;
+                        power-domain = <&versal_net_firmware 0x181100C0>;
+                        mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>;
+                        mbox-names = "tx", "rx";
+                };
+      };
 
         zynqmp_ipi1 {
                 compatible = "xlnx,zynqmp-ipi-mailbox";
@@ -93,5 +146,15 @@
                         #mbox-cells = <0x01>;
                         xlnx,ipi-id = <0x03>;
                 };
+                /* APU<->RPU1 IPI mailbox controller */
+                ipi_mailbox_rpu1: mailbox@eb3f0b00{
+                        reg = <0xeb3f0b00 0x20 0xeb3f0b20 0x20 0xeb3f0940 0x20 0xeb3f0960 0x20>;
+                        reg-names = "local_request_region",
+                                    "local_response_region",
+                                    "remote_request_region",
+                                    "remote_response_region";
+                        #mbox-cells = <0x01>;
+                        xlnx,ipi-id = <0x04>;
+                };
         };
 };
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi
index c8a60d81..8ef72656 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi
@@ -28,6 +28,23 @@
                         no-map;
                         reg = <0x0 0x3ed00000 0x0 0x40000>;
                 };
+                rpu1vdev0vring0: rpu0vdev0vring0@3ef40000 {
+                        no-map;
+                        reg = <0x0 0x3ef40000 0x0 0x4000>;
+                };
+                rpu1vdev0vring1: rpu0vdev0vring1@3ef44000 {
+                        no-map;
+                        reg = <0x0 0x3ef44000 0x0 0x4000>;
+                };
+                rpu1vdev0buffer: rpu0vdev0buffer@3ef48000 {
+                        no-map;
+                        reg = <0x0 0x3ef48000 0x0 0x100000>;
+                };
+                rproc_1_reserved: rproc@3ef00000 {
+                        no-map;
+                        reg = <0x0 0x3ef00000 0x0 0x40000>;
+                };
+
         };
 
         tcm_0a: tcm_0a@ffe00000 {
@@ -45,7 +62,21 @@
                 compatible = "mmio-sram";
                 power-domain = <&zynqmp_firmware 16>;
         };
+        tcm_1a: tcm_0a@ffe90000 {
+                no-map;
+                reg = <0x0 0xffe90000 0x0 0x10000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domain = <&zynqmp_firmware 17>;
+        };
 
+        tcm_1b: tcm_0b@ffeb0000 {
+                no-map;
+                reg = <0x0 0xffeb0000 0x0 0x10000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domain = <&zynqmp_firmware 18>;
+        };
         rf5ss@ff9a0000 {
                 compatible = "xlnx,zynqmp-r5-remoteproc";
                 xlnx,cluster-mode = <1>;
@@ -65,6 +96,18 @@
                         mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>;
                         mbox-names = "tx", "rx";
                 };
+                r5f_1: r5f@1 {
+                        compatible = "xilinx,r5f";
+                        #address-cells = <2>;
+                        #size-cells = <2>;
+                        ranges;
+                        sram = <&tcm_1a>, <&tcm_1b>;
+                        memory-region = <&rproc_1_reserved>, <&rpu1vdev0buffer>, <&rpu1vdev0vring0>, <&rpu1vdev0vring1>;
+                        power-domain = <&zynqmp_firmware 8>;
+                        mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>;
+                        mbox-names = "tx", "rx";
+                };
+
         };
 
         zynqmp_ipi1 {
@@ -90,4 +133,26 @@
                         xlnx,ipi-id = <1>;
                 };
         };
+        zynqmp_ipi2 {
+                compatible = "xlnx,zynqmp-ipi-mailbox";
+                interrupt-parent = <&gic>;
+                interrupts = <0 30 4>;
+                xlnx,ipi-id = <8>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                /* APU<->RPU1 IPI mailbox controller */
+                ipi_mailbox_rpu1: mailbox@ff990800 {
+                        reg = <0xff990800 0x20>,
+                              <0xff990820 0x20>,
+                              <0xff990200 0x20>,
+                              <0xff990220 0x20>;
+                        reg-names = "local_request_region",
+                                "local_response_region",
+                                "remote_request_region",
+                                "remote_response_region";
+                        #mbox-cells = <1>;
+                        xlnx,ipi-id = <2>;
+                };
+        };
 };
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb
new file mode 100644
index 00000000..ca447615
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb
@@ -0,0 +1,16 @@
+SRCBRANCH ?= "2024"
+SRCREV = "e2fdb4fecbebe41b4cd1c0b4fbfa3496bcded485"
+BRANCH = "2024"
+LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
+PV = "${SRCBRANCH}+git${SRCPV}"
+
+REPO = "git://github.com/Xilinx/libmetal.git;protocol=https"
+
+include ${LAYER_PATH_openamp-layer}/recipes-openamp/libmetal/libmetal.inc
+include ${LAYER_PATH_openamp-layer}/vendor/xilinx/recipes-openamp/libmetal/libmetal-xlnx.inc
+
+RPROVIDES:${PN}-dbg += "libmetal-dbg"
+RPROVIDES:${PN}-dev += "libmetal-dev"
+RPROVIDES:${PN}-lic += "libmetal-lic"
+RPROVIDES:${PN}-src += "libmetal-src"
+RPROVIDES:${PN}-staticdev += "libmetal-staticdev"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
new file mode 100644
index 00000000..01df6033
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
@@ -0,0 +1,16 @@
+SRCBRANCH ?= "2024"
+SRCREV = "f4a7bc0fca5b14bb8fd185918614bcc78ce93028"
+BRANCH = "2024"
+LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
+PV = "${SRCBRANCH}+git${SRCPV}"
+REPO = "git://github.com/Xilinx/open-amp.git;protocol=https"
+
+include ${LAYER_PATH_openamp-layer}/recipes-openamp/open-amp/open-amp.inc
+require ${LAYER_PATH_openamp-layer}/vendor/xilinx/recipes-openamp/open-amp/open-amp-xlnx.inc
+
+RPROVIDES:${PN}-dbg += "open-amp-dbg"
+RPROVIDES:${PN}-dev += "open-amp-dev"
+RPROVIDES:${PN}-lic += "open-amp-lic"
+RPROVIDES:${PN}-src += "open-amp-src"
+RPROVIDES:${PN}-staticdev += "open-amp-staticdev"
+
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend
index 2b96f152..e0de911f 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend
@@ -3,12 +3,12 @@
 PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
 EXTRA_OECMAKE:append:versal-ai-core = " -DXRT_AIE_BUILD=true"
 TARGET_CXXFLAGS:append:versal-ai-core = " -DXRT_ENABLE_AIE"
-DEPENDS:append:versal-ai-core = " libmetal libxaiengine aiefal"
+DEPENDS:append:versal-ai-core = " libxaiengine aiefal"
 RDEPENDS:${PN}:append:versal-ai-core = " libxaiengine aiefal"
 
 # For vek280 kind of devices
 PACKAGE_ARCH:versal-ai-edge = "${SOC_VARIANT_ARCH}"
 EXTRA_OECMAKE:append:versal-ai-edge = " -DXRT_AIE_BUILD=true"
 TARGET_CXXFLAGS:append:versal-ai-edge = " -DXRT_ENABLE_AIE"
-DEPENDS:append:versal-ai-edge = " libmetal libxaiengine aiefal"
+DEPENDS:append:versal-ai-edge = " libxaiengine aiefal"
 RDEPENDS:${PN}:append:versal-ai-edge = " libxaiengine aiefal"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split.inc b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-7.1.inc
index 2c73d931..d07090bd 100644
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split.inc
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-7.1.inc
@@ -10,27 +10,27 @@ PACKAGES:prepend:class-target = "${PN}-x86_64 \
                     "
 
 FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
-RDEPENDS:${PN}-x86_64:append:class-target = "${PN}"
+RDEPENDS:${PN}-x86_64:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps"
 
 FILES:${PN}-i386:class-target = "${bindir}/qemu-i386"
-RDEPENDS:${PN}-i386:append:class-target = "${PN}"
+RDEPENDS:${PN}-i386:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-i386:class-target = "file-rdeps"
 
 FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386"
-RDEPENDS:${PN}-system-i386:append:class-target = "${PN}"
+RDEPENDS:${PN}-system-i386:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps"
 
 FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
-RDEPENDS:${PN}-aarch64:append:class-target = "${PN}"
+RDEPENDS:${PN}-aarch64:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps"
 
 FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
-RDEPENDS:${PN}-arm:append:class-target = "${PN}"
+RDEPENDS:${PN}-arm:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
 
 FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
-RDEPENDS:${PN}-microblaze:append:class-target = "${PN}"
+RDEPENDS:${PN}-microblaze:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
 
 FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-8.1.inc b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-8.1.inc
new file mode 100644
index 00000000..42f054e6
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-8.1.inc
@@ -0,0 +1,71 @@
+# we have our own package splitting for qemu, inhbit the oe-core
+# split by overriding the split function
+python split_qemu_packages () {
+    print( "meta-virtualization: vmsplit: inhibiting core qemu package split" )
+}
+
+PACKAGES:prepend:class-target = "${PN}-x86_64 \
+                     ${PN}-aarch64 \
+                     ${PN}-arm \
+                     ${PN}-i386 \
+                     ${PN}-system-i386 \
+                     ${PN}-microblaze \
+                     ${PN}-support \
+                     ${PN}-keymaps \
+                     ${PN}-firmware \
+                    "
+
+FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
+RDEPENDS:${PN}-x86_64:append:class-target = " ${PN}"
+RPROVIDES:${PN}-x86_64:append:class-target = " ${PN}-system-x86_64"
+RPROVIDES:${PN}-x86_64:append:class-target = " ${PN}-user-x86_64"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-x86_64"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-x86_64"
+INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps"
+
+FILES:${PN}-i386:class-target = "${bindir}/qemu-i386"
+RDEPENDS:${PN}-i386:append:class-target = " ${PN}"
+RPROVIDES:${PN}-i386:append:class-target = " ${PN}-user-i386"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-i386"
+INSANE_SKIP:${PN}-i386:class-target = "file-rdeps"
+
+FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386"
+RDEPENDS:${PN}-system-i386:append:class-target = " ${PN}"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-system-i386"
+INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps"
+
+FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
+RDEPENDS:${PN}-aarch64:append:class-target = " ${PN}"
+RPROVIDES:${PN}-aarch64:append:class-target = " ${PN}-system-aarch64"
+RPROVIDES:${PN}-aarch64:append:class-target = " ${PN}-user-aarch64"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-aarch64"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-aarch64"
+INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps"
+
+FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
+RDEPENDS:${PN}-arm:append:class-target = " ${PN}"
+RPROVIDES:${PN}-arm:append:class-target = " ${PN}-system-arm"
+RPROVIDES:${PN}-arm:append:class-target = " ${PN}-user-arm"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-arm"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-arm"
+INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
+
+FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
+RDEPENDS:${PN}-microblaze:append:class-target = " ${PN}"
+RPROVIDES:${PN}-microblaze:append:class-target = " ${PN}-system-microblaze"
+RPROVIDES:${PN}-microblaze:append:class-target = " ${PN}-user-microblaze"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-microblaze"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-microblaze"
+INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
+
+FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*"
+RDEPENDS:${PN}-support:class-target = "${PN} bash"
+
+FILES:${PN}-firmware:class-target = "${datadir}/${PN}/*.bin ${datadir}/${PN}/*.rom ${datadir}/${PN}/*.img ${datadir}/${PN}/openbios* ${datadir}/${PN}/*.dtb ${datadir}/${PN}/u-boot*"
+RDEPENDS:${PN}-firmware:class-target = "${PN}"
+INSANE_SKIP:${PN}-firmware:class-target = "arch"
+
+FILES:${PN}-keymaps:class-target = "${datadir}/${PN}/keymaps/*"
+RDEPENDS:${PN}-keymaps:class-target = "${PN}"
+
+PACKAGECONFIG:append:class-target = " virtfs"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend
deleted file mode 100644
index 5cca9e1f..00000000
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', '${BPN}-package-split.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
new file mode 100644
index 00000000..c9f04327
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-7.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend
new file mode 100644
index 00000000..74aa15fb
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-8.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_7.1%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_7.1%.bbappend
new file mode 100644
index 00000000..c9f04327
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_7.1%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-7.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend
new file mode 100644
index 00000000..74aa15fb
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-8.1.inc', '', d)}
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 56cb8a45..92af8a7a 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 = "807435ae6fa0a07e8c84b458d138f3f54614eb5c"
+SRCREV = "4b687525d2c4785eedbcbd73431bc6d236cb5bc8"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/lopper:"
 
@@ -10,4 +10,5 @@ RDEPENDS:${PN} += " \
     python3-anytree \
     python3-six \
     python3-pyyaml \
+    python3-packaging \
     "
diff --git a/meta-xilinx-core/lib/devtool/boot-jtag.py b/meta-xilinx-core/lib/devtool/boot-jtag.py
new file mode 100644
index 00000000..53d70262
--- /dev/null
+++ b/meta-xilinx-core/lib/devtool/boot-jtag.py
@@ -0,0 +1,272 @@
+# Copyright (C) 2021-2022, Xilinx, Inc.  All rights reserved.
+# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This script uses devtool and creates a boot-jtag.tcl script in
+# ${DEPLOY_DIR_IMAGE} directory. This script is executed by xsdb tool to boot
+# yocto generated images on HW via jtag boot mode.
+
+import os
+import logging
+import argparse
+from devtool import setup_tinfoil, parse_recipe, DevtoolError
+import yaml
+import sys
+import glob
+
+logger = logging.getLogger('devtool')
+
+def bootjtag(args, config, basepath, workspace):
+    """Entry point for the devtool 'boot-jtag' subcommand"""
+
+    if not args.image:
+        print('\nINFO: Please specify the target image name. \n\nExample: --image core-image-minimal or petalinux-image-minimal')
+        return
+
+    # Get required boot variables
+    tinfoil = setup_tinfoil(basepath=basepath)
+    try:
+        rd = tinfoil.parse_recipe('u-boot-xlnx-scr')
+        deploy_dir = rd.getVar('DEPLOY_DIR_IMAGE')
+        machine = rd.getVar('MACHINE')
+        arch =  rd.getVar('TARGET_ARCH')
+        soc = rd.getVar("SOC_FAMILY")
+        soc_variant = rd.getVar("SOC_VARIANT")
+        ddr_base_addr = rd.getVar('DDR_BASEADDR')
+        kernel_img_name = rd.getVar('KERNEL_IMAGE')
+        kernel_load_addr = rd.getVar('KERNEL_LOAD_ADDRESS')
+        dtb_load_addr = rd.getVar('DEVICETREE_ADDRESS')
+        rootfs_load_addr = rd.getVar('RAMDISK_IMAGE_ADDRESS')
+        machine_features = rd.getVar('MACHINE_FEATURES')
+        boot_mode = rd.getVar('BOOTMODE')
+    finally:
+        tinfoil.shutdown()
+
+    if not args.hw_server:
+        print("\nINFO: --hw_server is null so default URL description of hw_server/TCF agent and port number is set to: " +  str(args.hw_server))
+
+    print("INFO: HW_SERVER Connected to: " + str(args.hw_server))
+    print("INFO: Using DISTRO IMAGE: " + str(args.image))
+
+    # Use arch for MB and SOC Family other devices.
+    if arch == 'microblazeel':
+        print("INFO: ARCH: " + arch)
+    else:
+        print("INFO: SOC FAMILY: " + soc)
+
+    # Load Address of boot.scr in DDR(Except for QSPI/OSPI/NAND boot)
+    # MB = (DDR base address + DDR Size) - 0xe00000
+    # Zynq 7000 = DDR base address + 0x3000000
+    # ZynqMP = DDR base address + 0x20000000
+    # Versal = DDR base address + 0x20000000
+    if arch == 'microblazeel':
+        # Assuming DDR size is 2GB
+        bootscr_addr = hex(int(ddr_base_addr, 16) + 0x80000000 - 0xe00000)
+    elif soc == 'zynq':
+        bootscr_addr = hex(int(ddr_base_addr, 16) + 0x3000000)
+    else:
+        bootscr_addr = hex(int(ddr_base_addr, 16) + 0x20000000)
+
+    print("INFO: MACHINE: " + machine)
+
+    if arch != 'microblazeel':
+        if "fpga-overaly" in machine_features:
+            print("INFO: fpga-overlay MACHINE_FEATURES is enabled, Hence PL bitstream or PDI will not be loaded at initial boot, User can load from u-boot or linux.")
+        else:
+            print("INFO: fpga-overlay MACHINE_FEATURES is not enabled, Hence PL bitstream or PDI will be loaded at initial boot.")
+
+    #dictionary with all required artifacts
+    data = {}
+
+    # For MB, Zynq 7000 and ZynqMP.
+    if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp':
+        if not "fpga-overaly" in machine_features:
+            data['bit'] = glob.glob(os.path.join(deploy_dir, '*' + machine + '.bit'))[0]
+        data['uboot'] = os.path.join(deploy_dir, 'u-boot.elf')
+        data['dtb'] = os.path.join(deploy_dir, machine + '-system.dtb')
+
+    if soc == 'zynq' or soc == 'zynqmp':
+        data['fsbl'] = os.path.join(deploy_dir, 'fsbl-' + machine + '.elf')
+
+    if soc == 'zynqmp':
+        data['atf'] = os.path.join(deploy_dir, 'arm-trusted-firmware.elf')
+        data['pmufw'] = os.path.join(deploy_dir, 'pmu-firmware-' + machine + '.elf')
+
+    if soc == 'versal':
+        data['bootbin'] = os.path.join(deploy_dir, 'boot.bin')
+
+    data['bootscr'] = os.path.join(deploy_dir, 'boot.scr')
+    data['kernel'] = os.path.join(deploy_dir, kernel_img_name)
+
+    if not args.norootfs:
+        data['rfs'] = os.path.join(deploy_dir, args.image + '-' + machine + '.cpio.gz.u-boot')
+
+    # Check if all the required boot images exists
+    for key in data:
+        if not os.path.isfile(data[key]):
+            print('INFO:' + key + ' does not exist.')
+            print('INFO: Please make sure you have run: \n\'MACHINE=' + machine + ' devtool build-image ' + args.image + '\'')
+            return
+
+    # Enable verbose mode
+    if args.verbose:
+        print("The following artifacts are being loaded:")
+        for key in data:
+            print('INFO: ' + key + ": " + data[key])
+
+    # Start writing xsdb script
+    lines = []
+    lines.append('# Run \'xsdb ' + deploy_dir + '/boot-jtag.tcl\' to execute this script.')
+    lines.append('connect -url ' + args.hw_server)
+
+    if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp':
+        lines.append('for {set i 0} {$i < 20} {incr i} {')
+        lines.append('    if { [ta] != "" } break;')
+        lines.append('    after 50')
+        lines.append('}')
+        if not "fpga-overaly" in machine_features:
+            lines.append('')
+            lines.append('puts stderr "INFO: Configuring the PL ..."')
+            lines.append('puts stderr "INFO: Downloading bitstream: ' + data['bit'] + '"')
+            lines.append('fpga -no-revision-check \"' + data['bit'] + '\"')
+
+    if soc == 'zynqmp':
+        # Disable Security gates to view PMU MB target
+        lines.append('')
+        lines.append('targets -set -nocase -filter {name =~ \"*PSU*\"}')
+
+        # By default, JTAG security gates are enabled. This disables security gates for DAP, PLTAP and PMU.
+        lines.append('mask_write 0xFFCA0038 0x1C0 0x1C0')
+        lines.append('targets -set -nocase -filter {name =~ \"*MicroBlaze PMU*\"}')
+        lines.append('')
+
+        # Check if the target is already stopped or cannot be stopped.
+        lines.append('catch {stop}; after 1000')
+        lines.append('')
+
+        # Download the pmufw.elf and run PMUFW
+        lines.append('puts stderr "INFO: Downloading PMUFW ELF file: ' + data['pmufw'] + '"')
+        lines.append('dow \"' + data['pmufw'] + '\"')
+        lines.append('con')
+
+        # Select A53 Core 0 to load and run FSBL
+        lines.append('targets -set -nocase -filter {name =~ \"*A53*#0\"}')
+
+        # Reset A53, If the reset is being triggered after powering on the device,
+        # write bootloop at reset vector address (0xffff0000), or use
+        # -clear-registers option, to avoid unpredictable behavior.
+        # Further warnings will be suppressed
+        lines.append('rst -processor -clear-registers')
+        lines.append('')
+    elif soc == 'versal':
+        # Download boot.bin to versal device
+        lines.append('targets -set -nocase -filter {name =~ \"*PMC*\"}')
+        lines.append('puts stderr "INFO: Downloading BOOT bin file: ' + data['bootbin'] + '"')
+        lines.append('device program \"' + data['bootbin'] + '\"')
+        lines.append('')
+
+        if soc_variant == 'net':
+            lines.append('targets -set -nocase -filter {name =~ \"*A78*#0\"}')
+        else:
+            lines.append('targets -set -nocase -filter {name =~ \"*A72*#0\"}')
+
+        lines.append('stop')
+        lines.append('')
+        lines.append('targets -set -nocase -filter {name =~ \"*Versal*\"}')
+    elif soc == 'zynq':
+        lines.append('targets -set -nocase -filter {name =~ \"arm*#0\"}')
+        # Check if the target is already stopped or cannot be stopped.
+        lines.append('catch {stop}; after 1000')
+        lines.append('')
+    else:
+        lines.append('targets -set -nocase -filter {name =~ \"microblaze*#0\"}')
+        # Check if the target is already stopped or cannot be stopped.
+        lines.append('catch {stop}; after 1000')
+        lines.append('')
+
+
+    if soc == 'zynq' or soc == 'zynqmp':
+        # Download FSBL for Zynq 7000 and ZynqMP
+        lines.append('puts stderr "INFO: Downloading FSBL ELF file: ' + data['fsbl'] + '"')
+        lines.append('dow \"' + data['fsbl'] + '\"')
+        lines.append('con')
+        lines.append('after 4000; stop')
+        lines.append('')
+
+    # Download U-boot and DTB for MB, Zynq 7000 and ZynqMP
+    if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp':
+        lines.append('puts stderr "INFO: Downloading U-boot ELF file: ' + data['uboot'] + '"')
+        lines.append('dow \"' + data['uboot'] + '\"')
+        lines.append('')
+        # For MB and Zynq 7000 we need to connect and stop before loading
+        # kernel images
+        if soc != 'zynqmp':
+            lines.append('con')
+            lines.append('after 1000; stop')
+        lines.append('puts stderr "INFO: Downloading DTB file: ' + data['dtb'] + ' at ' + dtb_load_addr + '"')
+        lines.append('dow -data \"' + data['dtb'] + '\" ' + dtb_load_addr)
+        lines.append('')
+
+    # Download Trusted Firmware-A(TF-A) for ZynqMP
+    # Note: TF-A elf should be loaded after u-boot elf in JTAG boot mode else
+    #       TF-A elf will not be loaded.
+    if soc == 'zynqmp':
+        lines.append('puts stderr "INFO: Downloading Trusted Firmware-A(TF-A) ELF file: ' + data['atf'] + '"')
+        lines.append('dow \"' + data['atf'] + '\"')
+        lines.append('')
+
+    # If BOOTMODE is xen then boot till u-boot only.
+    # Download Kernel Image for all architecture
+    if boot_mode != 'xen':
+        lines.append('puts stderr "INFO: Downloading Kernel Image file: ' + data['kernel'] + ' at ' + kernel_load_addr + '"')
+        lines.append('dow -data \"' + data['kernel'] + '\" ' + kernel_load_addr)
+        lines.append('')
+
+    # Download Rootfs
+    if not args.norootfs and boot_mode != 'xen':
+        lines.append('puts stderr "INFO: Downloading Rootfs file: ' + data['rfs'] + ' at ' + rootfs_load_addr + '"')
+        lines.append('dow -data \"' + data['rfs'] + '\" ' + rootfs_load_addr)
+        lines.append('')
+
+    lines.append('puts stderr "INFO: Downloading U-boot boot script: ' + data['bootscr'] + ' at ' + bootscr_addr + '"')
+    lines.append('dow -data \"' + data['bootscr'] + '\" ' + bootscr_addr)
+    lines.append('')
+
+    # Select A72 Core 0 to load and run Versal images
+    if soc == 'versal':
+        if soc_variant == 'net':
+            lines.append('targets -set -nocase -filter {name =~ \"*A78*#0\"}')
+        else:
+            lines.append('targets -set -nocase -filter {name =~ \"*A72*#0\"}')
+
+    lines.append('con')
+    lines.append('exit\n')
+
+    script = os.path.join(deploy_dir, "boot-jtag.tcl")
+    with open(script, "w") as f:
+            f.write('\n'.join(lines))
+
+    print('INFO: HW JTAG boot tcl script written to '+ script + "\n" \
+        + 'INFO: User can run \'xsdb ' + script + '\' to execute.')
+
+    return 0
+
+def register_commands(subparsers, context):
+    """Register devtool subcommands from this plugin"""
+    parser_bootjtag = subparsers.add_parser('boot-jtag', 
+                                            help='Script to deploy target images on HW via JTAG boot mode.',
+                                            description='Script to deploy target images on HW via JTAG boot mode. \
+                                                Example command: MACHINE=zcu102-zynqmp devtool boot-jtag --image ${image_name} --hw_server ${hw_server}')
+    required = parser_bootjtag.add_argument_group('required arguments')
+    required.add_argument('--image', 
+                          help='Specify target image name. Example: core-image-minimal or petalinux-image-minimal')
+    parser_bootjtag.add_argument('--hw_server', nargs='?', default='TCP:localhost:3121',
+                                 help='URL description of hw_server/TCF agent and port number. (default: %(default)s) \
+                                     Example: --hw_server TCP:puffball12:3121')
+
+    parser_bootjtag.add_argument('-v', '--verbose',  
+                                 help='verbose mode', action="store_true")
+    parser_bootjtag.add_argument('-n', '--norootfs', 
+                                 help='Don\'t include rootfs', action='store_true')
+    parser_bootjtag.set_defaults(func=bootjtag, no_workspace=True)
diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
new file mode 100644
index 00000000..f7e18273
--- /dev/null
+++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Image update is used to update alternate images on compatible firmware."
+SUMMARY = "Image update is used to update alternate image on compatible firmware. \
+        If the current image is ImageA, ImageB will get updated and vice versa. \
+        Usage: image_update <Input Image File>"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b"
+
+BRANCH = "master"
+SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https"
+SRCREV = "a68308f329578d3585fd335071a9184aa7f46d2e"
+
+RDEPENDS:${PN} += "freeipmi"
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+
+PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}"
+
+# Force the make system to use the flags we want!
+EXTRA_OEMAKE = 'CC="${CC} ${TARGET_CFLAGS} ${TARGET_LDFLAGS}" all'
+
+do_install () {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/image_update ${D}${bindir}/
+}
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
index f86c5985..f86c5985 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc
index 11059465..0541a7a3 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc
@@ -2,8 +2,8 @@ SECTION	= "libs"
 
 REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https"
 
-BRANCH ?= "xlnx_rel_v2023.2"
-SRCREV ?= "84debe5d22c144fb09269b8410df4cb8a6aa3b2a"
+BRANCH ?= "main-aie"
+SRCREV ?= "5621d74d5efa99fdddd9eca47de3294804c62c24"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM ?= "file://license.txt;md5=04a153cae61a8a606fc79dff49c2c897"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
index 2c6c9cd1..2c6c9cd1 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2024.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2024.1.bb
new file mode 100644
index 00000000..fee8e069
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2024.1.bb
@@ -0,0 +1,8 @@
+ATF_VERSION = "2.10"
+SRCREV = "4f82b6134e7b43722616c855e5016d42a3ea26d2"
+BRANCH = "xlnx_rebase_v2.10"
+LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
+
+
+include arm-trusted-firmware.inc
+
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
new file mode 100644
index 00000000..98eebc3e
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Bootbin version string file"
+SUMMARY = "The BIF file for bootbin requires a version file in a specific format"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+COMPATIBLE_MACHINE = "^$"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BOOTBIN_VER_MAIN ?= ""
+
+BOOTBIN_VER_SUFFIX ?= "${@(d.getVar('XILINX_VER_BUILD') or '')[:8] if d.getVar('XILINX_VER_UPDATE') != 'release' and not d.getVar('XILINX_VER_UPDATE').startswith('update') else ''}"
+BOOTBIN_VER_FILE = "bootbin-version-header.txt"
+BOOTBIN_VER_MAX_LEN = "36"
+
+BOOTBIN_MANIFEST_FILE ?= "bootbin-version-header.manifest"
+
+inherit deploy image-artifact-names
+
+python do_configure() {
+    if d.getVar("BOOTBIN_VER_SUFFIX"):
+        version = version + "-" + d.getVar("BOOTBIN_VER_SUFFIX")
+
+    if len(version) > int(d.getVar("BOOTBIN_VER_MAX_LEN")):
+        bb.error("version string too long")
+
+    with open(d.expand("${B}/${BOOTBIN_VER_FILE}"), "w") as f:
+        f.write(version.encode("utf-8").hex())
+
+    with open(d.expand("${B}/${BOOTBIN_MANIFEST_FILE}"), "w") as f:
+        f.write("* %s\n" % d.getVar('PN'))
+        f.write("VERSION: %s\n" % version)
+        f.write("PV: %s\n" % d.getVar('PV'))
+        f.write("XILINX_VER_MAIN: %s\n" % d.getVar('XILINX_VER_MAIN'))
+        f.write("XILINX_VER_UPDATE: %s\n" % d.getVar('XILINX_VER_UPDATE'))
+        f.write("XILINX_VER_BUILD: %s\n\n" % d.getVar('XILINX_VER_BUILD'))
+}
+
+do_install() {
+    install -d ${D}/boot
+    install -m 0644 ${B}/${BOOTBIN_VER_FILE} ${D}/boot/
+}
+
+do_deploy() {
+    install -m 0644 ${B}/${BOOTBIN_VER_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.txt
+    ln -s ${IMAGE_NAME}.txt ${DEPLOYDIR}/${IMAGE_LINK_NAME}.txt
+    install -m 0644 ${B}/${BOOTBIN_MANIFEST_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.manifest
+    ln -s ${IMAGE_NAME}.manifest ${DEPLOYDIR}/${IMAGE_LINK_NAME}.manifest
+}
+
+addtask deploy after do_compile
+
+SYSROOT_DIRS += "/boot"
+FILES:${PN} += "/boot/${BOOTBIN_VER_FILE}"
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 8d7211f5..1f8ae2e3 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -23,7 +23,7 @@ inherit devicetree image-artifact-names
 SYSTEM_DTFILE ??= ""
 CONFIG_DTFILE ??= "${SYSTEM_DTFILE}"
 
-BASE_DTS ?= "${@os.path.basename(d.getVar('CONFIG_DTFILE') or '').rstrip('.dtb').rstrip('.dts') or 'system-top'}"
+BASE_DTS ?= "${@os.path.splitext(os.path.basename(d.getVar('CONFIG_DTFILE') or ''))[0] or 'system-top'}"
 
 EXTRA_DT_FILES ?= ""
 EXTRA_DTFILE_PREFIX ?= "system-top"
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb
new file mode 100644
index 00000000..b0acf0ef
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb
@@ -0,0 +1,72 @@
+SUMMARY  = "Xilinx dfx-mgr libraries"
+DESCRIPTION = "Xilinx Runtime User Space Libraries and Binaries"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d67bcef754e935bf77b6d7051bd62b5e"
+
+REPO ?= "git://github.com/Xilinx/dfx-mgr.git;protocol=https"
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+BRANCH = "master"
+SRCREV = "ec70363a2a878737057995f922a9460d18aafa26"
+SOMAJOR = "1"
+SOMINOR = "0"
+SOVERSION = "${SOMAJOR}.${SOMINOR}"
+
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+
+S = "${WORKDIR}/git"
+
+inherit cmake update-rc.d systemd
+
+DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm systemd"
+RDEPENDS:${PN} += " freeipmi"
+EXTRA_OECMAKE += " \
+               -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \
+                "
+
+INITSCRIPT_NAME = "dfx-mgr.sh"
+INITSCRIPT_PARAMS = "start 99 S ."
+
+SYSTEMD_PACKAGES="${PN}"
+SYSTEMD_SERVICE:${PN}="dfx-mgr.service"
+SYSTEMD_AUTO_ENABLE:${PN}="enable"
+
+
+do_install(){
+        install -d ${D}${bindir}
+        install -d ${D}${libdir}
+        install -d ${D}${includedir}
+        install -d ${D}${base_libdir}/firmware/xilinx
+        install -d ${D}${sysconfdir}/dfx-mgrd
+
+        cp ${B}/example/sys/linux/dfx-mgrd-static ${D}${bindir}/dfx-mgrd
+        cp ${B}/example/sys/linux/dfx-mgr-client-static ${D}${bindir}/dfx-mgr-client
+        chrpath -d ${D}${bindir}/dfx-mgrd
+        chrpath -d ${D}${bindir}/dfx-mgr-client
+        install -m 0644 ${S}/src/dfxmgr_client.h ${D}${includedir}
+
+        oe_soinstall ${B}/src/libdfx-mgr.so.${SOVERSION} ${D}${libdir}
+
+        install -m 0755 ${S}/src/daemon.conf ${D}${sysconfdir}/dfx-mgrd/
+
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+                install -d ${D}${sysconfdir}/init.d/
+                install -m 0755 ${S}/src/dfx-mgr.sh ${D}${sysconfdir}/init.d/
+        fi
+
+        install -m 0755 ${S}/src/dfx-mgr.sh ${D}${bindir}
+        install -m 0755 ${S}/src/scripts/xlnx-firmware-detect ${D}${bindir}
+
+        install -d ${D}${systemd_system_unitdir}
+        install -m 0644 ${S}/src/dfx-mgr.service ${D}${systemd_system_unitdir}
+}
+
+PACKAGES =+ "libdfx-mgr"
+
+FILES:${PN} += "${base_libdir}/firmware/xilinx"
+FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${sysconfdir}/init.d/dfx-mgr.sh', '', d)} ${systemd_system_unitdir}"
+FILES:libdfx-mgr = "${libdir}/libdfx-mgr.so.${SOVERSION} ${libdir}/libdfx-mgr.so.${SOMAJOR}"
diff --git a/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c b/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c
index 04777a91..281e1828 100644
--- a/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c
+++ b/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Copyright (C) 2019-2022 Xilinx, Inc.  All rights reserved.
- * Copyright (C) 2022 Advanced Micro Devices, Inc.  All rights reserved.
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc.  All rights reserved.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -75,6 +75,20 @@ int fpga_getplatform()
 
 }
 
+static bool file_exists(const char *filename)
+{
+        FILE *fp = fopen(filename, "r");
+        bool is_exist = false;
+
+        if (fp != NULL)
+        {
+                is_exist = true;
+                fclose(fp); // close the file
+        }
+
+        return is_exist;
+}
+
 void print_usage(char *prg)
 {
         int iszynqmp = fpga_getplatform();
@@ -252,6 +266,12 @@ int main(int argc, char **argv)
         struct stat sb;
         double time;
         struct timeval t1, t0;
+        uid_t euid = geteuid();
+
+        if (euid) {
+                printf("Error: This binary requires root access to execute. \n");
+                return 0;
+        }
 
         if (argc == 1) {
                 print_usage(basename(argv[0]));
@@ -262,10 +282,18 @@ int main(int argc, char **argv)
                 switch (opt) {
                 case 'o':
                         overlay = optarg;
+                        if (!file_exists(overlay)) {
+                                printf("Error: User provided Overlay file doesn't exist\r\n");
+                                return 1;
+                        }
                         flow = OVERLAY;
                         break;
                 case 'b':
                         binfile = optarg;
+                        if (!file_exists(binfile)) {
+                                printf("Error: User provided bitstream file doesn't exist\r\n");
+                                return 1;
+                        }
                         if (!(flow == OVERLAY))
                                 flow = FPGA_SYSFS;
                         break;
@@ -415,7 +443,11 @@ int main(int argc, char **argv)
                 if (binfile != NULL) {
                         if (!fpga_state()) {
                                 printf("Time taken to load BIN is %f Milli Seconds\n\r", time);
-                                printf("BIN FILE loaded through FPGA manager successfully\n\r");
+                                if (ret) {
+                                        printf("BIN FILE loaded through FPGA manager successfull but failed to apply Overlay\n\r");
+                                } else {
+                                        printf("BIN FILE loaded through FPGA manager successfully\n\r");
+                                }
                         } else {
                                 printf("BIN FILE loading through FPGA manager failed\n\r");
                         }
diff --git a/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb b/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
index d22c995c..b9a36d77 100644
--- a/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Install user script to support fpga-manager"
 DESCRIPTION = "Install user script that loads and unloads overlays using kernel fpga-manager"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/fpgautil.c;beginline=1;endline=24;md5=0c02eabf57dba52842c5df9b96bccfae"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/fpgautil.c;beginline=1;endline=24;md5=0dbf04c2c1026b3d120136e728b7a09f"
 
 SRC_URI = "\
         file://fpgautil.c \
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
new file mode 100644
index 00000000..0cbcaac7
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Xilinx libdfx library"
+DESCRIPTION = "Xilinx libdfx Library and headers"
+
+LICENSE = "MIT & GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=94aba86aec117f003b958a52f019f1a7"
+
+BRANCH ?= "master"
+REPO ?= "git://github.com/Xilinx/libdfx.git;protocol=https"
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+SRCREV = "c8275891ead62b3dfce68c00cf466715f0ac75f1"
+
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+# Due to an update where the soname/version was defined, we need to use an RREPLACES
+# so updates will work properly.
+RREPLACES:${PN} = "libdfx"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch b/meta-xilinx-core/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
deleted file mode 100644
index 7091098c..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8127b19aa42ccfb3faae1173a12b3eb0cebf8941 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 30 Jan 2020 09:37:15 +0000
-Subject: [PATCH] Remove redundant YYLOC global declaration
-
-Same as the upstream fix for building dtc with gcc 10.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
-State: upstream (e33a814e772cdc36436c8c188d8c42d019fda639)
----
- scripts/dtc/dtc-lexer.l | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
-index fd825ebba6..24af549977 100644
---- a/scripts/dtc/dtc-lexer.l
-+++ b/scripts/dtc/dtc-lexer.l
-@@ -38,7 +38,6 @@ LINECOMMENT   "//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
- 
--YYLTYPE yylloc;
- extern bool treesource_error;
- 
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
--- 
-2.29.2
-
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend
index 65b6ad9d..8df497db 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend
@@ -1,5 +1,5 @@
 # Skip processing of this recipe if it is not explicitly specified as the
-# PREFERRED_PROVIDER for libmetal. This avoids network access required by
+# PREFERRED_PROVIDER for u-boot-tools. This avoids network access required by
 # the use of AUTOREV SRCREVs, which may be the default for some recipes.
 python () {
     if bb.data.inherits_class('native', d):
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.1.bb
index fe5ecf79..590d1755 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.1.bb
@@ -1,5 +1,5 @@
 require u-boot-tools-xlnx.inc
-require u-boot-xlnx-2023.1.inc
+require u-boot-xlnx-2024.1.inc
 
 # MUST clear CONFIG_VIDEO to avoid a compilation failure trying to construct
 # bmp_logo.h
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2024.01/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2024.01/microblaze-generic.cfg
new file mode 100644
index 00000000..033fb197
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2024.01/microblaze-generic.cfg
@@ -0,0 +1,83 @@
+# SPDX-License-Identifier: MIT
+
+#........................................................................
+#                                WARNING
+#
+# This file is a u-boot configuration fragment, and not a full u-boot
+# configuration file. The final u-boot configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on u-boot configuration, please
+# refer the product documentation.
+#
+#.......................................................................
+
+#
+# Definitions for Generic Microbalze machine.
+#
+CONFIG_BOOTDELAY=4
+CONFIG_TEXT_BASE=0x80100000
+CONFIG_SYS_PROMPT="U-Boot>"
+CONFIG_SYS_CONFIG_NAME="microblaze-generic"
+CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000
+# CONFIG_SYS_NS16550 is not set
+# CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set
+# CONFIG_SYS_FLASH_CFI is not set
+# CONFIG_FLASH_CFI_DRIVER is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_MTD_NOR_FLASH is not set
+# CONFIG_MTD_DEVICE is not set
+# CONFIG_SYS_FLASH_PROTECTION is not set
+# CONFIG_SPI_FLASH_SST is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_PHY_VITESSE is not set
+# CONFIG_CMD_EXT2 is not set
+# CONFIG_CMD_EXT4 is not set
+# CONFIG_CMD_EXT4_WRITE is not set
+# CONFIG_CMD_FAT is not set
+# CONFIG_DOS_PARTITION is not set
+# CONFIG_FAT_WRITE is not set
+CONFIG_DM=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_XILINX_UARTLITE=y
+CONFIG_XILINX_AXIEMAC=y
+CONFIG_PHY_XILINX=y
+CONFIG_PHY_TI=y
+CONFIG_NET=y
+CONFIG_PHY_GIGE=y
+CONFIG_NETDEVICES=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_DHCP=y
+CONFIG_PHYLIB=y
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_NFS=y
+CONFIG_CMD_MII=y
+CONFIG_PHY_MARVELL=y
+CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NATSEMI=y
+CONFIG_XILINX_SPI=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_SF=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_DM_SPI=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI=y
+CONFIG_SPI_FLASH_ISSI=y
+# CONFIG_BOOTARGS is not set
+# CONFIG_USE_BOOTARGS is not set
+# CONFIG_SPL is not set
+# CONFIG_I2C_EEPROM is not set
+# CONFIG_CMD_EEPROM is not set
+# CONFIG_SYS_I2C_EEPROM_ADDR is not set
+# CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set
+CONFIG_DCACHE=y
+CONFIG_ICACHE=y
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-2024.1.inc
index 72f43f71..56d65113 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-2024.1.inc
@@ -1,8 +1,8 @@
-UBOOT_VERSION = "v2023.01"
+UBOOT_VERSION = "v2024.01"
 
-UBRANCH = "xlnx_rebase_v2023.01_update"
+UBRANCH = "xlnx_rebase_v2024.01"
 
-SRCREV = "1689570b68dd3827e527a520805aa0bb7f58ee09"
+SRCREV = "19348a61f408d61afd7997adf511895d87b0d3ac"
 
 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-microblaze.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
index 2ef7b9cf..57c00c6e 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
@@ -1,11 +1,6 @@
 SRC_URI += " \
     file://microblaze-generic.cfg \
-    file://microblaze-generic-top.h \
     "
 
-do_configure:prepend () {
-    install ${WORKDIR}/microblaze-generic-top.h ${S}/include/configs/
-}
-
-# Disable buildpaths QA check warnings for u-boot-xlnx.elf.
-INSANE_SKIP:${PN}-elf += "buildpaths"
+# Disable buildpaths and arch QA check warnings for u-boot-xlnx.elf.
+INSANE_SKIP:${PN}-elf += "buildpaths arch"
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 6410fc25..c3af0185 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
@@ -65,6 +65,7 @@ UBOOTPXE_CONFIG ?= "pxelinux.cfg"
 UBOOTPXE_CONFIG_NAME = "${UBOOTPXE_CONFIG}${IMAGE_VERSION_SUFFIX}"
 
 DEVICETREE_ADDRESS ?= "${@append_baseaddr(d,d.getVar('DEVICETREE_OFFSET'))}"
+DEVICETREE_ADDRESS_SD ?= "${DEVICETREE_ADDRESS}"
 
 DEVICETREE_OFFSET:microblaze ??= "0x1e00000"
 DEVICETREE_OFFSET:zynqmp ??= "0x100000"
@@ -214,6 +215,7 @@ do_compile() {
         -e 's/@@KERNEL_LOAD_ADDRESS@@/${KERNEL_LOAD_ADDRESS}/' \
         -e 's/@@DEVICE_TREE_NAME@@/${DEVICE_TREE_NAME}/' \
         -e 's/@@DEVICETREE_ADDRESS@@/${DEVICETREE_ADDRESS}/' \
+        -e 's/@@DEVICETREE_ADDRESS_SD@@/${DEVICETREE_ADDRESS_SD}/' \
         -e 's/@@DEVICETREE_OVERLAY_ADDRESS@@/${DEVICETREE_OVERLAY_ADDRESS}/' \
         -e 's/@@RAMDISK_IMAGE@@/${RAMDISK_IMAGE}/' \
         -e 's/@@RAMDISK_IMAGE_ADDRESS@@/${RAMDISK_IMAGE_ADDRESS}/' \
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic
index d99932ed..e09bdfa9 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic
@@ -39,25 +39,25 @@ do
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@KERNEL_LOAD_ADDRESS@@ ${kernel_name};
                 fi
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /system.dtb; then
-                        fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_ADDRESS@@ system.dtb;
-                        setenv fdtcontroladdr @@DEVICETREE_ADDRESS@@
+                        fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_ADDRESS_SD@@ system.dtb;
+                        setenv fdtcontroladdr @@DEVICETREE_ADDRESS_SD@@
                 fi
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /devicetree/openamp.dtbo; then
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_OVERLAY_ADDRESS@@ devicetree/openamp.dtbo;
-                        fdt addr @@DEVICETREE_ADDRESS@@
+                        fdt addr @@DEVICETREE_ADDRESS_SD@@
                         fdt resize 8192
                         fdt apply @@DEVICETREE_OVERLAY_ADDRESS@@
                 fi
                 run update_bootargs
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /${ramdisk_name} && test "${skip_tinyramdisk}" != "yes"; then
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@RAMDISK_IMAGE_ADDRESS@@ ${ramdisk_name};
-                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@
+                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS_SD@@
                 fi
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /${rootfs_name} && test "${skip_ramdisk}" != "yes"; then
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@RAMDISK_IMAGE_ADDRESS@@ ${rootfs_name};
-                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@
+                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS_SD@@
                 fi
-                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ - @@DEVICETREE_ADDRESS@@
+                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ - @@DEVICETREE_ADDRESS_SD@@
         fi
         if test "${boot_target}" = "xspi0" || test "${boot_target}" = "xspi1" || test "${boot_target}" = "qspi" || test "${boot_target}" = "qspi0"; then
                 sf probe 0 0 0;
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal
index d726187a..36a8f92d 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal
@@ -1,7 +1,7 @@
 @@PRE_BOOTENV@@
 
 setenv sdbootdev @@SDBOOTDEV@@
-setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon clk_ignore_unused
+setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon
 fatload mmc $sdbootdev @@DEVICETREE_ADDRESS@@ @@DEVICE_TREE_NAME@@
 fatload mmc $sdbootdev:$partid @@KERNEL_LOAD_ADDRESS@@ @@KERNEL_IMAGETYPE@@
 @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ - @@DEVICETREE_ADDRESS@@
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp
index bddab5d0..ac7438bb 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp
@@ -1,7 +1,7 @@
 @@PRE_BOOTENV@@
 
 setenv sdbootdev @@SDBOOTDEV@@
-setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon clk_ignore_unused
+setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon
 if test -n "@@BITSTREAM@@"; then
    fatload mmc $sdbootdev @@BITSTREAM_LOAD_ADDRESS@@ @@BITSTREAM_IMAGE@@ && fpga @@BITSTREAM_LOAD_TYPE@@ 0 @@BITSTREAM_LOAD_ADDRESS@@ ${filesize}
 fi
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
index 228396eb..1efc5392 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
@@ -83,7 +83,7 @@ DEPENDS:append := " virtual/kernel ${@remove_task_from_depends(d)}"
 
 # bootargs, default to booting with the rootfs device being partition 2
 KERNEL_BOOTARGS:zynq = "earlyprintk console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait"
-KERNEL_BOOTARGS:zynqmp = "earlycon clk_ignore_unused root=/dev/mmcblk${devnum}p2 rw rootwait"
+KERNEL_BOOTARGS:zynqmp = "earlycon root=/dev/mmcblk${devnum}p2 rw rootwait"
 
 KERNEL_LOAD_ADDRESS:zynq = "0x2080000"
 KERNEL_LOAD_ADDRESS:zynqmp = "0x200000"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
index 4c7ea934..bd9711f5 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -7,7 +7,7 @@ require u-boot-xlnx-common.inc
 
 SYSROOT_DIRS += "/boot"
 
-BASE_DTS ?= "${@os.path.basename(d.getVar('CONFIG_DTFILE') or '').rstrip('.dtb').rstrip('.dts') or 'system-top'}"
+BASE_DTS ?= "${@os.path.splitext(os.path.basename(d.getVar('CONFIG_DTFILE') or ''))[0] or 'system-top'}"
 DTB_PATH ?= "boot/devicetree/"
 DTB_FILE_NAME ?= ""
 
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.1.bb
index fd76bc51..718ad9d4 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.1.bb
@@ -1,4 +1,4 @@
 
 require u-boot-xlnx.inc
 require u-boot-spl-zynq-init.inc
-require u-boot-xlnx-2023.1.inc
+require u-boot-xlnx-2024.1.inc
diff --git a/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb b/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb
new file mode 100644
index 00000000..334b786b
--- /dev/null
+++ b/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb
@@ -0,0 +1,18 @@
+SUMMARY = "A general purpose TCP-IP emulator"
+DESCRIPTION = "A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
+HOMEPAGE = "https://gitlab.freedesktop.org/slirp/libslirp"
+LICENSE = "BSD-3-Clause & MIT"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727"
+
+SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
+SRCREV = "3ad1710a96678fe79066b1469cead4058713a1d9"
+PV = "4.7.0"
+S = "${WORKDIR}/git"
+
+DEPENDS = " \
+    glib-2.0 \
+"
+
+inherit meson pkgconfig
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch b/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
index 370e694b..1dcac990 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
+++ b/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
@@ -13,58 +13,77 @@ mach_path = tempfile.mkdtemp()
 
 # Separate PMU and APU arguments
 APU_args = sys.argv[1:]
-mbtype=''
+PMU_args = []
+PLM_args = []
 
 if '-pmu-args' in APU_args:
-    MB_args = APU_args[APU_args.index('-pmu-args')+1]
-    APU_args.remove('-pmu-args')
-    APU_args.remove(MB_args)
-    MB_args = MB_args.split()
-    PMU_rom = MB_args[MB_args.index('-kernel')+1]
-    mbtype='PMU'
-elif '-plm-args' in APU_args:
-    MB_args = APU_args[APU_args.index('-plm-args')+1]
-    APU_args.remove('-plm-args')
-    APU_args.remove(MB_args)
-    MB_args = MB_args.split()
-    mbtype='PLM'
-elif '--help' in APU_args:
-    mbtype='help'
-else:
-    error_msg = '\nMultiarch not setup properly.'
-    sys.exit(error_msg)
-
-error_msg = None
-if (mbtype == 'PMU' and os.path.exists(PMU_rom)) or mbtype == 'PLM':
-
-    # We need to switch tcp serial arguments (if they exist, e.g. qemurunner) to get the output correctly
-    tcp_serial_ports = [i for i, s in enumerate(APU_args) if 'tcp:127.0.0.1:' in s]
-
-    #NEED TO FIX for next yocto release (dont need to switch ports anymore, they will be provided correctly upstream
-    # We can only switch these if there are exactly two, otherwise we can't assume what is being executed so we leave it as is
-    if len(tcp_serial_ports) == 2:
-        APU_args[tcp_serial_ports[0]],APU_args[tcp_serial_ports[1]] = APU_args[tcp_serial_ports[1]],APU_args[tcp_serial_ports[0]]
-
-    mb_cmd =  binpath + '/qemu-system-microblazeel ' + ' '.join(MB_args) + ' -machine-path ' + mach_path
-    apu_cmd =  binpath + '/qemu-system-aarch64 ' + ' '.join(APU_args) + ' -machine-path ' + mach_path
-
-    # Debug prints
-    print('\n%s instance cmd: %s\n' % (mbtype, mb_cmd))
-    print('APU instance cmd: %s\n' % apu_cmd)
-
-
-    # Invoke QEMU pmu instance
-    process_pmu = subprocess.Popen(mb_cmd, shell=True, stderr=subprocess.PIPE)
-
-    # Invoke QEMU APU instance
-    process_apu = subprocess.Popen(apu_cmd, shell=True, stderr=subprocess.PIPE)
-    if process_apu.wait():
-        error_msg = '\nQEMU APU instance failed:\n%s' % process_apu.stderr.read().decode()
+    pmu_args_idx = APU_args.index('-pmu-args')
+    PMU_args = APU_args[pmu_args_idx+1].split()
+    del APU_args[pmu_args_idx:pmu_args_idx+2]
+
+if '-plm-args' in APU_args:
+    plm_args_idx = APU_args.index('-plm-args')
+    PLM_args = APU_args[plm_args_idx+1].split()
+    del APU_args[plm_args_idx:plm_args_idx+2]
+
+if PMU_args and PLM_args:
+    sys.exit("\nError: -pmu-args can not be used with -plm-args\n")
+
+if ('--help' in APU_args) or (not PMU_args and not PLM_args):
+    print("AMD FPGA QEMU multiarch wrapper\n")
+    print("Version 2024.1")
+    print("")
+    print("Usage:")
+    print("  %s <APU options> [-pmu-args <pmu options>]" % (sys.argv[0]))
+    print("  %s <APU options> [-plm-args <plm options>]" % (sys.argv[0]))
+    print("")
+    sys.exit(1)
+
+if PMU_args:
+    PMU_rom = PMU_args[PMU_args.index('-kernel')+1]
 
-else:
-    if mbtype == 'PMU':
+    if not os.path.exists(PMU_rom):
         error_msg = '\nError: Missing PMU ROM: %s' % PMU_rom
         error_msg += '\nSee "meta-xilinx/README.qemu.md" for more information on accquiring the PMU ROM.\n'
+        sys.exit(error_msg)
+
+# We need to switch tcp serial arguments (if they exist, e.g. qemurunner) to get the output correctly
+tcp_serial_ports = [i for i, s in enumerate(APU_args) if 'tcp:127.0.0.1:' in s]
+
+#NEED TO FIX for next yocto release (dont need to switch ports anymore, they will be provided correctly upstream
+# We can only switch these if there are exactly two, otherwise we can't assume what is being executed so we leave it as is
+if len(tcp_serial_ports) == 2:
+    APU_args[tcp_serial_ports[0]],APU_args[tcp_serial_ports[1]] = APU_args[tcp_serial_ports[1]],APU_args[tcp_serial_ports[0]]
+
+mb_cmd = ""
+if PMU_args:
+    mb_cmd =  binpath + '/qemu-system-microblazeel ' + ' '.join(PMU_args) + ' -machine-path ' + mach_path
+
+    print("PMU instance cmd: %s\n" % mb_cmd)
+
+if PLM_args:
+    mb_cmd =  binpath + '/qemu-system-microblazeel ' + ' '.join(PLM_args) + ' -machine-path ' + mach_path
+
+    print("PLM instance cmd: %s\n" % mb_cmd)
+
+apu_cmd =  binpath + '/qemu-system-aarch64 ' + ' '.join(APU_args) + ' -machine-path ' + mach_path
+
+print("APU instance cmd: %s\n" % apu_cmd)
+
+
+if mb_cmd:
+    process_mb = subprocess.Popen(mb_cmd, shell=True, stderr=subprocess.PIPE)
+
+if apu_cmd:
+    process_apu = subprocess.Popen(apu_cmd, shell=True, stderr=subprocess.PIPE)
+
+error_msg = ""
+if apu_cmd and process_apu.wait():
+    # We only check for failures on the MB instance if APU fails
+    error_msg += '\nQEMU APU instance failed:\n%s' % process_apu.stderr.read().decode()
+
+    if mb_cmd and process_mb.wait():
+        error_msg += '\nQEMU MB instance failed:\n%s' % process_mb.stderr.read().decode()
 
 shutil.rmtree(mach_path)
 sys.exit(error_msg)
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
new file mode 100644
index 00000000..5154e247
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
@@ -0,0 +1,290 @@
+SUMMARY = "Fast open source processor emulator"
+DESCRIPTION = "QEMU is a hosted virtual machine monitor: it emulates the \
+machine's processor through dynamic binary translation and provides a set \
+of different hardware and device models for the machine, enabling it to run \
+a variety of guest operating systems"
+HOMEPAGE = "http://qemu.org"
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+
+DEPENDS += "bison-native meson-native ninja-native"
+
+RDEPENDS:${PN}-ptest = "bash"
+
+require qemu-targets-8.1.inc
+# https://gitlab.com/qemu-project/qemu/-/commit/81e2b198a8cb4ee5fdf108bd438f44b193ee3a36 means
+# we need a full python3-native setup
+inherit pkgconfig ptest update-rc.d systemd python3native
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+                    file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
+
+SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
+           file://powerpc_rom.bin \
+           file://run-ptest \
+           file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \
+           file://0003-apic-fixup-fallthrough-to-PIC.patch \
+           file://0004-configure-Add-pkg-config-handling-for-libgcrypt.patch \
+           file://0005-qemu-Do-not-include-file-if-not-exists.patch \
+           file://0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \
+           file://0007-qemu-Determinism-fixes.patch \
+           file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \
+           file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \
+           file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \
+           file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \
+           file://fixedmeson.patch \
+           file://fixmips.patch \
+           file://no-pip.patch \
+           file://qemu-guest-agent.init \
+           file://qemu-guest-agent.udev \
+           "
+UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
+
+
+SRC_URI[sha256sum] = "541526a764576eb494d2ff5ec46aeb253e62ea29035d1c23c0a8af4e6cd4f087"
+
+SRC_URI:append:class-target = " file://cross.patch"
+SRC_URI:append:class-nativesdk = " file://cross.patch"
+
+CVE_STATUS[CVE-2017-5957] = "cpe-incorrect: Applies against virglrender < 0.6.0 and not qemu itself"
+
+CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default."
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11
+CVE_STATUS[CVE-2018-18438] = "disputed: The issues identified by this CVE were determined to not constitute a vulnerability."
+
+# As per https://nvd.nist.gov/vuln/detail/CVE-2023-0664
+# https://bugzilla.redhat.com/show_bug.cgi?id=2167423
+CVE_STATUS[CVE-2023-0664] = "not-applicable-platform: Issue only applies on Windows"
+
+# As per https://bugzilla.redhat.com/show_bug.cgi?id=2203387
+CVE_STATUS[CVE-2023-2680] = "not-applicable-platform: RHEL specific issue."
+
+COMPATIBLE_HOST:mipsarchn32 = "null"
+COMPATIBLE_HOST:mipsarchn64 = "null"
+COMPATIBLE_HOST:riscv32 = "null"
+
+# Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html
+# upstream states qemu doesn't work without optimization
+DEBUG_BUILD = "0"
+
+do_install:append() {
+    # Prevent QA warnings about installed ${localstatedir}/run
+    if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
+}
+
+do_install_ptest() {
+        cp -rL ${B}/tests ${D}${PTEST_PATH}
+        find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcodp]" | xargs -i rm -rf {}
+
+        # Don't check the file genreated by configure
+        sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh
+
+        # Strip the paths from the QEMU variable, we can use PATH
+        makfiles=$(find ${D}${PTEST_PATH} -name "*.mak")
+        sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" $makfiles
+
+        # Strip compiler flags as they break reproducibility
+        sed -i -e "s,^CC=.*,CC=gcc," \
+               -e "s,^CCAS=.*,CCAS=gcc," \
+               -e "s,^LD=.*,LD=ld," $makfiles
+
+        # Update SRC_PATH variable to the right place on target
+        sed -i -e "s#^SRC_PATH=.*#SRC_PATH=${PTEST_PATH}#g" $makfiles
+
+        # https://gitlab.com/qemu-project/qemu/-/issues/1403
+        rm ${D}${PTEST_PATH}/tests/unit/test-io-channel-command
+}
+
+# QEMU_TARGETS is overridable variable
+QEMU_TARGETS ?= "arm aarch64 i386 loongarch64 mips mipsel mips64 mips64el ppc ppc64 ppc64le riscv32 riscv64 sh4 x86_64"
+
+EXTRA_OECONF = " \
+    --prefix=${prefix} \
+    --bindir=${bindir} \
+    --includedir=${includedir} \
+    --libdir=${libdir} \
+    --mandir=${mandir} \
+    --datadir=${datadir} \
+    --docdir=${docdir}/${BPN} \
+    --sysconfdir=${sysconfdir} \
+    --libexecdir=${libexecdir} \
+    --localstatedir=${localstatedir} \
+    --with-suffix=${BPN} \
+    --disable-strip \
+    --disable-werror \
+    --extra-cflags='${CFLAGS}' \
+    --extra-ldflags='${LDFLAGS}' \
+    --disable-download \
+    --disable-docs \
+    --host-cc='${BUILD_CC}' \
+    ${PACKAGECONFIG_CONFARGS} \
+    "
+
+EXTRA_OECONF:append:class-target = " --cross-prefix=${HOST_PREFIX}"
+EXTRA_OECONF:append:class-nativesdk = " --cross-prefix=${HOST_PREFIX}"
+
+B = "${WORKDIR}/build"
+
+#EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3"
+
+do_configure:prepend:class-native() {
+        # Append build host pkg-config paths for native target since the host may provide sdl
+        BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
+        if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
+                export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
+        fi
+}
+
+do_configure() {
+    export PKG_CONFIG=pkg-config
+    ${S}/configure ${EXTRA_OECONF}
+}
+do_configure[cleandirs] += "${B}"
+
+do_install () {
+        export STRIP=""
+        oe_runmake 'DESTDIR=${D}' install
+
+        # If we built the guest agent, also install startup/udev rules
+        if [ -e "${D}${bindir}/qemu-ga" ]; then
+                install -d ${D}${sysconfdir}/init.d/
+                install -m 0755 ${WORKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent
+                sed -i 's:@bindir@:${bindir}:' ${D}${sysconfdir}/init.d/qemu-guest-agent
+
+                install -d ${D}${sysconfdir}/udev/rules.d/
+                install -m 0644 ${WORKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules
+
+                install -d ${D}${systemd_unitdir}/system/
+                install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service ${D}${systemd_unitdir}/system
+                sed -i -e 's,-/usr/bin/,-${bindir}/,g' ${D}${systemd_unitdir}/system/qemu-guest-agent.service
+        fi
+        # ELF binary /usr/share/qemu/s390-netboot.img has relocations in .text
+        rm ${D}${datadir}/qemu/s390-netboot.img -f
+        # ELF binary /usr/share/qemu/s390-ccw.img has relocations in .text [textrel]
+        rm ${D}${datadir}/qemu/s390-ccw.img -f
+}
+
+# The following fragment will create a wrapper for qemu-mips user emulation
+# binary in order to work around a segmentation fault issue. Basically, by
+# default, the reserved virtual address space for 32-on-64 bit is set to 4GB.
+# This will trigger a MMU access fault in the virtual CPU. With this change,
+# the qemu-mips works fine.
+# IMPORTANT: This piece needs to be removed once the root cause is fixed!
+do_install:append() {
+        if [ -e "${D}/${bindir}/qemu-mips" ]; then
+                create_wrapper ${D}/${bindir}/qemu-mips \
+                        QEMU_RESERVED_VA=0x0
+        fi
+}
+# END of qemu-mips workaround
+
+# Disable kvm/virgl/mesa on targets that do not support it
+PACKAGECONFIG:remove:darwin = "kvm virglrenderer epoxy gtk+"
+PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+ pie"
+
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2"
+PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
+PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr,"
+PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio,"
+PACKAGECONFIG[uring] = "--enable-linux-io-uring,--disable-linux-io-uring,liburing"
+PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen-tools,xen-tools-libxenstore xen-tools-libxenctrl xen-tools-libxenguest"
+PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl,"
+PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg,"
+PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,curl,"
+PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss,"
+PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
+PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+3 gettext-native"
+PACKAGECONFIG[vte] = "--enable-vte,--disable-vte,vte gettext-native"
+PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
+PACKAGECONFIG[ssh] = "--enable-libssh,--disable-libssh,libssh,"
+PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
+PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle"
+PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1"
+PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc"
+PACKAGECONFIG[alsa] = "--audio-drv-list=default,,alsa-lib"
+PACKAGECONFIG[epoxy] = "--enable-opengl,--disable-opengl,libepoxy"
+PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo"
+PACKAGECONFIG[dax] = "--enable-libdaxctl,--disable-libdaxctl,ndctl"
+PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl"
+PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls"
+PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2"
+PACKAGECONFIG[libiscsi] = "--enable-libiscsi,--disable-libiscsi"
+PACKAGECONFIG[kvm] = "--enable-kvm,--disable-kvm"
+PACKAGECONFIG[virglrenderer] = "--enable-virglrenderer,--disable-virglrenderer,virglrenderer"
+# spice will be in meta-networking layer
+PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice"
+# usbredir will be in meta-networking layer
+PACKAGECONFIG[dbus-display] = "--enable-dbus-display,--disable-dbus-display,glib-2.0-native,dbus"
+PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir"
+PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy"
+PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs,glusterfs"
+PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
+PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,udev"
+PACKAGECONFIG[attr] = "--enable-attr,--disable-attr,attr,"
+PACKAGECONFIG[rbd] = "--enable-rbd,--disable-rbd,ceph,ceph"
+PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,,"
+PACKAGECONFIG[ust] = "--enable-trace-backends=ust,,lttng-ust,"
+PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,,"
+PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp"
+# libnfs is currently provided by meta-kodi
+PACKAGECONFIG[libnfs] = "--enable-libnfs,--disable-libnfs,libnfs"
+PACKAGECONFIG[pmem] = "--enable-libpmem,--disable-libpmem,pmdk"
+PACKAGECONFIG[pulseaudio] = "--enable-pa,--disable-pa,pulseaudio"
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux"
+PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf"
+PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone"
+PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma"
+PACKAGECONFIG[vde] = "--enable-vde,--disable-vde"
+PACKAGECONFIG[fuse] = "--enable-fuse --enable-fuse-lseek,--disable-fuse --disable-fuse-lseek,fuse3"
+PACKAGECONFIG[slirp] = "--enable-slirp,--disable-slirp,libslirp"
+PACKAGECONFIG[brlapi] = "--enable-brlapi,--disable-brlapi"
+PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack,"
+PACKAGECONFIG[debuginfo] = "--enable-libdw,--disable-libdw,elfutils"
+PACKAGECONFIG[pipewire] = "--enable-pipewire,--disable-pipewire,pipewire"
+PACKAGECONFIG[sndio] = "--enable-sndio,--disable-sndio,sndio"
+
+INSANE_SKIP:${PN}-common = "arch"
+
+FILES:${PN} += "${datadir}/icons"
+
+# For user who want to install all arch packages
+PACKAGES =+ "${PN}-common"
+RDEPENDS:${PN} += "${PN}-common"
+
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN} = ""
+
+FILES:${PN}-common = "${bindir}/* ${includedir}/* ${libexecdir}/* ${datadir}/* ${localstatedir}"
+
+PACKAGES_DYNAMIC += "^${PN}-user-.*  ^${PN}-system-.*"
+
+PACKAGESPLITFUNCS =+ "split_qemu_packages"
+
+python split_qemu_packages () {
+    archdir = d.expand('${bindir}/')
+    subpackages = do_split_packages(d, archdir, r'^qemu-system-(.*)$', '${PN}-system-%s', 'QEMU full system emulation binaries(%s)' , prepend=True, extra_depends='${PN}-common')
+
+    subpackages += do_split_packages(d, archdir, r'^qemu-((?!system|edid|ga|img|io|nbd|pr-helper|storage-daemon).*)$', '${PN}-user-%s', 'QEMU full user emulation binaries(%s)' , prepend=True, extra_depends='${PN}-common')
+    if subpackages:
+        d.appendVar('RDEPENDS:' + d.getVar('PN'), ' ' + ' '.join(subpackages))
+    mipspackage = d.getVar('PN') + "-user-mips"
+    if mipspackage in ' '.join(subpackages):
+        d.appendVar('RDEPENDS:' + mipspackage, ' ' + d.getVar("MLPREFIX") + 'bash')
+}
+
+# Put the guest agent in a separate package
+PACKAGES =+ "${PN}-guest-agent"
+SUMMARY:${PN}-guest-agent = "QEMU guest agent"
+FILES:${PN}-guest-agent += " \
+    ${bindir}/qemu-ga \
+    ${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules \
+    ${sysconfdir}/init.d/qemu-guest-agent \
+    ${systemd_unitdir}/system/qemu-guest-agent.service \
+"
+
+INITSCRIPT_PACKAGES = "${PN}-guest-agent"
+INITSCRIPT_NAME:${PN}-guest-agent = "qemu-guest-agent"
+INITSCRIPT_PARAMS:${PN}-guest-agent = "defaults"
+
+SYSTEMD_PACKAGES = "${PN}-guest-agent"
+SYSTEMD_SERVICE:${PN}-guest-agent = "qemu-guest-agent.service"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
new file mode 100644
index 00000000..c6550801
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
@@ -0,0 +1,33 @@
+From de64af82950a6908f9407dfc92b83c17e2af3eab Mon Sep 17 00:00:00 2001
+From: Jason Wessel <jason.wessel@windriver.com>
+Date: Fri, 28 Mar 2014 17:42:43 +0800
+Subject: [PATCH 01/12] qemu: Add addition environment space to boot loader
+ qemu-system-mips
+
+Upstream-Status: Inappropriate - OE uses deep paths
+
+If you create a project with very long directory names like 128 characters
+deep and use NFS, the kernel arguments will be truncated. The kernel will
+accept longer strings such as 1024 bytes, but the qemu boot loader defaulted
+to only 256 bytes. This patch expands the limit.
+
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+
+---
+ hw/mips/malta.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-8.0.0/hw/mips/malta.c
+===================================================================
+--- qemu-8.0.0.orig/hw/mips/malta.c
++++ qemu-8.0.0/hw/mips/malta.c
+@@ -64,7 +64,7 @@
+ #define ENVP_PADDR          0x2000
+ #define ENVP_VADDR          cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR)
+ #define ENVP_NB_ENTRIES     16
+-#define ENVP_ENTRY_SIZE     256
++#define ENVP_ENTRY_SIZE     1024
+ 
+ /* Hardware addresses */
+ #define FLASH_ADDRESS       0x1e000000ULL
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch
new file mode 100644
index 00000000..ceae67be
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch
@@ -0,0 +1,355 @@
+From 71f14902256e3c3529710b713e1ea43100bf4c40 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 17 Dec 2022 08:37:46 -0800
+Subject: [PATCH 2/2] linux-user: Replace use of lfs64 related functions and
+ macros
+
+Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
+anf macros behave same as their 64 suffixed counterparts. This also
+helps in compiling with latest musl C library, where these macros and
+functions are no more available under _GNU_SOURCE feature macro
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2022-12/msg02841.html]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Laurent Vivier <laurent@vivier.eu>
+---
+ linux-user/syscall.c | 153 +++++++++++--------------------------------
+ 1 file changed, 39 insertions(+), 114 deletions(-)
+
+Index: qemu-8.0.0/linux-user/syscall.c
+===================================================================
+--- qemu-8.0.0.orig/linux-user/syscall.c
++++ qemu-8.0.0/linux-user/syscall.c
+@@ -761,8 +761,8 @@ safe_syscall6(ssize_t, copy_file_range,
+  */
+ #define safe_ioctl(...) safe_syscall(__NR_ioctl, __VA_ARGS__)
+ /* Similarly for fcntl. Note that callers must always:
+- *  pass the F_GETLK64 etc constants rather than the unsuffixed F_GETLK
+- *  use the flock64 struct rather than unsuffixed flock
++ *  pass the F_GETLK etc constants rather than the unsuffixed F_GETLK
++ *  use the flock struct rather than unsuffixed flock
+  * This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts.
+  */
+ #ifdef __NR_fcntl64
+@@ -6813,13 +6813,13 @@ static int target_to_host_fcntl_cmd(int
+         ret = cmd;
+         break;
+     case TARGET_F_GETLK:
+-        ret = F_GETLK64;
++        ret = F_GETLK;
+         break;
+     case TARGET_F_SETLK:
+-        ret = F_SETLK64;
++        ret = F_SETLK;
+         break;
+     case TARGET_F_SETLKW:
+-        ret = F_SETLKW64;
++        ret = F_SETLKW;
+         break;
+     case TARGET_F_GETOWN:
+         ret = F_GETOWN;
+@@ -6833,17 +6833,6 @@ static int target_to_host_fcntl_cmd(int
+     case TARGET_F_SETSIG:
+         ret = F_SETSIG;
+         break;
+-#if TARGET_ABI_BITS == 32
+-    case TARGET_F_GETLK64:
+-        ret = F_GETLK64;
+-        break;
+-    case TARGET_F_SETLK64:
+-        ret = F_SETLK64;
+-        break;
+-    case TARGET_F_SETLKW64:
+-        ret = F_SETLKW64;
+-        break;
+-#endif
+     case TARGET_F_SETLEASE:
+         ret = F_SETLEASE;
+         break;
+@@ -6895,8 +6884,8 @@ static int target_to_host_fcntl_cmd(int
+      * them to 5, 6 and 7 before making the syscall(). Since we make the
+      * syscall directly, adjust to what is supported by the kernel.
+      */
+-    if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
+-        ret -= F_GETLK64 - 5;
++    if (ret >= F_GETLK && ret <= F_SETLKW) {
++        ret -= F_GETLK - 5;
+     }
+ #endif
+ 
+@@ -6929,55 +6918,11 @@ static int host_to_target_flock(int type
+     return type;
+ }
+ 
+-static inline abi_long copy_from_user_flock(struct flock64 *fl,
+-                                            abi_ulong target_flock_addr)
+-{
+-    struct target_flock *target_fl;
+-    int l_type;
+-
+-    if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
+-        return -TARGET_EFAULT;
+-    }
+-
+-    __get_user(l_type, &target_fl->l_type);
+-    l_type = target_to_host_flock(l_type);
+-    if (l_type < 0) {
+-        return l_type;
+-    }
+-    fl->l_type = l_type;
+-    __get_user(fl->l_whence, &target_fl->l_whence);
+-    __get_user(fl->l_start, &target_fl->l_start);
+-    __get_user(fl->l_len, &target_fl->l_len);
+-    __get_user(fl->l_pid, &target_fl->l_pid);
+-    unlock_user_struct(target_fl, target_flock_addr, 0);
+-    return 0;
+-}
+-
+-static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
+-                                          const struct flock64 *fl)
+-{
+-    struct target_flock *target_fl;
+-    short l_type;
+-
+-    if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
+-        return -TARGET_EFAULT;
+-    }
+-
+-    l_type = host_to_target_flock(fl->l_type);
+-    __put_user(l_type, &target_fl->l_type);
+-    __put_user(fl->l_whence, &target_fl->l_whence);
+-    __put_user(fl->l_start, &target_fl->l_start);
+-    __put_user(fl->l_len, &target_fl->l_len);
+-    __put_user(fl->l_pid, &target_fl->l_pid);
+-    unlock_user_struct(target_fl, target_flock_addr, 1);
+-    return 0;
+-}
+-
+-typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
+-typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
++typedef abi_long from_flock_fn(struct flock *fl, abi_ulong target_addr);
++typedef abi_long to_flock_fn(abi_ulong target_addr, const struct flock *fl);
+ 
+ #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
+-struct target_oabi_flock64 {
++struct target_oabi_flock {
+     abi_short l_type;
+     abi_short l_whence;
+     abi_llong l_start;
+@@ -6985,10 +6930,10 @@ struct target_oabi_flock64 {
+     abi_int   l_pid;
+ } QEMU_PACKED;
+ 
+-static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
++static inline abi_long copy_from_user_oabi_flock(struct flock *fl,
+                                                    abi_ulong target_flock_addr)
+ {
+-    struct target_oabi_flock64 *target_fl;
++    struct target_oabi_flock *target_fl;
+     int l_type;
+ 
+     if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
+@@ -7009,10 +6954,10 @@ static inline abi_long copy_from_user_oa
+     return 0;
+ }
+ 
+-static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
+-                                                 const struct flock64 *fl)
++static inline abi_long copy_to_user_oabi_flock(abi_ulong target_flock_addr,
++                                                 const struct flock *fl)
+ {
+-    struct target_oabi_flock64 *target_fl;
++    struct target_oabi_flock *target_fl;
+     short l_type;
+ 
+     if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
+@@ -7030,10 +6975,10 @@ static inline abi_long copy_to_user_oabi
+ }
+ #endif
+ 
+-static inline abi_long copy_from_user_flock64(struct flock64 *fl,
++static inline abi_long copy_from_user_flock(struct flock *fl,
+                                               abi_ulong target_flock_addr)
+ {
+-    struct target_flock64 *target_fl;
++    struct target_flock *target_fl;
+     int l_type;
+ 
+     if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
+@@ -7054,10 +6999,10 @@ static inline abi_long copy_from_user_fl
+     return 0;
+ }
+ 
+-static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
+-                                            const struct flock64 *fl)
++static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
++                                            const struct flock *fl)
+ {
+-    struct target_flock64 *target_fl;
++    struct target_flock *target_fl;
+     short l_type;
+ 
+     if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
+@@ -7076,7 +7021,7 @@ static inline abi_long copy_to_user_floc
+ 
+ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
+ {
+-    struct flock64 fl64;
++    struct flock fl64;
+ #ifdef F_GETOWN_EX
+     struct f_owner_ex fox;
+     struct target_f_owner_ex *target_fox;
+@@ -7089,6 +7034,7 @@ static abi_long do_fcntl(int fd, int cmd
+ 
+     switch(cmd) {
+     case TARGET_F_GETLK:
++    case TARGET_F_OFD_GETLK:
+         ret = copy_from_user_flock(&fl64, arg);
+         if (ret) {
+             return ret;
+@@ -7098,32 +7044,11 @@ static abi_long do_fcntl(int fd, int cmd
+             ret = copy_to_user_flock(arg, &fl64);
+         }
+         break;
+-
+     case TARGET_F_SETLK:
+     case TARGET_F_SETLKW:
+-        ret = copy_from_user_flock(&fl64, arg);
+-        if (ret) {
+-            return ret;
+-        }
+-        ret = get_errno(safe_fcntl(fd, host_cmd, &fl64));
+-        break;
+-
+-    case TARGET_F_GETLK64:
+-    case TARGET_F_OFD_GETLK:
+-        ret = copy_from_user_flock64(&fl64, arg);
+-        if (ret) {
+-            return ret;
+-        }
+-        ret = get_errno(safe_fcntl(fd, host_cmd, &fl64));
+-        if (ret == 0) {
+-            ret = copy_to_user_flock64(arg, &fl64);
+-        }
+-        break;
+-    case TARGET_F_SETLK64:
+-    case TARGET_F_SETLKW64:
+     case TARGET_F_OFD_SETLK:
+     case TARGET_F_OFD_SETLKW:
+-        ret = copy_from_user_flock64(&fl64, arg);
++        ret = copy_from_user_flock(&fl64, arg);
+         if (ret) {
+             return ret;
+         }
+@@ -7348,7 +7273,7 @@ static inline abi_long target_truncate64
+         arg2 = arg3;
+         arg3 = arg4;
+     }
+-    return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
++    return get_errno(truncate(arg1, target_offset64(arg2, arg3)));
+ }
+ #endif
+ 
+@@ -7362,7 +7287,7 @@ static inline abi_long target_ftruncate6
+         arg2 = arg3;
+         arg3 = arg4;
+     }
+-    return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
++    return get_errno(ftruncate(arg1, target_offset64(arg2, arg3)));
+ }
+ #endif
+ 
+@@ -8598,7 +8523,7 @@ static int do_getdents(abi_long dirfd, a
+     void *tdirp;
+     int hlen, hoff, toff;
+     int hreclen, treclen;
+-    off64_t prev_diroff = 0;
++    off_t prev_diroff = 0;
+ 
+     hdirp = g_try_malloc(count);
+     if (!hdirp) {
+@@ -8651,7 +8576,7 @@ static int do_getdents(abi_long dirfd, a
+              * Return what we have, resetting the file pointer to the
+              * location of the first record not returned.
+              */
+-            lseek64(dirfd, prev_diroff, SEEK_SET);
++            lseek(dirfd, prev_diroff, SEEK_SET);
+             break;
+         }
+ 
+@@ -8685,7 +8610,7 @@ static int do_getdents64(abi_long dirfd,
+     void *tdirp;
+     int hlen, hoff, toff;
+     int hreclen, treclen;
+-    off64_t prev_diroff = 0;
++    off_t prev_diroff = 0;
+ 
+     hdirp = g_try_malloc(count);
+     if (!hdirp) {
+@@ -8727,7 +8652,7 @@ static int do_getdents64(abi_long dirfd,
+              * Return what we have, resetting the file pointer to the
+              * location of the first record not returned.
+              */
+-            lseek64(dirfd, prev_diroff, SEEK_SET);
++            lseek(dirfd, prev_diroff, SEEK_SET);
+             break;
+         }
+ 
+@@ -11158,7 +11083,7 @@ static abi_long do_syscall1(CPUArchState
+                 return -TARGET_EFAULT;
+             }
+         }
+-        ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
++        ret = get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)));
+         unlock_user(p, arg2, ret);
+         return ret;
+     case TARGET_NR_pwrite64:
+@@ -11175,7 +11100,7 @@ static abi_long do_syscall1(CPUArchState
+                 return -TARGET_EFAULT;
+             }
+         }
+-        ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
++        ret = get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5)));
+         unlock_user(p, arg2, 0);
+         return ret;
+ #endif
+@@ -11998,14 +11923,14 @@ static abi_long do_syscall1(CPUArchState
+     case TARGET_NR_fcntl64:
+     {
+         int cmd;
+-        struct flock64 fl;
+-        from_flock64_fn *copyfrom = copy_from_user_flock64;
+-        to_flock64_fn *copyto = copy_to_user_flock64;
++        struct flock fl;
++        from_flock_fn *copyfrom = copy_from_user_flock;
++        to_flock_fn *copyto = copy_to_user_flock;
+ 
+ #ifdef TARGET_ARM
+         if (!cpu_env->eabi) {
+-            copyfrom = copy_from_user_oabi_flock64;
+-            copyto = copy_to_user_oabi_flock64;
++            copyfrom = copy_from_user_oabi_flock;
++            copyto = copy_to_user_oabi_flock;
+         }
+ #endif
+ 
+@@ -12015,7 +11940,7 @@ static abi_long do_syscall1(CPUArchState
+         }
+ 
+         switch(arg2) {
+-        case TARGET_F_GETLK64:
++        case TARGET_F_GETLK:
+             ret = copyfrom(&fl, arg3);
+             if (ret) {
+                 break;
+@@ -12026,8 +11951,8 @@ static abi_long do_syscall1(CPUArchState
+             }
+            break;
+ 
+-        case TARGET_F_SETLK64:
+-        case TARGET_F_SETLKW64:
++        case TARGET_F_SETLK:
++        case TARGET_F_SETLKW:
+             ret = copyfrom(&fl, arg3);
+             if (ret) {
+                 break;
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0003-apic-fixup-fallthrough-to-PIC.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0003-apic-fixup-fallthrough-to-PIC.patch
new file mode 100644
index 00000000..e85f8202
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0003-apic-fixup-fallthrough-to-PIC.patch
@@ -0,0 +1,44 @@
+From dc2a8ccd440ee3741b61606eafed3f7e092f4312 Mon Sep 17 00:00:00 2001
+From: Mark Asselstine <mark.asselstine@windriver.com>
+Date: Tue, 26 Feb 2013 11:43:28 -0500
+Subject: [PATCH 03/12] apic: fixup fallthrough to PIC
+
+Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC
+interrupts through the local APIC if the local APIC config says so.]
+missed a check to ensure the local APIC is enabled. Since if the local
+APIC is disabled it doesn't matter what the local APIC config says.
+
+If this check isn't done and the guest has disabled the local APIC the
+guest will receive a general protection fault, similar to what is seen
+here:
+
+https://lists.gnu.org/archive/html/qemu-devel/2012-12/msg02304.html
+
+The GPF is caused by an attempt to service interrupt 0xffffffff. This
+comes about since cpu_get_pic_interrupt() calls apic_accept_pic_intr()
+(with the local APIC disabled apic_get_interrupt() returns -1).
+apic_accept_pic_intr() returns 0 and thus the interrupt number which
+is returned from cpu_get_pic_interrupt(), and which is attempted to be
+serviced, is -1.
+
+Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg00878.html]
+Signed-off-by: He Zhe <zhe.he@windriver.com>
+
+---
+ hw/intc/apic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-8.0.0/hw/intc/apic.c
+===================================================================
+--- qemu-8.0.0.orig/hw/intc/apic.c
++++ qemu-8.0.0/hw/intc/apic.c
+@@ -607,7 +607,7 @@ int apic_accept_pic_intr(DeviceState *de
+     APICCommonState *s = APIC(dev);
+     uint32_t lvt0;
+ 
+-    if (!s)
++    if (!s || !(s->spurious_vec & APIC_SV_ENABLE))
+         return -1;
+ 
+     lvt0 = s->lvt[APIC_LVT_LINT0];
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch
new file mode 100644
index 00000000..f981a64a
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch
@@ -0,0 +1,29 @@
+From d8265abdce5dc2bf74b3fccdf2b7257b4f3894f0 Mon Sep 17 00:00:00 2001
+From: He Zhe <zhe.he@windriver.com>
+Date: Wed, 28 Aug 2019 19:56:28 +0800
+Subject: [PATCH 04/12] configure: Add pkg-config handling for libgcrypt
+
+libgcrypt may also be controlled by pkg-config, this patch adds pkg-config
+handling for libgcrypt.
+
+Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html]
+
+Signed-off-by: He Zhe <zhe.he@windriver.com>
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-8.1.0/meson.build
+===================================================================
+--- qemu-8.1.0.orig/meson.build
++++ qemu-8.1.0/meson.build
+@@ -1481,7 +1481,7 @@ endif
+ if not gnutls_crypto.found()
+   if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled()
+     gcrypt = dependency('libgcrypt', version: '>=1.8',
+-                        method: 'config-tool',
++                        method: 'pkg-config',
+                         required: get_option('gcrypt'))
+     # Debian has removed -lgpg-error from libgcrypt-config
+     # as it "spreads unnecessary dependencies" which in
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0005-qemu-Do-not-include-file-if-not-exists.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0005-qemu-Do-not-include-file-if-not-exists.patch
new file mode 100644
index 00000000..38aa4c3b
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0005-qemu-Do-not-include-file-if-not-exists.patch
@@ -0,0 +1,32 @@
+From f39e7bfc5ed07b5ecaeb705c4eae4855ca120d47 Mon Sep 17 00:00:00 2001
+From: Oleksiy Obitotskyy <oobitots@cisco.com>
+Date: Wed, 25 Mar 2020 21:21:35 +0200
+Subject: [PATCH 05/12] qemu: Do not include file if not exists
+
+Script configure checks for if_alg.h and check failed but
+if_alg.h still included.
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2020-03/msg07188.html]
+Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
+
+[update patch context]
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+
+---
+ linux-user/syscall.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: qemu-8.0.0/linux-user/syscall.c
+===================================================================
+--- qemu-8.0.0.orig/linux-user/syscall.c
++++ qemu-8.0.0/linux-user/syscall.c
+@@ -115,7 +115,9 @@
+ #include <linux/blkpg.h>
+ #include <netpacket/packet.h>
+ #include <linux/netlink.h>
++#if defined(CONFIG_AF_ALG)
+ #include <linux/if_alg.h>
++#endif
+ #include <linux/rtc.h>
+ #include <sound/asound.h>
+ #ifdef HAVE_BTRFS_H
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
new file mode 100644
index 00000000..5d1d7c68
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
@@ -0,0 +1,49 @@
+From 375cae3dd6151ef33cae8f243f6a2c2da6c0c356 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Fri, 8 Jan 2021 17:27:06 +0000
+Subject: [PATCH 06/12] qemu: Add some user space mmap tweaks to address musl
+ 32 bit
+
+When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an
+infinite loop of mremap calls of ever decreasing/increasing addresses.
+
+I suspect something in the musl memory allocation code loops indefinitely
+if it only sees ENOMEM and only exits when it hits EFAULT.
+
+According to the docs, trying to mremap outside the address space
+can/should return EFAULT and changing this allows the build to succeed.
+
+A better return value for the other cases of invalid addresses is EINVAL
+rather than ENOMEM so adjust the other part of the test to this.
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
+
+---
+ linux-user/mmap.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+Index: qemu-8.0.0/linux-user/mmap.c
+===================================================================
+--- qemu-8.0.0.orig/linux-user/mmap.c
++++ qemu-8.0.0/linux-user/mmap.c
+@@ -776,12 +776,16 @@ abi_long target_mremap(abi_ulong old_add
+     int prot;
+     void *host_addr;
+ 
+-    if (!guest_range_valid_untagged(old_addr, old_size) ||
+-        ((flags & MREMAP_FIXED) &&
++    if (!guest_range_valid_untagged(old_addr, old_size)) {
++        errno = EFAULT;
++        return -1;
++    }
++    
++    if (((flags & MREMAP_FIXED) &&
+          !guest_range_valid_untagged(new_addr, new_size)) ||
+         ((flags & MREMAP_MAYMOVE) == 0 &&
+          !guest_range_valid_untagged(old_addr, new_size))) {
+-        errno = ENOMEM;
++        errno = EINVAL;
+         return -1;
+     }
+ 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0007-qemu-Determinism-fixes.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0007-qemu-Determinism-fixes.patch
new file mode 100644
index 00000000..d3f965e0
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0007-qemu-Determinism-fixes.patch
@@ -0,0 +1,31 @@
+From 50bab5c2605b609ea7ea154f57a9be96d656725a Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Mon, 1 Mar 2021 13:00:47 +0000
+Subject: [PATCH 07/12] qemu: Determinism fixes
+
+When sources are included within debug information, a couple of areas of the
+qemu build are not reproducible due to either full buildpaths or timestamps.
+
+Replace the full paths with relative ones. I couldn't figure out how to get
+meson to pass relative paths but we can fix that in the script.
+
+Upstream-Status: Pending [some version of all/part of this may be accepted]
+RP 2021/3/1
+
+---
+ scripts/decodetree.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-8.0.0/scripts/decodetree.py
+===================================================================
+--- qemu-8.0.0.orig/scripts/decodetree.py
++++ qemu-8.0.0/scripts/decodetree.py
+@@ -1328,7 +1328,7 @@ def main():
+     toppat = ExcMultiPattern(0)
+ 
+     for filename in args:
+-        input_file = filename
++        input_file = os.path.relpath(filename)
+         f = open(filename, 'rt', encoding='utf-8')
+         parse_file(f, toppat)
+         f.close()
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch
new file mode 100644
index 00000000..a84364cc
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch
@@ -0,0 +1,41 @@
+From 2bf9388b801d4389e2d57e95a7897bfc1c42786e Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 14 Jan 2021 06:33:04 +0000
+Subject: [PATCH 08/12] tests/meson.build: use relative path to refer to files
+
+Fix error like:
+Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long
+
+when build path is too long, use meson.source_root() will make this
+filename too long. Fixed by using relative path to refer to files
+
+Upstream-Status: Submitted [send to qemu-devel]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+
+---
+ tests/unit/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: qemu-8.0.0/tests/unit/meson.build
+===================================================================
+--- qemu-8.0.0.orig/tests/unit/meson.build
++++ qemu-8.0.0/tests/unit/meson.build
+@@ -46,7 +46,7 @@ tests = {
+   'test-keyval': [testqapi],
+   'test-logging': [],
+   'test-uuid': [],
+-  'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'],
++  'ptimer-test': ['ptimer-test-stubs.c', '../../hw/core/ptimer.c'],
+   'test-qapi-util': [],
+   'test-interval-tree': [],
+   'test-xs-node': [qom],
+@@ -136,7 +136,7 @@ if have_system
+     'test-util-sockets': ['socket-helpers.c'],
+     'test-base64': [],
+     'test-bufferiszero': [],
+-    'test-smp-parse': [qom, meson.project_source_root() / 'hw/core/machine-smp.c'],
++    'test-smp-parse': [qom, '../../hw/core/machine-smp.c'],
+     'test-vmstate': [migration, io],
+     'test-yank': ['socket-helpers.c', qom, io, chardev]
+   }
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
new file mode 100644
index 00000000..4de6cc24
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
@@ -0,0 +1,46 @@
+From ebf4bb2f51da83af0c61480414cfa156f7308b34 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 21 Mar 2022 10:09:38 -0700
+Subject: [PATCH 09/12] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
+ systems
+
+linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures
+which include asm-generic/mman.h and mips/powerpc are not including this
+file in linux/mman.h, therefore these should be defined for such
+architectures on Linux as well. This fixes build on mips/musl/linux
+
+Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg05298.html]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Zhang Yi <yi.z.zhang@linux.intel.com>
+Cc: Michael S. Tsirkin <mst@redhat.com>
+
+---
+ util/mmap-alloc.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+Index: qemu-8.0.0/util/mmap-alloc.c
+===================================================================
+--- qemu-8.0.0.orig/util/mmap-alloc.c
++++ qemu-8.0.0/util/mmap-alloc.c
+@@ -10,14 +10,18 @@
+  * later.  See the COPYING file in the top-level directory.
+  */
+ 
++#include "qemu/osdep.h"
+ #ifdef CONFIG_LINUX
+ #include <linux/mman.h>
+-#else  /* !CONFIG_LINUX */
++#endif  /* CONFIG_LINUX */
++
++#ifndef MAP_SYNC
+ #define MAP_SYNC              0x0
++#endif /* MAP_SYNC */
++#ifndef MAP_SHARED_VALIDATE
+ #define MAP_SHARED_VALIDATE   0x0
+-#endif /* CONFIG_LINUX */
++#endif /* MAP_SHARED_VALIDATE */
+ 
+-#include "qemu/osdep.h"
+ #include "qemu/mmap-alloc.h"
+ #include "qemu/host-utils.h"
+ #include "qemu/cutils.h"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch
new file mode 100644
index 00000000..6caf35b6
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch
@@ -0,0 +1,40 @@
+CVE: CVE-2022-1050
+Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20220403095234.2210-1-yuval.shaia.ml@gmail.com/]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From dbdef95c272e8f3ec037c3db4197c66002e30995 Mon Sep 17 00:00:00 2001
+From: Yuval Shaia <yuval.shaia.ml@gmail.com>
+Date: Sun, 3 Apr 2022 12:52:34 +0300
+Subject: [PATCH] hw/pvrdma: Protect against buggy or malicious guest driver
+
+Guest driver might execute HW commands when shared buffers are not yet
+allocated.
+This could happen on purpose (malicious guest) or because of some other
+guest/host address mapping error.
+We need to protect againts such case.
+
+Fixes: CVE-2022-1050
+
+Reported-by: Raven <wxhusst@gmail.com>
+Signed-off-by: Yuval Shaia <yuval.shaia.ml@gmail.com>
+---
+ hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: qemu-8.0.0/hw/rdma/vmw/pvrdma_cmd.c
+===================================================================
+--- qemu-8.0.0.orig/hw/rdma/vmw/pvrdma_cmd.c
++++ qemu-8.0.0/hw/rdma/vmw/pvrdma_cmd.c
+@@ -782,6 +782,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev)
+             goto out;
+     }
+ 
++    if (!dsr_info->dsr) {
++            /* Buggy or malicious guest driver */
++            rdma_error_report("Exec command without dsr, req or rsp buffers");
++            goto out;
++    }
++
+     if (dsr_info->req->hdr.cmd >= sizeof(cmd_handlers) /
+                       sizeof(struct cmd_handler)) {
+         rdma_error_report("Unsupported command");
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/cross.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/cross.patch
new file mode 100644
index 00000000..112eb925
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/cross.patch
@@ -0,0 +1,38 @@
+From 76c3fc4c87231bed32974ebbbdb5079cff45a6b7 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Tue, 5 Jan 2021 23:00:14 +0000
+Subject: [PATCH 12/12] qemu: Upgrade 5.1.0->5.2.0
+
+We need to be able to trigger configure's cross code but we don't want
+to set cross_prefix as it does other things we don't want. Patch things
+so we can do what we need in the target config case.
+
+Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+---
+ configure | 4 ----
+ 1 file changed, 4 deletions(-)
+
+Index: qemu-8.0.0/configure
+===================================================================
+--- qemu-8.0.0.orig/configure
++++ qemu-8.0.0/configure
+@@ -2590,7 +2590,6 @@ if test "$skip_meson" = no; then
+   echo "widl = [$(meson_quote $widl)]" >> $cross
+   echo "windres = [$(meson_quote $windres)]" >> $cross
+   echo "windmc = [$(meson_quote $windmc)]" >> $cross
+-  if test "$cross_compile" = "yes"; then
+     cross_arg="--cross-file config-meson.cross"
+     echo "[host_machine]" >> $cross
+     echo "system = '$targetos'" >> $cross
+@@ -2608,9 +2607,6 @@ if test "$skip_meson" = no; then
+     else
+         echo "endian = 'little'" >> $cross
+     fi
+-  else
+-    cross_arg="--native-file config-meson.cross"
+-  fi
+   mv $cross config-meson.cross
+ 
+   rm -rf meson-private meson-info meson-logs
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixedmeson.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixedmeson.patch
new file mode 100644
index 00000000..0cbaea07
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixedmeson.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
+
+Index: qemu-8.1.0/configure
+===================================================================
+--- qemu-8.1.0.orig/configure
++++ qemu-8.1.0/configure
+@@ -1032,12 +1032,7 @@ then
+     exit 1
+ fi
+ 
+-# At this point, we expect Meson to be installed and available.
+-# We expect mkvenv or pip to have created pyvenv/bin/meson for us.
+-# We ignore PATH completely here: we want to use the venv's Meson
+-# *exclusively*.
+-
+-meson="$(cd pyvenv/bin; pwd)/meson"
++meson=`which meson`
+ 
+ # Conditionally ensure Sphinx is installed.
+ 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixmips.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixmips.patch
new file mode 100644
index 00000000..01546d10
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixmips.patch
@@ -0,0 +1,18 @@
+Patch to fix mips boot hangs where virtio appears broken. Patch under discussion upstream. 
+Regression is introduced by other fixes to 8.1.0 to get x86 boots working.
+
+Upstream-Status: Pending [https://lore.kernel.org/qemu-devel/6c956b90-5a13-db96-9c02-9834a512fe6f@linaro.org/]
+
+Index: qemu-8.1.0/softmmu/physmem.c
+===================================================================
+--- qemu-8.1.0.orig/softmmu/physmem.c
++++ qemu-8.1.0/softmmu/physmem.c
+@@ -2517,7 +2517,7 @@ static void tcg_commit(MemoryListener *l
+      * That said, the listener is also called during realize, before
+      * all of the tcg machinery for run-on is initialized: thus halt_cond.
+      */
+-    if (cpu->halt_cond) {
++    if (cpu->halt_cond && !qemu_cpu_is_self(cpu)) {
+         async_run_on_cpu(cpu, tcg_commit_cpu, RUN_ON_CPU_HOST_PTR(cpuas));
+     } else {
+         tcg_commit_cpu(cpu, RUN_ON_CPU_HOST_PTR(cpuas));
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/no-pip.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/no-pip.patch
new file mode 100644
index 00000000..09e13e8b
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/no-pip.patch
@@ -0,0 +1,45 @@
+qemu: Ensure pip and the python venv aren't used for meson
+
+Qemu wants to use a supported python version and a specific meson version
+to "help" users and uses pip and creates a venv to do this. This is a nightmare
+for us. Our versions stay up to date and should be supported so we don't
+really need/want this wrapping. Tweak things to disable it.
+
+There was breakage from the wrapper shown by:
+
+bitbake qemu-system-native
+<add DISTRO_FEATURES:remove = "opengl" to local.conf>
+bitbake qemu-system-native -c configure
+
+which would crash. The issue is the change in configuration removes pieces
+from the sysroot but pyc files remainm as do pieces of pip which causes
+problems.
+
+Ideally we'd convince upstream to allow some way to disable the venv on
+the understanding that if/when it breaks, we keep the pieces. The patch
+as it stands is a workaround.
+
+Upstream-Status: Inappropriate [oe specific]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: qemu-8.1.2/configure
+===================================================================
+--- qemu-8.1.2.orig/configure
++++ qemu-8.1.2/configure
+@@ -1009,7 +1009,7 @@ python="$(command -v "$python")"
+ echo "python determined to be '$python'"
+ echo "python version: $($python --version)"
+ 
+-python="$($python -B "${source_path}/python/scripts/mkvenv.py" create pyvenv)"
++python=python3
+ if test "$?" -ne 0 ; then
+     error_exit "python venv creation failed"
+ fi
+@@ -1017,6 +1017,7 @@ fi
+ # Suppress writing compiled files
+ python="$python -B"
+ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
++mkvenv=true
+ 
+ mkvenv_flags=""
+ if test "$download" = "enabled" ; then
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/powerpc_rom.bin b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/powerpc_rom.bin
new file mode 100644
index 00000000..c4044296
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/powerpc_rom.bin
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.init b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.init
new file mode 100644
index 00000000..5ebaadde
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.init
@@ -0,0 +1,75 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Initially written by: Michael Tokarev <mjt@tls.msk.ru>
+# For QEMU Debian downstream package
+
+set -e
+
+. /etc/init.d/functions
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="QEMU Guest Agent"
+NAME=qemu-ga
+DAEMON=@bindir@/$NAME
+PIDFILE=/var/run/$NAME.pid
+
+# config
+DAEMON_ARGS=""
+# default transport
+TRANSPORT=virtio-serial:/dev/virtio-ports/org.qemu.guest_agent.0
+NO_START=0
+
+test ! -r /etc/default/qemu-guest-agent || . /etc/default/qemu-guest-agent
+test "$NO_START" = "0" || exit 0
+test -x "$DAEMON" || exit 0
+
+#
+# Function that checks whenever system has necessary environment
+# It also splits $TRANSPORT into $method and $path
+#
+do_check_transport() {
+        method=${TRANSPORT%%:*};
+        path=${TRANSPORT#*:}
+        case "$method" in
+            virtio-serial | isa-serial)
+                if [ ! -e "$path" ]; then
+                    echo "$NAME: transport endpoint not found, not starting"
+                    return 1
+                fi
+                ;;
+        esac
+}
+
+case "$1" in
+  start)
+        do_check_transport || exit 0
+        echo -n "Starting $DESC: "
+        start-stop-daemon -S -p $PIDFILE -x "$DAEMON" -- \
+                $DAEMON_ARGS -d -m "$method" -p "$path"
+        echo "$NAME."
+        ;;
+  stop)
+        echo -n "Stopping $DESC: "
+        start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
+        echo "$NAME."
+        ;;
+  status)
+        status "$DAEMON"
+        exit $?
+        ;;
+  restart|force-reload)
+        do_check_transport || exit 0
+        echo -n "Restarting $DESC: "
+        start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
+        sleep 1
+        start-stop-daemon -S -p $PIDFILE -x "$DAEMON" -- \
+                $DAEMON_ARGS -d -m "$method" -p "$path"
+        echo "$NAME."
+        ;;
+  *)
+        N=/etc/init.d/$NAME
+        echo "Usage: $N {start|stop|status|restart|force-reload}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.udev b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.udev
new file mode 100644
index 00000000..47097057
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.udev
@@ -0,0 +1,2 @@
+SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/run-ptest b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/run-ptest
new file mode 100644
index 00000000..f9a4e8fb
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/run-ptest
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+#This script is used to run qemu test suites
+#
+
+ptestdir=$(dirname "$(readlink -f "$0")")
+export SRC_PATH=$ptestdir
+
+cd $ptestdir/tests
+tests=$(find . -name "test-*" ! -name "*.p")
+for f in $tests; do
+    $f  | sed '/^ok/ s/ok/PASS:/g'
+done
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2024.1.bb
new file mode 100644
index 00000000..c4fc180e
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2024.1.bb
@@ -0,0 +1,6 @@
+
+require qemu-devicetrees.inc
+
+BRANCH ?= "master"
+SRCREV ?= "c54a1cfb7076aaf8abdfe50e89245b37cdb1c077"
+
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-native-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-native-8.1.inc
new file mode 100644
index 00000000..22fa9685
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-native-8.1.inc
@@ -0,0 +1,7 @@
+require qemu-8.1.inc
+
+inherit native
+
+EXTRA_OEMAKE:append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'"
+
+LDFLAGS:append = " -fuse-ld=bfd"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-targets-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-targets-8.1.inc
new file mode 100644
index 00000000..24f9a039
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-targets-8.1.inc
@@ -0,0 +1,28 @@
+# possible arch values are:
+#    aarch64 arm armeb alpha cris i386 x86_64 m68k microblaze
+#    mips mipsel mips64 mips64el ppc ppc64 ppc64abi32 ppcemb
+#    riscv32 riscv64 sparc sparc32 sparc32plus
+
+def get_qemu_target_list(d):
+    import bb
+    archs = d.getVar('QEMU_TARGETS').split()
+    tos = d.getVar('HOST_OS')
+    softmmuonly = ""
+    for arch in ['ppcemb', 'lm32']:
+        if arch in archs:
+            softmmuonly += arch + "-softmmu,"
+            archs.remove(arch)
+    linuxuseronly = ""
+    for arch in ['armeb', 'alpha', 'ppc64abi32', 'ppc64le', 'sparc32plus', 'aarch64_be']:
+        if arch in archs:
+            linuxuseronly += arch + "-linux-user,"
+            archs.remove(arch)
+    if 'linux' not in tos:
+        return softmmuonly + ''.join([arch + "-softmmu" + "," for arch in archs]).rstrip(',')
+    return softmmuonly + linuxuseronly + ''.join([arch + "-linux-user" + "," + arch + "-softmmu" + "," for arch in archs]).rstrip(',')
+
+def get_qemu_usermode_target_list(d):
+    return ",".join(filter(lambda i: "-linux-user" in i, get_qemu_target_list(d).split(',')))
+
+def get_qemu_system_target_list(d):
+    return ",".join(filter(lambda i: "-linux-user" not in i, get_qemu_target_list(d).split(',')))
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc
new file mode 100644
index 00000000..ffaf3cdf
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc
@@ -0,0 +1,3 @@
+XILINX_QEMU_VERSION = "v8.1.0"
+BRANCH = "master"
+SRCREV = "aa05b83770c0cd5a4f7fcbcef7efc806ae2abe9f"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
new file mode 100644
index 00000000..ad2af244
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
@@ -0,0 +1,79 @@
+SUMMARY = "Xilinx's fork of a fast open source processor emulator"
+HOMEPAGE = "https://github.com/xilinx/qemu/"
+
+# This qemu fork is NOT compatible with running on a 32-bit system
+# See: https://github.com/Xilinx/qemu/issues/35
+COMPATIBLE_HOST:arm = "null"
+
+# x86_64 is needed to build nativesdks
+QEMU_TARGETS = "aarch64 arm microblaze microblazeel riscv32 x86_64"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+                    file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-8.1.0:"
+
+PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG};name=qemu"
+SRCREV_qemu = "${SRCREV}"
+SRCREV_FORMAT = "qemu"
+
+FILESEXTRAPATHS:append := ":${THISDIR}/qemu-8.1"
+
+# Deal with the broken --disable-download
+SRCREV_berkeley-softfloat-3 = "b64af41c3276f97f0e181920400ee056b9c88037"
+SRCREV_berkeley-testfloat-3 = "40619cbb3bf32872df8c53cc457039229428a263"
+SRCREV_dtc = "b6910bec11614980a21e46fbccc35934b671bd81"
+SRCREV_keycodemapdb = "f5772a62ec52591ff6870b7e8ef32482371f22c6"
+SRCREV_libvfio-user = "0b28d205572c80b568a1003db2c8f37ca333e4d7"
+SRCREV_slirp = "26be815b86e8d49add8c9a8b320239b9594ff03d"
+SRC_URI += "\
+           git://gitlab.com/qemu-project/berkeley-softfloat-3;protocol=https;nobranch=1;destsuffix=git/subprojects/berkeley-softfloat-3;name=berkeley-softfloat-3 \
+           git://gitlab.com/qemu-project/berkeley-testfloat-3;protocol=https;nobranch=1;destsuffix=git/subprojects/berkeley-testfloat-3;name=berkeley-testfloat-3 \
+           git://gitlab.com/qemu-project/dtc.git;protocol=https;nobranch=1;destsuffix=git/subprojects/dtc;name=dtc \
+           git://gitlab.com/qemu-project/keycodemapdb.git;protocol=https;nobranch=1;destsuffix=git/subprojects/keycodemapdb;name=keycodemapdb \
+           git://gitlab.com/qemu-project/libvfio-user.git;protocol=https;nobranch=1;destsuffix=git/subprojects/libvfio-user;name=libvfio-user \
+           git://gitlab.freedesktop.org/slirp/libslirp;protocol=https;nobranch=1;destsuffix=git/subprojects/slirp;name=slirp \
+"
+
+# Configure meson for disable-download
+do_configure:prepend() {
+        cp ${S}/subprojects/packagefiles/berkeley-softfloat-3/* ${S}/subprojects/berkeley-softfloat-3/.
+        cp ${S}/subprojects/packagefiles/berkeley-testfloat-3/* ${S}/subprojects/berkeley-testfloat-3/.
+}
+
+
+# Keep this in sync with the main YP QEMU integration
+SRC_URI += "\
+           file://powerpc_rom.bin \
+           file://run-ptest \
+           file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \
+           file://0003-apic-fixup-fallthrough-to-PIC.patch \
+           file://0004-configure-Add-pkg-config-handling-for-libgcrypt.patch \
+           file://0005-qemu-Do-not-include-file-if-not-exists.patch \
+           file://0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \
+           file://0007-qemu-Determinism-fixes.patch \
+           file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \
+           file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \
+           file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \
+           file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \
+           file://fixedmeson.patch \
+           file://no-pip.patch \
+           file://qemu-guest-agent.init \
+           file://qemu-guest-agent.udev \
+           "
+
+# Patch doesn't apply to 8.1.0
+#           file://fixmips.patch 
+
+S = "${WORKDIR}/git"
+
+# Based on qemu settings in poky/meta/conf/distro/include/no-static-libs.inc
+DISABLE_STATIC:pn-qemu-xilinx = ""
+DISABLE_STATIC:pn-qemu-xilinx-native = ""
+DISABLE_STATIC:pn-nativesdk-qemu-xilinx = ""
+DISABLE_STATIC:pn-qemu-xilinx-system-native = ""
+
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-8.1.inc
new file mode 100644
index 00000000..ad00453f
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-8.1.inc
@@ -0,0 +1,2 @@
+require qemu-native-8.1.inc
+require qemu-xilinx-8.1.inc
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb
new file mode 100644
index 00000000..5ffdeb98
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb
@@ -0,0 +1,11 @@
+BPN = "qemu-xilinx"
+
+DEPENDS += "glib-2.0-native zlib-native"
+
+require qemu-xilinx-2024.1.inc
+require qemu-xilinx-native-8.1.inc
+require qemu-native-alt.inc
+
+EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-install-blobs --disable-guest-agent"
+
+PACKAGECONFIG ??= "pie"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb
new file mode 100644
index 00000000..7e985088
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb
@@ -0,0 +1,35 @@
+BPN = "qemu-xilinx"
+
+require qemu-system-native-alt.inc
+require qemu-xilinx-2024.1.inc
+require qemu-xilinx-native-8.1.inc
+
+# As some of the files installed by qemu-native and qemu-system-native
+# are the same, we depend on qemu-native to get the full installation set
+# and avoid file clashes
+DEPENDS += "glib-2.0-native zlib-native pixman-native qemu-native"
+
+DEPENDS += "qemu-xilinx-multiarch-helper-native"
+
+EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
+
+PACKAGECONFIG ??= "fdt alsa kvm pie slirp png gcrypt \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+"
+
+# Handle distros such as CentOS 5 32-bit that do not have kvm support
+PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
+
+do_install:append() {
+    install -Dm 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu-xilinx
+
+    # The following is also installed by qemu-native
+    rm -f ${D}${datadir}/qemu-xilinx/trace-events-all
+    rm -rf ${D}${datadir}/qemu-xilinx/keymaps
+    rm -rf ${D}${datadir}/icons/
+    rm -rf ${D}${includedir}/qemu-plugin.h
+
+    # Install qmp.py to be used with testimage
+    install -d ${D}${libdir}/qemu-python/qmp/
+    install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/
+}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb
new file mode 100644
index 00000000..cff60bd6
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb
@@ -0,0 +1,38 @@
+BBCLASSEXTEND = "nativesdk"
+
+require qemu-xilinx-2024.1.inc
+require qemu-8.1.inc
+require qemu-xilinx-8.1.inc
+require qemu-alt.inc
+
+# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
+DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
+MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
+MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
+PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
+PACKAGE_ARCH:class-target = "${@bb.utils.contains_any('DEPENDS', 'libepoxy virglrenderer', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
+
+
+DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native"
+
+DEPENDS:append:libc-musl = " libucontext"
+
+CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}"
+
+RDEPENDS:${PN}-common:class-target += "bash"
+
+EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
+EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
+EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
+
+PACKAGECONFIG ??= " \
+    fdt sdl kvm pie slirp gcrypt \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio xen', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \
+"
+PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie slirp gcrypt \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+"
+# ppc32 hosts are no longer supported in qemu
+COMPATIBLE_HOST:powerpc = "null"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu_8.1.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu_8.1.2.bb
new file mode 100644
index 00000000..4722e1f5
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu_8.1.2.bb
@@ -0,0 +1,29 @@
+BBCLASSEXTEND = "nativesdk"
+
+FILESEXTRAPATHS:append := ":${THISDIR}/qemu-8.1"
+
+require qemu-8.1.inc
+
+DEPENDS += "glib-2.0 zlib pixman"
+
+DEPENDS:append:libc-musl = " libucontext"
+
+CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}"
+
+RDEPENDS:${PN}-common:class-target += "bash"
+
+EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
+EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
+EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
+
+PACKAGECONFIG ??= " \
+    fdt sdl kvm pie slirp \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio xen', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \
+"
+PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie slirp \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+"
+# ppc32 hosts are no longer supported in qemu
+COMPATIBLE_HOST:powerpc = "null"
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch b/meta-xilinx-core/recipes-graphics/drm/files/0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch
new file mode 100644
index 00000000..5f7df974
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch
@@ -0,0 +1,37 @@
+From 7edb14622061e87bb4810fb648017b43e767d4c6 Mon Sep 17 00:00:00 2001
+From: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
+Date: Mon, 1 Nov 2021 12:59:36 -0700
+Subject: [PATCH 1/5] [PATCH] libdrm: Update drm header file with XV15 and XV20
+
+This patch updates drm header file with YUV 420 and
+YUV422 10 bit formats.
+
+Signed-off-by: Satish Kumar Nagireddy <satish.nagireddy.nagireddy@xilinx.com>
+Upstream-Status: Pending
+Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
+---
+ include/drm/drm_fourcc.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
+index ed0258c..c5cdaed 100644
+--- a/include/drm/drm_fourcc.h
++++ b/include/drm/drm_fourcc.h
+@@ -318,6 +318,14 @@ extern "C" {
+ #define DRM_FORMAT_Q401                fourcc_code('Q', '4', '0', '1')
+ 
+ /*
++ * 2 plane 10 bit per component YCbCr
++ * index 0 = Y plane, [31:0] x:Y2:Y1:Y0 2:10:10:10 little endian
++ * index 1 = Cb:Cr plane, [63:0] x:Cb2:Cr2:Cb1:x:Cr1:Cb0:Cr0 2:10:10:10:2:10:10:10 little endian
++ */
++#define DRM_FORMAT_XV15                fourcc_code('X', 'V', '1', '5') /* 2x2 subsampled Cb:Cr plane 2:10:10:10 */
++#define DRM_FORMAT_XV20                fourcc_code('X', 'V', '2', '0') /* 2x1 subsampled Cb:Cr plane 2:10:10:10 */
++
++/*
+  * 3 plane YCbCr
+  * index 0: Y plane, [7:0] Y
+  * index 1: Cb plane, [7:0] Cb
+-- 
+2.7.4
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0001-headers-Sync-with-HDR-from-v5.15.patch b/meta-xilinx-core/recipes-graphics/drm/files/0001-headers-Sync-with-HDR-from-v5.15.patch
new file mode 100644
index 00000000..77a457ce
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0001-headers-Sync-with-HDR-from-v5.15.patch
@@ -0,0 +1,207 @@
+From d159e3f782d33988e52db462948e2e0eab2b9a03 Mon Sep 17 00:00:00 2001
+From: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Date: Thu, 17 Mar 2022 08:21:41 -0700
+Subject: [PATCH] headers: Sync with HDR from v5.15
+
+Sync drm_mode.h with linux-xlnx/include/uapi/drm/drm_mode.h for HDR
+
+Upstream-Status: Pending
+
+Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com>
+---
+ include/drm/drm_mode.h | 129 +++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 125 insertions(+), 4 deletions(-)
+
+diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
+index 9b6722d..bbce882 100644
+--- a/include/drm/drm_mode.h
++++ b/include/drm/drm_mode.h
+@@ -312,16 +312,48 @@ struct drm_mode_set_plane {
+        __u32 src_w;
+ };
+ 
++/**
++ * struct drm_mode_get_plane - Get plane metadata.
++ *
++ * Userspace can perform a GETPLANE ioctl to retrieve information about a
++ * plane.
++ *
++ * To retrieve the number of formats supported, set @count_format_types to zero
++ * and call the ioctl. @count_format_types will be updated with the value.
++ *
++ * To retrieve these formats, allocate an array with the memory needed to store
++ * @count_format_types formats. Point @format_type_ptr to this array and call
++ * the ioctl again (with @count_format_types still set to the value returned in
++ * the first ioctl call).
++ */
+ struct drm_mode_get_plane {
++       /**
++        * @plane_id: Object ID of the plane whose information should be
++        * retrieved. Set by caller.
++        */
+        __u32 plane_id;
+ 
++       /** @crtc_id: Object ID of the current CRTC. */
+        __u32 crtc_id;
++       /** @fb_id: Object ID of the current fb. */
+        __u32 fb_id;
+ 
++       /**
++        * @possible_crtcs: Bitmask of CRTC's compatible with the plane. CRTC's
++        * are created and they receive an index, which corresponds to their
++        * position in the bitmask. Bit N corresponds to
++        * :ref:`CRTC index<crtc_index>` N.
++        */
+        __u32 possible_crtcs;
++       /** @gamma_size: Never used. */
+        __u32 gamma_size;
+ 
++       /** @count_format_types: Number of formats. */
+        __u32 count_format_types;
++       /**
++        * @format_type_ptr: Pointer to ``__u32`` array of formats that are
++        * supported by the plane. These formats do not require modifiers.
++        */
+        __u64 format_type_ptr;
+ };
+ 
+@@ -509,22 +541,74 @@ struct drm_mode_get_connector {
+  */
+ #define DRM_MODE_PROP_ATOMIC        0x80000000
+ 
++/**
++ * struct drm_mode_property_enum - Description for an enum/bitfield entry.
++ * @value: numeric value for this enum entry.
++ * @name: symbolic name for this enum entry.
++ *
++ * See struct drm_property_enum for details.
++ */
+ struct drm_mode_property_enum {
+        __u64 value;
+        char name[DRM_PROP_NAME_LEN];
+ };
+ 
++/**
++ * struct drm_mode_get_property - Get property metadata.
++ *
++ * User-space can perform a GETPROPERTY ioctl to retrieve information about a
++ * property. The same property may be attached to multiple objects, see
++ * "Modeset Base Object Abstraction".
++ *
++ * The meaning of the @values_ptr field changes depending on the property type.
++ * See &drm_property.flags for more details.
++ *
++ * The @enum_blob_ptr and @count_enum_blobs fields are only meaningful when the
++ * property has the type &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK. For
++ * backwards compatibility, the kernel will always set @count_enum_blobs to
++ * zero when the property has the type &DRM_MODE_PROP_BLOB. User-space must
++ * ignore these two fields if the property has a different type.
++ *
++ * User-space is expected to retrieve values and enums by performing this ioctl
++ * at least twice: the first time to retrieve the number of elements, the
++ * second time to retrieve the elements themselves.
++ *
++ * To retrieve the number of elements, set @count_values and @count_enum_blobs
++ * to zero, then call the ioctl. @count_values will be updated with the number
++ * of elements. If the property has the type &DRM_MODE_PROP_ENUM or
++ * &DRM_MODE_PROP_BITMASK, @count_enum_blobs will be updated as well.
++ *
++ * To retrieve the elements themselves, allocate an array for @values_ptr and
++ * set @count_values to its capacity. If the property has the type
++ * &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK, allocate an array for
++ * @enum_blob_ptr and set @count_enum_blobs to its capacity. Calling the ioctl
++ * again will fill the arrays.
++ */
+ struct drm_mode_get_property {
+-       __u64 values_ptr; /* values and blob lengths */
+-       __u64 enum_blob_ptr; /* enum and blob id ptrs */
++       /** @values_ptr: Pointer to a ``__u64`` array. */
++       __u64 values_ptr;
++       /** @enum_blob_ptr: Pointer to a struct drm_mode_property_enum array. */
++       __u64 enum_blob_ptr;
+ 
++       /**
++        * @prop_id: Object ID of the property which should be retrieved. Set
++        * by the caller.
++        */
+        __u32 prop_id;
++       /**
++        * @flags: ``DRM_MODE_PROP_*`` bitfield. See &drm_property.flags for
++        * a definition of the flags.
++        */
+        __u32 flags;
++       /**
++        * @name: Symbolic property name. User-space should use this field to
++        * recognize properties.
++        */
+        char name[DRM_PROP_NAME_LEN];
+ 
++       /** @count_values: Number of elements in @values_ptr. */
+        __u32 count_values;
+-       /* This is only used to count enum values, not blobs. The _blobs is
+-        * simply because of a historical reason, i.e. backwards compat. */
++       /** @count_enum_blobs: Number of elements in @enum_blob_ptr. */
+        __u32 count_enum_blobs;
+ };
+ 
+@@ -578,6 +662,8 @@ struct drm_mode_fb_cmd {
+ 
+ #define DRM_MODE_FB_INTERLACED (1<<0) /* for interlaced framebuffers */
+ #define DRM_MODE_FB_MODIFIERS  (1<<1) /* enables ->modifer[] */
++#define DRM_MODE_FB_ALTERNATE_TOP      (1<<2) /* for alternate top field */
++#define DRM_MODE_FB_ALTERNATE_BOTTOM   (1<<3) /* for alternate bottom field */
+ 
+ struct drm_mode_fb_cmd2 {
+        __u32 fb_id;
+@@ -733,6 +819,20 @@ struct drm_color_lut {
+        __u16 reserved;
+ };
+ 
++enum drm_hdr_type {
++       /*
++        * This is for the gen_hdr_output_metadata structure.
++        * MSB differentiates static (0) or dynamic (1) metadata.
++        * Other 15 bits represent specific HDR standards.
++        */
++
++       /* static HDR */
++       DRM_HDR_TYPE_HDR10     = 0x0000,
++
++       /* dynamic HDR */
++       DRM_HDR_TYPE_HDR10P    = 1 << 15 | DRM_HDR_TYPE_HDR10,
++};
++
+ /**
+  * struct hdr_metadata_infoframe - HDR Metadata Infoframe Data.
+  *
+@@ -819,6 +919,27 @@ struct hdr_output_metadata {
+        };
+ };
+ 
++/**
++ * struct gen_hdr_output_metadata - Generic HDR output metadata
++ *
++ * Generic HDR Metadata Information to be passed from userspace
++ */
++struct gen_hdr_output_metadata {
++       /**
++        * @metadata_type: HDR type.
++        */
++       __u16 metadata_type;
++       /**
++        * @size: size of payload/metadata.
++        */
++       __u16 size;
++       /**
++        * @payload: Actual metadata - HDR Metadata Infoframe.
++        * Currently the largest extended HDR infoframe is 4000 bytes.
++        */
++       __u8 payload[4000];
++};
++
+ #define DRM_MODE_PAGE_FLIP_EVENT 0x01
+ #define DRM_MODE_PAGE_FLIP_ASYNC 0x02
+ #define DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE 0x4
+-- 
+2.17.1
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch b/meta-xilinx-core/recipes-graphics/drm/files/0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch
new file mode 100644
index 00000000..c517221a
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch
@@ -0,0 +1,433 @@
+From de3fffbf7af9d28b5f9d9e118de448a54e2628dd Mon Sep 17 00:00:00 2001
+From: Anil Kumar Mamidala <anil.mamidala@xilinx.com>
+Date: Wed, 27 Oct 2021 16:04:47 +0530
+Subject: [PATCH] modetest: Add YUV444 and X403 format support for modetest
+
+Add YUV44 8-bit and X403 10-bit formats support to modetest
+for generating color bar pattern.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anil Kumar Mamidala <anil.mamidala@xilinx.com>
+---
+ include/drm/drm_fourcc.h |   7 +
+ tests/modetest/buffers.c |  32 +++++
+ tests/util/format.c      |   4 +
+ tests/util/pattern.c     | 270 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 313 insertions(+)
+
+Index: libdrm-2.4.118/include/drm/drm_fourcc.h
+===================================================================
+--- libdrm-2.4.118.orig/include/drm/drm_fourcc.h
++++ libdrm-2.4.118/include/drm/drm_fourcc.h
+@@ -405,6 +405,13 @@ extern "C" {
+ #define DRM_FORMAT_YUV444      fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */
+ #define DRM_FORMAT_YVU444      fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */
+ 
++/* 3 plane non-subsampled (444) YCbCr
++ * 10 bits per component
++ * index 0: Y plane, [31:0] x:Y2:Y1:Y0 [2:10:10:10] little endian
++ * index 1: Cb plane, [31:0] x:Cb2:Cb1:Cb0 [2:10:10:10] little endian
++ * index 2: Cr plane, [31:0] x:Cr2:Cr1:Cr0 [2:10:10:10] little endian
++ */
++#define DRM_FORMAT_X403                fourcc_code('X', '4', '0', '3') /* non-subsampled Cb:Cr plane, 10 bit per channel */
+ 
+ /*
+  * Format Modifiers:
+Index: libdrm-2.4.118/tests/modetest/buffers.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/modetest/buffers.c
++++ libdrm-2.4.118/tests/modetest/buffers.c
+@@ -145,6 +145,7 @@ bo_create(int fd, unsigned int format,
+        case DRM_FORMAT_NV42:
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
++       case DRM_FORMAT_YUV444:
+                bpp = 8;
+                break;
+ 
+@@ -156,6 +157,7 @@ bo_create(int fd, unsigned int format,
+ 
+        case DRM_FORMAT_XV15:
+        case DRM_FORMAT_XV20:
++       case DRM_FORMAT_X403:
+                bpp = 10;
+                break;
+ 
+@@ -242,6 +244,11 @@ bo_create(int fd, unsigned int format,
+                virtual_height = height * 2;
+                break;
+ 
++       case DRM_FORMAT_X403:
++               virtual_width = (width * 32) / 30;
++               virtual_height = height * 3;
++               break;
++
+        case DRM_FORMAT_NV16:
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV20:
+@@ -249,6 +256,11 @@ bo_create(int fd, unsigned int format,
+                virtual_height = height * 2;
+                break;
+ 
++       case DRM_FORMAT_YUV444:
++               virtual_width = width;
++               virtual_height = height * 3;
++               break;
++
+        case DRM_FORMAT_NV24:
+        case DRM_FORMAT_NV42:
+        case DRM_FORMAT_NV30:
+@@ -322,6 +334,24 @@ bo_create(int fd, unsigned int format,
+                planes[1] = virtual + offsets[1];
+                break;
+ 
++       case DRM_FORMAT_X403:
++       case DRM_FORMAT_YUV444:
++               offsets[0] = 0;
++               handles[0] = bo->handle;
++               pitches[0] = bo->pitch;
++               pitches[1] = pitches[0];
++               offsets[1] = pitches[0] * height;
++               handles[1] = bo->handle;
++               pitches[2] = pitches[1];
++               offsets[2] = offsets[1] + pitches[1] * height;
++               handles[2] = bo->handle;
++
++
++               planes[0] = virtual;
++               planes[1] = virtual + offsets[1];
++               planes[2] = virtual + offsets[2];
++               break;
++
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
+                offsets[0] = 0;
+Index: libdrm-2.4.118/tests/util/format.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/format.c
++++ libdrm-2.4.118/tests/util/format.c
+@@ -64,6 +64,10 @@ static const struct util_format_info for
+        /* YUV planar */
+        { DRM_FORMAT_YUV420, "YU12", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 1) },
+        { DRM_FORMAT_YVU420, "YV12", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 1) },
++       { DRM_FORMAT_YUV444, "YU24", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 1) },
++       { DRM_FORMAT_YVU444, "YV24", MAKE_YUV_INFO(YUV_YCrCb, 1, 1, 1) },
++       { DRM_FORMAT_X403, "X403", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 1) },
++
+        /* RGB16 */
+        { DRM_FORMAT_ARGB4444, "AR12", MAKE_RGB_INFO(4, 8, 4, 4, 4, 0, 4, 12) },
+        { DRM_FORMAT_XRGB4444, "XR12", MAKE_RGB_INFO(4, 8, 4, 4, 4, 0, 0, 0) },
+Index: libdrm-2.4.118/tests/util/pattern.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/pattern.c
++++ libdrm-2.4.118/tests/util/pattern.c
+@@ -596,6 +596,175 @@ static void fill_smpte_yuv_semiplanar_10
+        }
+ }
+ 
++static void fill_smpte_yuv_planar_x403(
++                               const struct util_yuv_info *yuv,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem,
++                               unsigned int width,
++                               unsigned int height, unsigned int stride)
++{
++       const struct color_yuv colors_top[] = {
++               MAKE_YUV_601(191, 192, 192),    /* grey */
++               MAKE_YUV_601(192, 192, 0),      /* yellow */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(0, 192, 0),        /* green */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(192, 0, 0),        /* red */
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++       };
++       const struct color_yuv colors_middle[] = {
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 192, 192),    /* grey */
++       };
++       const struct color_yuv colors_bottom[] = {
++               MAKE_YUV_601(0, 33, 76),        /* in-phase */
++               MAKE_YUV_601(255, 255, 255),    /* super white */
++               MAKE_YUV_601(50, 0, 106),       /* quadrature */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(9, 9, 9),          /* 3.5% */
++               MAKE_YUV_601(19, 19, 19),       /* 7.5% */
++               MAKE_YUV_601(29, 29, 29),       /* 11.5% */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++       };
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int xsub = yuv->xsub;
++       unsigned int ysub = yuv->ysub;
++       unsigned int x;
++       unsigned int y;
++       unsigned int cval = 0;
++
++       for (y = 0; y < height * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_top[x * 7 / width].y << 2 |
++                               colors_top[(x+1) * 7 / width].y << 12 |
++                               colors_top[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_middle[x * 7 / width].y << 2 |
++                               colors_middle[(x+1) * 7 / width].y << 12 |
++                               colors_middle[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[x * 4 / (width * 5 / 7)].y << 2 |
++                               colors_bottom[(x + 1) * 4 / (width * 5 / 7)]
++                               .y << 12 | colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].y << 22;
++
++               for (; x < width * 6 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 2 |
++                               colors_bottom[((x + 1) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 12 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 22;
++
++               for (; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] = colors_bottom[7].y << 2 |
++                               colors_bottom[7].y << 12 |
++                               colors_bottom[7].y << 22;
++               y_mem += stride;
++       }
++
++       /* Chroma */
++       unsigned int *cb_mem = (unsigned int *)u_mem;
++       unsigned int *cr_mem = (unsigned int *)v_mem;
++
++       for (y = 0; y < height / ysub * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 3) {
++                       cval = (colors_top[x * 7 / width].u << 2) |
++                               (colors_top[(x + 1) * 7 / width].u << 12) |
++                               (colors_top[(x + 2) * 7 / width].u << 22);
++                       cb_mem[x/3] = cval;
++                       cval = (colors_top[(x) * 7 / width].v << 2) |
++                               (colors_top[(x + 1) * 7 / width].v << 12) |
++                               (colors_top[(x + 2) * 7 / width].v << 22);
++                       cr_mem[x/3] = cval;
++               }
++               cb_mem += stride/4;
++               cr_mem += stride/4;
++       }
++
++       for (; y < height / ysub * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 3) {
++                       cval =  (colors_middle[x * 7 / width].u << 2) |
++                               (colors_middle[(x + 1) * 7 / width].u << 12) |
++                               (colors_middle[(x + 2) * 7 / width].u << 22);
++                       cb_mem[x/3] = cval;
++                       cval = (colors_middle[x * 7 / width].v << 2) |
++                               (colors_middle[(x + 1) * 7 / width].v << 12) |
++                               (colors_middle[(x + 2) * 7 / width].v << 22);
++                       cr_mem[x/3] = cval;
++               }
++               cb_mem += stride/4;
++               cr_mem += stride/4;
++       }
++
++       for (; y < height / ysub; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 3) {
++                       cval = colors_bottom[x * 4 /
++                               (width * 5 / 7)].u << 2 |
++                               colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].u << 12 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)]. u << 22;
++                       cb_mem[x/3] = cval;
++
++                       cval = colors_bottom[(x) * 4 /
++                               (width * 5 / 7)].v << 2 |
++                               colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].v << 12 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)].v << 22;
++
++                       cr_mem[x/3] = cval;
++               }
++               for (; x < width * 6 / 7; x += 3) {
++                       cval = colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 2 |
++                               colors_bottom[((x + 2)- width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 12 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 22;
++                       cb_mem[x/3] = cval;
++
++                       cval = colors_bottom[((x) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 2 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 12 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 22;
++                       cr_mem[x/3] = cval;
++               }
++               for (; x < width; x += 3) {
++                       cval = colors_bottom[7].u << 2 |
++                               colors_bottom[7].u << 12 |
++                               colors_bottom[7].u << 22;
++                       cb_mem[x/3] = cval;
++                       cval = colors_bottom[7].v << 2 |
++                               colors_bottom[7].v << 12 |
++                               colors_bottom[7].v << 22;
++                       cr_mem[x/3] = cval;
++               }
++               cb_mem += stride/4;
++               cr_mem += stride/4;
++       }
++}
++
+ static void fill_smpte_yuv_planar_10b(
+                                const struct util_yuv_info *yuv,
+                                unsigned char *y_mem, unsigned char *u_mem,
+@@ -856,6 +1025,88 @@ static void fill_tiles_xv20(
+        }
+ }
+ 
++static void fill_tiles_x403(
++                               const struct util_format_info *info,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, uint32_t width,
++                               uint32_t height, uint32_t stride)
++{
++       const struct util_yuv_info *yuv = &info->yuv;
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int x;
++       unsigned int y;
++       uint32_t shifter = 0, LumVal = 0;
++       uint32_t lumIndex = 0;
++       uint32_t *Lum;
++       uint32_t *uChrom;
++       uint32_t *vChrom;
++       uint32_t ChromVal = 0;
++       uint32_t uchromIndex = 0;
++       uint32_t vchromIndex = 0;
++
++       /* preparing 10 bit Luma */
++       Lum = (uint32_t *)y_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x++) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       //Checking if we got 3 components to pack in 4 bytes
++                       if (shifter == 30) {
++                               Lum[lumIndex] = LumVal;
++                               lumIndex++; shifter = 0; LumVal = 0;
++                       }
++                       LumVal  = (LumVal | ((color.y << 2) << shifter));
++                       shifter += 10; //10 bit precision
++               }
++               lumIndex = 0; shifter = 0; LumVal = 0;
++               y_mem += stride;
++               Lum = (uint32_t *)y_mem;
++       }
++
++       /* Preparing 10 bit Chroma */
++       uChrom = (uint32_t *)u_mem;
++       vChrom = (uint32_t *)v_mem;
++
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x = x + 3) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       uint32_t rgb32_2 = 0x00130502 * (d.quot >> 6)
++                                               + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color_2 =
++                                       MAKE_YUV_601((rgb32_2 >> 16) & 0xff,
++                                      (rgb32_2 >> 8) & 0xff, rgb32_2 & 0xff);
++                       uint32_t rgb32_3 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color_3 =
++                                       MAKE_YUV_601((rgb32_3 >> 16) & 0xff,
++                                       (rgb32_3 >> 8) & 0xff, rgb32_3 & 0xff);
++
++                       ChromVal = ((color.u << 2) << 20)
++                               | ((color_2.u << 2) << 10) | (color_3.u << 2);
++                       uChrom[uchromIndex++] = ChromVal;
++
++                       ChromVal = ((color.v << 2) << 20)
++                               | ((color_2.v << 2) << 10) | (color_3.v << 2);
++                       vChrom[vchromIndex++] = ChromVal;
++               }
++               uchromIndex = 0; vchromIndex = 0; ChromVal = 0;
++               u_mem += stride;
++               v_mem += stride;
++               uChrom = (uint32_t *)u_mem;
++               vChrom = (uint32_t *)v_mem;
++       }
++}
++
++
+ static void fill_smpte_yuv_packed(const struct util_yuv_info *yuv, void *mem,
+                                  unsigned int width, unsigned int height,
+                                  unsigned int stride)
+@@ -1660,10 +1911,19 @@ static void fill_smpte(const struct util
+                                                   planes[1], width, height,
+                                                   stride);
+ 
++       case DRM_FORMAT_X403:
++                       return fill_smpte_yuv_planar_x403(&info->yuv, planes[0], planes[1],
++                                            planes[2], width, height, stride);
++
++
+        case DRM_FORMAT_YUV420:
+                return fill_smpte_yuv_planar(&info->yuv, planes[0], planes[1],
+                                             planes[2], width, height, stride);
+ 
++       case DRM_FORMAT_YUV444:
++               return fill_smpte_yuv_planar(&info->yuv, planes[0], planes[1],
++                                            planes[2], width, height, stride);
++
+        case DRM_FORMAT_YVU420:
+                return fill_smpte_yuv_planar(&info->yuv, planes[0], planes[2],
+                                             planes[1], width, height, stride);
+@@ -2082,6 +2342,11 @@ static void fill_tiles(const struct util
+                return fill_tiles_yuv_planar(info, planes[0], planes[1],
+                                             planes[2], width, height, stride);
+ 
++       case DRM_FORMAT_YUV444:
++               return fill_tiles_yuv_planar(info, planes[0], planes[1],
++                                            planes[2], width, height, stride);
++
++
+        case DRM_FORMAT_YVU420:
+                return fill_tiles_yuv_planar(info, planes[0], planes[2],
+                                             planes[1], width, height, stride);
+@@ -2090,6 +2355,11 @@ static void fill_tiles(const struct util
+                return fill_tiles_xv20(info, planes[0], planes[1],
+                         planes[1], width, height, stride);
+ 
++       case DRM_FORMAT_X403:
++               return fill_tiles_x403(info, planes[0], planes[1],
++                        planes[2], width, height, stride);
++
++
+        case DRM_FORMAT_XV15:
+                return fill_tiles_xv15(info, planes[0], planes[1],
+                         planes[2], width, height, stride);
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0002-modetest-call-drmModeCrtcSetGamma-only-if-add_proper.patch b/meta-xilinx-core/recipes-graphics/drm/files/0002-modetest-call-drmModeCrtcSetGamma-only-if-add_proper.patch
new file mode 100644
index 00000000..9d2eff7d
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0002-modetest-call-drmModeCrtcSetGamma-only-if-add_proper.patch
@@ -0,0 +1,32 @@
+From ab7aa7563e3b044f84f123f0ed59b370ff0af3f5 Mon Sep 17 00:00:00 2001
+From: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Date: Mon, 24 Feb 2020 03:35:58 -0800
+Subject: [PATCH 2/5] modetest: call drmModeCrtcSetGamma() only if
+ add_property_optional returns true
+
+gamma is a optional property then also it prints error message, so
+set gamma only if add_property_optional() returns true.
+
+Upstream-Status: Pending
+
+Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com>
+---
+ tests/modetest/modetest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
+index 2c83bd0..3e73505 100644
+--- a/tests/modetest/modetest.c
++++ b/tests/modetest/modetest.c
+@@ -1142,7 +1142,7 @@ static void set_gamma(struct device *dev, unsigned crtc_id, unsigned fourcc)
+ 
+        add_property_optional(dev, crtc_id, "DEGAMMA_LUT", 0);
+        add_property_optional(dev, crtc_id, "CTM", 0);
+-       if (!add_property_optional(dev, crtc_id, "GAMMA_LUT", blob_id)) {
++       if (add_property_optional(dev, crtc_id, "GAMMA_LUT", blob_id)) {
+                uint16_t r[256], g[256], b[256];
+ 
+                for (i = 0; i < 256; i++) {
+-- 
+2.7.4
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch b/meta-xilinx-core/recipes-graphics/drm/files/0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch
new file mode 100644
index 00000000..6fd5faab
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch
@@ -0,0 +1,602 @@
+From adc82a4820253ed3f42bf3af9003aa33636e6f89 Mon Sep 17 00:00:00 2001
+From: Anil Kumar M <amamidal@xilinx.com>
+Date: Fri, 10 Apr 2020 21:35:47 +0530
+Subject: [PATCH 3/5] modetest: Add semiplanar 10bit pattern support for
+ modetest
+
+Add XV15 and XV20 10 bit semiplanar formats support for
+generating color bar pattern while running modetest command.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anil Kumar M <amamidal@xilinx.com>
+---
+ tests/modetest/buffers.c |  24 ++-
+ tests/util/format.c      |   3 +
+ tests/util/pattern.c     | 455 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 3 files changed, 473 insertions(+), 9 deletions(-)
+
+Index: libdrm-2.4.118/tests/modetest/buffers.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/modetest/buffers.c
++++ libdrm-2.4.118/tests/modetest/buffers.c
+@@ -116,7 +116,7 @@ bo_create(int fd, unsigned int format,
+          unsigned int handles[4], unsigned int pitches[4],
+          unsigned int offsets[4], enum util_fill_pattern pattern)
+ {
+-       unsigned int virtual_height;
++       unsigned int virtual_height, virtual_width;
+        struct bo *bo;
+        unsigned int bpp;
+        void *planes[3] = { 0, };
+@@ -154,6 +154,11 @@ bo_create(int fd, unsigned int format,
+                bpp = 10;
+                break;
+ 
++       case DRM_FORMAT_XV15:
++       case DRM_FORMAT_XV20:
++               bpp = 10;
++               break;
++
+        case DRM_FORMAT_ARGB4444:
+        case DRM_FORMAT_XRGB4444:
+        case DRM_FORMAT_ABGR4444:
+@@ -223,27 +228,41 @@ bo_create(int fd, unsigned int format,
+        case DRM_FORMAT_NV15:
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
++               virtual_width = width;
+                virtual_height = height * 3 / 2;
+                break;
+ 
++       case DRM_FORMAT_XV15:
++               virtual_width = (width * 32) / 30;
++               virtual_height = height * 3 / 2;
++               break;
++
++       case DRM_FORMAT_XV20:
++               virtual_width = (width * 32) / 30;
++               virtual_height = height * 2;
++               break;
++
+        case DRM_FORMAT_NV16:
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV20:
++               virtual_width = width;
+                virtual_height = height * 2;
+                break;
+ 
+        case DRM_FORMAT_NV24:
+        case DRM_FORMAT_NV42:
+        case DRM_FORMAT_NV30:
++               virtual_width = width;
+                virtual_height = height * 3;
+                break;
+ 
+        default:
++               virtual_width = width;
+                virtual_height = height;
+                break;
+        }
+ 
+-       bo = bo_create_dumb(fd, width, virtual_height, bpp);
++       bo = bo_create_dumb(fd, virtual_width, virtual_height, bpp);
+        if (!bo)
+                return NULL;
+ 
+@@ -276,6 +295,8 @@ bo_create(int fd, unsigned int format,
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV15:
+        case DRM_FORMAT_NV20:
++       case DRM_FORMAT_XV15:
++       case DRM_FORMAT_XV20:
+                offsets[0] = 0;
+                handles[0] = bo->handle;
+                pitches[0] = bo->pitch;
+Index: libdrm-2.4.118/tests/util/pattern.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/pattern.c
++++ libdrm-2.4.118/tests/util/pattern.c
+@@ -430,6 +430,432 @@ static void fill_smpte_yuv_planar_10bpp(
+        }
+ }
+ 
++static void fill_smpte_yuv_semiplanar_10b(
++                               const struct util_yuv_info *yuv,
++                               unsigned char *y_mem, unsigned char *uv_mem,
++                               unsigned int width,
++                               unsigned int height, unsigned int stride)
++{
++       const struct color_yuv colors_top[] = {
++               MAKE_YUV_601(191, 192, 192),    /* grey */
++               MAKE_YUV_601(192, 192, 0),      /* yellow */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(0, 192, 0),        /* green */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(192, 0, 0),        /* red */
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++       };
++       const struct color_yuv colors_middle[] = {
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 192, 192),    /* grey */
++       };
++       const struct color_yuv colors_bottom[] = {
++               MAKE_YUV_601(0, 33, 76),        /* in-phase */
++               MAKE_YUV_601(255, 255, 255),    /* super white */
++               MAKE_YUV_601(50, 0, 106),       /* quadrature */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(9, 9, 9),          /* 3.5% */
++               MAKE_YUV_601(19, 19, 19),       /* 7.5% */
++               MAKE_YUV_601(29, 29, 29),       /* 11.5% */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++       };
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int xsub = yuv->xsub;
++       unsigned int ysub = yuv->ysub;
++       unsigned int x;
++       unsigned int y;
++       unsigned int cval = 0;
++
++       for (y = 0; y < height * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_top[x * 7 / width].y << 2 |
++                               colors_top[(x+1) * 7 / width].y << 12 |
++                               colors_top[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_middle[x * 7 / width].y << 2 |
++                               colors_middle[(x+1) * 7 / width].y << 12 |
++                               colors_middle[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[x * 4 / (width * 5 / 7)].y << 2 |
++                               colors_bottom[(x + 1) * 4 / (width * 5 / 7)]
++                               .y << 12 | colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].y << 22;
++
++               for (; x < width * 6 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 2 |
++                               colors_bottom[((x + 1) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 12 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 22;
++
++               for (; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] = colors_bottom[7].y << 2 |
++                               colors_bottom[7].y << 12 |
++                               colors_bottom[7].y << 22;
++               y_mem += stride;
++       }
++
++       /* Chroma */
++       unsigned int *c_mem = (unsigned int *)uv_mem;
++
++       for (y = 0; y < height / ysub * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 6) {
++                       cval = (colors_top[x * 7 / width].u << 2) |
++                               (colors_top[x * 7 / width].v << 12) |
++                               (colors_top[(x + 2) * 7 / width].u << 22);
++                       c_mem[x/3] = cval;
++                       cval = (colors_top[(x + 2) * 7 / width].v << 2) |
++                               (colors_top[(x + 4) * 7 / width].u << 12) |
++                               (colors_top[(x + 4) * 7 / width].v << 22);
++                       c_mem[x/3 + 1] = cval;
++               }
++               c_mem += (stride/4) * cs / xsub;
++       }
++
++       for (; y < height / ysub * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 6) {
++                       cval =  (colors_middle[x * 7 / width].u << 2) |
++                               (colors_middle[x * 7 / width].v << 12) |
++                               (colors_middle[(x + 2) * 7 / width].u << 22);
++                       c_mem[x/3] = cval;
++                       cval = (colors_middle[(x + 2) * 7 / width].v << 2) |
++                               (colors_middle[(x + 4) * 7 / width].u << 12) |
++                               (colors_middle[(x + 4) * 7 / width].v << 22);
++                       c_mem[x/3 + 1] = cval;
++               }
++               c_mem += (stride/4) * cs / xsub;
++       }
++
++       for (; y < height / ysub; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 6) {
++                       cval = colors_bottom[x * 4 /
++                               (width * 5 / 7)].u << 2 |
++                               colors_bottom[x * 4 /
++                               (width * 5 / 7)].v << 12 |
++                               colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)]. u << 22;
++
++                       c_mem[x/3] = cval;
++
++                       cval = colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].v << 2 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)].u << 12 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)].v << 22;
++
++                       c_mem[x/3 + 1] = cval;
++               }
++               for (; x < width * 6 / 7; x += 6) {
++                       cval = colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 2 |
++                               colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 12 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 22;
++
++                       c_mem[x/3] = cval;
++
++                       cval = colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 2 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 12 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 22;
++                       c_mem[x/3 + 1] = cval;
++               }
++               for (; x < width; x += 6) {
++                       cval = colors_bottom[7].u << 2 |
++                               colors_bottom[7].v << 12 |
++                               colors_bottom[7].u << 22;
++                       c_mem[x/3] = cval;
++                       cval = colors_bottom[7].v << 2 |
++                               colors_bottom[7].u << 12 |
++                               colors_bottom[7].v << 22;
++                       c_mem[x/3 + 1] = cval;
++               }
++               c_mem += (stride/4) * cs / xsub;
++       }
++}
++
++static void fill_smpte_yuv_planar_10b(
++                               const struct util_yuv_info *yuv,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, unsigned int width,
++                               unsigned int height, unsigned int stride)
++{
++       const struct color_yuv colors_top[] = {
++               MAKE_YUV_601(191, 192, 192),    /* grey */
++               MAKE_YUV_601(192, 192, 0),      /* yellow */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(0, 192, 0),        /* green */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(192, 0, 0),        /* red */
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++       };
++       const struct color_yuv colors_middle[] = {
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 192, 192),    /* grey */
++       };
++       const struct color_yuv colors_bottom[] = {
++               MAKE_YUV_601(0, 33, 76),        /* in-phase */
++               MAKE_YUV_601(255, 255, 255),    /* super white */
++               MAKE_YUV_601(50, 0, 106),       /* quadrature */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(9, 9, 9),          /* 3.5% */
++               MAKE_YUV_601(19, 19, 19),       /* 7.5% */
++               MAKE_YUV_601(29, 29, 29),       /* 11.5% */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++       };
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int xsub = yuv->xsub;
++       unsigned int ysub = yuv->ysub;
++       unsigned int x;
++       unsigned int y;
++
++       /* Luma */
++       for (y = 0; y < height * 6 / 9; ++y) {
++               for (x = 0; x < width; ++x)
++                       y_mem[x] = colors_top[x * 7 / width].y;
++               y_mem += stride;
++       }
++
++       for (; y < height * 7 / 9; ++y) {
++               for (x = 0; x < width; ++x)
++                       y_mem[x] = colors_middle[x * 7 / width].y;
++               y_mem += stride;
++       }
++
++       for (; y < height; ++y) {
++               for (x = 0; x < width * 5 / 7; ++x)
++                       y_mem[x] = colors_bottom[x * 4 / (width * 5 / 7)].y;
++               for (; x < width * 6 / 7; ++x)
++                       y_mem[x] = colors_bottom[(x - width * 5 / 7) * 3 /
++                       (width / 7) + 4].y;
++               for (; x < width; ++x)
++                       y_mem[x] = colors_bottom[7].y;
++               y_mem += stride;
++       }
++
++       /* Chroma */
++       for (y = 0; y < height / ysub * 6 / 9; ++y) {
++               for (x = 0; x < width; x += xsub) {
++                       u_mem[x*cs/xsub] = colors_top[x * 7 / width].u;
++                       v_mem[x*cs/xsub] = colors_top[x * 7 / width].v;
++               }
++               u_mem += stride * cs / xsub;
++               v_mem += stride * cs / xsub;
++       }
++
++       for (; y < height / ysub * 7 / 9; ++y) {
++               for (x = 0; x < width; x += xsub) {
++                       u_mem[x*cs/xsub] = colors_middle[x * 7 / width].u;
++                       v_mem[x*cs/xsub] = colors_middle[x * 7 / width].v;
++               }
++               u_mem += stride * cs / xsub;
++               v_mem += stride * cs / xsub;
++       }
++
++       for (; y < height / ysub; ++y) {
++               for (x = 0; x < width * 5 / 7; x += xsub) {
++                       u_mem[x*cs/xsub] =
++               colors_bottom[x * 4 / (width * 5 / 7)].u;
++                       v_mem[x*cs/xsub] =
++               colors_bottom[x * 4 / (width * 5 / 7)].v;
++               }
++               for (; x < width * 6 / 7; x += xsub) {
++                       u_mem[x*cs/xsub] =
++               colors_bottom[(x - width * 5 / 7) * 3 / (width / 7) + 4].u;
++                       v_mem[x*cs/xsub] =
++               colors_bottom[(x - width * 5 / 7) * 3 / (width / 7) + 4].v;
++               }
++               for (; x < width; x += xsub) {
++                       u_mem[x*cs/xsub] = colors_bottom[7].u;
++                       v_mem[x*cs/xsub] = colors_bottom[7].v;
++               }
++               u_mem += stride * cs / xsub;
++               v_mem += stride * cs / xsub;
++       }
++}
++
++static void fill_tiles_xv15(
++                               const struct util_format_info *info,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, uint32_t width,
++                               uint32_t height, uint32_t stride)
++{
++       const struct util_yuv_info *yuv = &info->yuv;
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int x;
++       unsigned int y;
++       uint32_t shifter = 0, LumVal = 0;
++       uint32_t lumIndex = 0;
++       uint32_t *Lum;
++       uint32_t *Chrom;
++       uint32_t ChromVal = 0;
++       uint32_t chromIndex = 0;
++
++       /* preparing 10 bit Luma */
++       Lum = (uint32_t *)y_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x++) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                               + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                               MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                               (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       //Checking if we got 3 components to pack in 4 bytes
++                       if (shifter == 30) {
++                               Lum[lumIndex] = LumVal;
++                               lumIndex++; shifter = 0; LumVal = 0;
++                       }
++                       LumVal  = (LumVal | ((color.y << 2) << shifter));
++                       shifter += 10; //10 bit precision
++               }
++               lumIndex = 0; shifter = 0; LumVal = 0;
++               y_mem += stride;
++               Lum = (uint32_t *)y_mem;
++       }
++
++       /* Preparing 10 bit Chroma */
++       Chrom = (uint32_t *)u_mem;
++       for (y = 0; y < height / 2; ++y) {
++               for (x = 0; x < width; x = x + 6) {
++                       div_t d  = div(x+(2 * y), width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                               + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                               (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       div_t d2  = div(x + 2 + (2*y), width);
++                       uint32_t rgb32_2 = 0x00130502 * (d2.quot >> 6)
++                                       + 0x000a1120 * (d2.rem >> 6);
++                       struct color_yuv color_2 =
++                               MAKE_YUV_601((rgb32_2 >> 16) & 0xff,
++                               (rgb32_2 >> 8) & 0xff, rgb32_2 & 0xff);
++
++                       div_t d3  = div(x + 4 + (2*y), width);
++                       uint32_t rgb32_3 = 0x00130502 * (d3.quot >> 6)
++                                       + 0x000a1120 * (d3.rem >> 6);
++                       struct color_yuv color_3 =
++                               MAKE_YUV_601((rgb32_3 >> 16) & 0xff,
++                               (rgb32_3 >> 8) & 0xff, rgb32_3 & 0xff);
++
++                       ChromVal = ((color_2.u << 2) << 20)
++                               | ((color.v << 2) << 10) | (color.u << 2);
++                       Chrom[chromIndex++] = ChromVal;
++
++                       ChromVal = ((color_3.v << 2) << 20)
++                               | ((color_3.u << 2) << 10) | (color_2.v << 2);
++                       Chrom[chromIndex++] = ChromVal;
++               }
++       chromIndex = 0; ChromVal = 0;
++       u_mem += stride;
++       Chrom = (uint32_t *)u_mem;
++       }
++}
++
++static void fill_tiles_xv20(
++                               const struct util_format_info *info,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, uint32_t width,
++                               uint32_t height, uint32_t stride)
++{
++       const struct util_yuv_info *yuv = &info->yuv;
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int x;
++       unsigned int y;
++       uint32_t shifter = 0, LumVal = 0;
++       uint32_t lumIndex = 0;
++       uint32_t *Lum;
++       uint32_t *Chrom;
++       uint32_t ChromVal = 0;
++       uint32_t chromIndex = 0;
++
++       /* preparing 10 bit Luma */
++       Lum = (uint32_t *)y_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x++) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       //Checking if we got 3 components to pack in 4 bytes
++                       if (shifter == 30) {
++                               Lum[lumIndex] = LumVal;
++                               lumIndex++; shifter = 0; LumVal = 0;
++                       }
++                       LumVal  = (LumVal | ((color.y << 2) << shifter));
++                       shifter += 10; //10 bit precision
++               }
++               lumIndex = 0; shifter = 0; LumVal = 0;
++               y_mem += stride;
++               Lum = (uint32_t *)y_mem;
++       }
++
++       /* Preparing 10 bit Chroma */
++       Chrom = (uint32_t *)u_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x = x + 6) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       div_t d2  = div(x + 2 + y, width);
++                       uint32_t rgb32_2 = 0x00130502 * (d2.quot >> 6)
++                                               + 0x000a1120 * (d2.rem >> 6);
++                       struct color_yuv color_2 =
++                                       MAKE_YUV_601((rgb32_2 >> 16) & 0xff,
++                                      (rgb32_2 >> 8) & 0xff, rgb32_2 & 0xff);
++                       div_t d3  = div(x + 4 + y, width);
++                       uint32_t rgb32_3 = 0x00130502 * (d3.quot >> 6)
++                                       + 0x000a1120 * (d3.rem >> 6);
++                       struct color_yuv color_3 =
++                                       MAKE_YUV_601((rgb32_3 >> 16) & 0xff,
++                                       (rgb32_3 >> 8) & 0xff, rgb32_3 & 0xff);
++
++                       ChromVal = ((color_2.u << 2) << 20)
++                               | ((color.v << 2) << 10) | (color.u << 2);
++                       Chrom[chromIndex++] = ChromVal;
++
++                       ChromVal = ((color_3.v << 2) << 20)
++                               | ((color_3.u << 2) << 10) | (color_2.v << 2);
++                       Chrom[chromIndex++] = ChromVal;
++               }
++               chromIndex = 0; ChromVal = 0;
++               u_mem += stride;
++               Chrom = (uint32_t *)u_mem;
++       }
++}
++
+ static void fill_smpte_yuv_packed(const struct util_yuv_info *yuv, void *mem,
+                                  unsigned int width, unsigned int height,
+                                  unsigned int stride)
+@@ -1188,9 +1614,10 @@ void util_smpte_fill_lut(unsigned int nc
+                memcpy(lut, smpte_color_lut, sizeof(smpte_color_lut));
+ }
+ 
+-static void fill_smpte(const struct util_format_info *info, void *planes[3],
+-                      unsigned int width, unsigned int height,
+-                      unsigned int stride)
++static void fill_smpte(const struct util_format_info *info,
++                               void *planes[3],
++                               unsigned int width, unsigned int height,
++                               unsigned int stride)
+ {
+        unsigned char *u, *v;
+ 
+@@ -1209,7 +1636,12 @@ static void fill_smpte(const struct util
+        case DRM_FORMAT_YVYU:
+                return fill_smpte_yuv_packed(&info->yuv, planes[0], width,
+                                             height, stride);
+-
++       case DRM_FORMAT_XV20:
++               return fill_tiles_xv20(info, planes[0], planes[1], planes[1],
++                      width, height, stride);
++       case DRM_FORMAT_XV15:
++               return fill_tiles_xv15(info, planes[0], planes[1], planes[2],
++                      width, height, stride);
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV21:
+        case DRM_FORMAT_NV16:
+@@ -1614,9 +2046,10 @@ static void fill_tiles_rgb16fp(const str
+        }
+ }
+ 
+-static void fill_tiles(const struct util_format_info *info, void *planes[3],
+-                      unsigned int width, unsigned int height,
+-                      unsigned int stride)
++static void fill_tiles(const struct util_format_info *info,
++                               void *planes[3],
++                               unsigned int width, unsigned int height,
++                               unsigned int stride)
+ {
+        unsigned char *u, *v;
+ 
+@@ -1653,6 +2086,14 @@ static void fill_tiles(const struct util
+                return fill_tiles_yuv_planar(info, planes[0], planes[2],
+                                             planes[1], width, height, stride);
+ 
++       case DRM_FORMAT_XV20:
++               return fill_tiles_xv20(info, planes[0], planes[1],
++                        planes[1], width, height, stride);
++
++       case DRM_FORMAT_XV15:
++               return fill_tiles_xv15(info, planes[0], planes[1],
++                        planes[2], width, height, stride);
++
+        case DRM_FORMAT_ARGB4444:
+        case DRM_FORMAT_XRGB4444:
+        case DRM_FORMAT_ABGR4444:
+Index: libdrm-2.4.118/tests/util/format.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/format.c
++++ libdrm-2.4.118/tests/util/format.c
+@@ -59,6 +59,8 @@ static const struct util_format_info for
+        { DRM_FORMAT_NV15, "NV15", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 2) },
+        { DRM_FORMAT_NV20, "NV20", MAKE_YUV_INFO(YUV_YCbCr, 2, 1, 2) },
+        { DRM_FORMAT_NV30, "NV30", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 2) },
++       { DRM_FORMAT_XV15, "XV15", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 2) },
++       { DRM_FORMAT_XV20, "XV20", MAKE_YUV_INFO(YUV_YCbCr, 2, 1, 2) },
+        /* YUV planar */
+        { DRM_FORMAT_YUV420, "YU12", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 1) },
+        { DRM_FORMAT_YVU420, "YV12", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 1) },
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch b/meta-xilinx-core/recipes-graphics/drm/files/0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch
new file mode 100644
index 00000000..b385bbac
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch
@@ -0,0 +1,38 @@
+From ede95ded932a8f722f339fa345c098c705f40f08 Mon Sep 17 00:00:00 2001
+From: Anil Kumar M <amamidal@xilinx.com>
+Date: Wed, 16 Sep 2020 22:42:47 +0530
+Subject: [PATCH 4/5] modetest: fix smpte colour pattern issue for XV20 and
+ XV15 formats
+
+Fix smpte colour issue for XV15 and XV20 formats.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anil Kumar M <amamidal@xilinx.com>
+---
+ tests/util/pattern.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/util/pattern.c b/tests/util/pattern.c
+index e29d160..0fe2e5f 100644
+--- a/tests/util/pattern.c
++++ b/tests/util/pattern.c
+@@ -1121,11 +1121,11 @@ static void fill_smpte(const struct util_format_info *info,
+                return fill_smpte_yuv_packed(&info->yuv, planes[0], width,
+                                             height, stride);
+        case DRM_FORMAT_XV20:
+-               return fill_tiles_xv20(info, planes[0], planes[1], planes[1],
+-                      width, height, stride);
++               return fill_smpte_yuv_semiplanar_10b(&info->yuv, planes[0], planes[1],
++                                            width, height, stride);
+        case DRM_FORMAT_XV15:
+-               return fill_tiles_xv15(info, planes[0], planes[1], planes[2],
+-                      width, height, stride);
++               return fill_smpte_yuv_semiplanar_10b(&info->yuv, planes[0], planes[1],
++                                            width, height, stride);
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV21:
+        case DRM_FORMAT_NV16:
+-- 
+2.7.4
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/libdrm_%.bbappend b/meta-xilinx-core/recipes-graphics/drm/libdrm_%.bbappend
new file mode 100644
index 00000000..c2f6c8d2
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/libdrm_%.bbappend
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+
+SRC_URI:append = " \
+        file://0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch \
+        file://0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch \
+        file://0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch \
+        file://0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch \
+"
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb
index 268759c2..cd3ba3d1 100644
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb
@@ -34,6 +34,7 @@ SRC_URI = " \
         file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \
         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 \
         "
 SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
 SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch
new file mode 100644
index 00000000..72275a4c
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch
@@ -0,0 +1,81 @@
+From e3e0f5e3fa0ddb396393d444bce6e575f7a16189 Mon Sep 17 00:00:00 2001
+From: Parth Gajjar <parth.gajjar@amd.com>
+Date: Thu, 21 Dec 2023 22:41:32 -0800
+Subject: [PATCH] Replace vma->vm_flags direct modifications with modifier
+ calls
+
+Replace direct modifications to vma->vm_flags with calls to modifier
+functions to be able to track flag changes and to keep vma locking
+correctness. (Kernel 6.3)
+
+Signed-off-by: Parth Gajjar <parth.gajjar@amd.com>
+---
+ linux/mali_memory.c     | 10 ++++++++++
+ linux/mali_memory_cow.c | 13 ++++++++++---
+ 2 files changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/linux/mali_memory.c b/linux/mali_memory.c
+index 2b2b209..c21d0b7 100644
+--- a/linux/mali_memory.c
++++ b/linux/mali_memory.c
+@@ -266,11 +266,17 @@ int mali_mmap(struct file *filp, struct vm_area_struct *vma)
+                 * that it's present and can never be paged out (see also previous
+                 * entry)
+                 */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
++               vm_flags_set(vma, VM_IO | VM_DONTCOPY | VM_PFNMAP);
++#else
+                vma->vm_flags |= VM_IO;
+                vma->vm_flags |= VM_DONTCOPY;
+                vma->vm_flags |= VM_PFNMAP;
++#endif
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
+                vma->vm_flags |= VM_RESERVED;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
++               vm_flags_set(vma, VM_DONTDUMP | VM_DONTEXPAND);
+ #else
+                vma->vm_flags |= VM_DONTDUMP;
+                vma->vm_flags |= VM_DONTEXPAND;
+@@ -288,7 +294,11 @@ int mali_mmap(struct file *filp, struct vm_area_struct *vma)
+        if (!(vma->vm_flags & VM_WRITE)) {
+                MALI_DEBUG_PRINT(4, ("mmap allocation with read only !\n"));
+                /* add VM_WRITE for do_page_fault will check this when a write fault */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
++               vm_flags_set(vma, VM_WRITE | VM_READ);
++#else
+                vma->vm_flags |= VM_WRITE | VM_READ;
++#endif
+                vma->vm_page_prot = PAGE_READONLY;
+                vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
+                mem_bkend->flags |= MALI_MEM_BACKEND_FLAG_COW_CPU_NO_WRITE;
+diff --git a/linux/mali_memory_cow.c b/linux/mali_memory_cow.c
+index 6fadd42..e631431 100644
+--- a/linux/mali_memory_cow.c
++++ b/linux/mali_memory_cow.c
+@@ -391,13 +391,20 @@ _mali_osk_errcode_t mali_memory_cow_modify_range(mali_mem_backend *backend,
+                        }

+                } else {

+                        /* used to trigger page fault for swappable cowed memory. */

+-                       alloc->cpu_mapping.vma->vm_flags |= VM_PFNMAP;

+-                       alloc->cpu_mapping.vma->vm_flags |= VM_MIXEDMAP;

+-

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
++                       vm_flags_set(alloc->cpu_mapping.vma, VM_PFNMAP | VM_MIXEDMAP);
++#else
++                       alloc->cpu_mapping.vma->vm_flags |= VM_PFNMAP;
++                       alloc->cpu_mapping.vma->vm_flags |= VM_MIXEDMAP;
++#endif
+                        zap_vma_ptes(alloc->cpu_mapping.vma, alloc->cpu_mapping.vma->vm_start + range_start, range_size);

+                        /* delete this flag to let swappble is ummapped regard to stauct page not page frame. */

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
++                       vm_flags_clear(alloc->cpu_mapping.vma, VM_PFNMAP | VM_MIXEDMAP);
++#else
+                        alloc->cpu_mapping.vma->vm_flags &= ~VM_PFNMAP;

+                        alloc->cpu_mapping.vma->vm_flags &= ~VM_MIXEDMAP;

++#endif
+                }

+        }

+ 

+-- 
+2.25.1
+
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2024.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2024.1.bb
new file mode 100644
index 00000000..17039abb
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2024.1.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Xilinx DisplayPort Linux Kernel module"
+DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
+SECTION = "kernel/modules"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
+
+XLNX_DP_VERSION = "6.1.0"
+PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
+SRCREV ?= "e20942b256e6fb18eaef919c7441f65ad8afcf43"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+inherit module
+
+EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb
new file mode 100644
index 00000000..9757ae4b
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Xilinx HDMI Linux Kernel module"
+DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
+SECTION = "kernel/modules"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
+
+XLNX_HDMI_VERSION = "6.1"
+PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
+SRCREV = "edd297762e0bac3f4c5b64ef67244968e22020e2"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+inherit module
+
+EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent/meson.patch
new file mode 100644
index 00000000..38b61071
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent/meson.patch
@@ -0,0 +1,74 @@
+Fixes for the Meson build of libtraceevent:
+
+- Make the plugin directory the same as the Makefiles
+- Install the plugins as modules not static and versioned shared libraries
+- Add an option to disable building the documentation (needs asciidoc and xmlto)
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git a/meson.build b/meson.build
+index b61c873..4bba4d8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir'))
+ libdir = join_paths(prefixdir, get_option('libdir'))
+ plugindir = get_option('plugindir')
+ if plugindir == ''
+-    plugindir = join_paths(libdir, 'libtraceevent/plugins')
++    plugindir = join_paths(libdir, 'traceevent/plugins')
+ endif
+ 
+ add_project_arguments(
+@@ -45,10 +45,13 @@ if cunit_dep.found()
+     subdir('utest')
+ endif
+ subdir('samples')
+-subdir('Documentation')
+ 
+-custom_target(
+-    'docs',
+-    output: 'docs',
+-    depends: [html, man],
+-    command: ['echo'])
++if get_option('docs')
++    subdir('Documentation')
++
++    custom_target(
++        'docs',
++        output: 'docs',
++        depends: [html, man],
++        command: ['echo'])
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+index b2294f6..0611216 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -4,6 +4,10 @@
+ 
+ option('plugindir', type : 'string',
+        description : 'set the plugin dir')
++
++option('docs', type : 'boolean', value: true,
++       description : 'build documentation')
++
+ option('htmldir', type : 'string', value : 'share/doc/libtraceevent-doc',
+        description : 'directory for HTML documentation')
+ option('asciidoctor', type : 'boolean', value: false,
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 74ad664..4919be4 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -19,11 +19,10 @@ plugins = [
+ 
+ pdeps = []
+ foreach plugin : plugins
+-    pdeps += library(
++    pdeps += shared_module(
+         plugin.replace('.c', ''),
+         plugin,
+         name_prefix: '',
+-        version: library_version,
+         dependencies: [libtraceevent_dep],
+         include_directories: [incdir],
+         install: true,
diff --git a/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb
new file mode 100644
index 00000000..bee78918
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb
@@ -0,0 +1,23 @@
+# Copyright (C) 2022 Khem Raj <raj.khem@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = "API to access the kernel tracefs directory"
+HOMEPAGE = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
+                    file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd"
+SECTION = "libs"
+
+SRCREV = "dd148189b74da3e2f45c7e536319fec97cb71213"
+SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \
+           file://meson.patch"
+
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig
+
+EXTRA_OEMESON = "-Ddocs=false"
+
+PACKAGES += "${PN}-plugins"
+
+FILES:${PN}-plugins += "${libdir}/traceevent/plugins"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg
new file mode 100644
index 00000000..a5b23e3f
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg
@@ -0,0 +1 @@
+CONFIG_VERSAL_SYSMON_I2C=y
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc
new file mode 100644
index 00000000..c1830956
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: MIT
+kconf hardware versal-sysmon.cfg
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
new file mode 100644
index 00000000..db593947
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb
@@ -0,0 +1,19 @@
+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_meta = "5d0809d0d939c7738cb6e5391126c73fd0e4e865"
+
+KCONF_AUDIT_LEVEL="0"
+
+include linux-xlnx.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+# Workaround for:
+#  rm: cannot remove '.../tmp/work/zynqmp_generic-xilinx-linux/linux-xlnx/6.6.0-xilinx-v2024.1+gitAUTOINC+340eed5001-r0/image/lib/modules/6.6.0-xilinx-v2024.1-g340eed500130/source': No such file or directory
+# This will not be required Scarthgap
+kernel_do_install:prepend () {
+        mkdir -p "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}"
+        touch "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
+}
diff --git a/meta-xilinx-core/recipes-kernel/perf/perf-perl.inc b/meta-xilinx-core/recipes-kernel/perf/perf-perl.inc
new file mode 100644
index 00000000..491f54c3
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/perf/perf-perl.inc
@@ -0,0 +1,11 @@
+inherit perlnative cpan-base
+
+# Env var which tells perl if it should use host (no) or target (yes) settings
+export PERLCONFIGTARGET = "${@is_target(d)}"
+export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}/CORE"
+export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}"
+export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}"
+
+# The perl symbols CPPSTDIN and CPPRUN embed the sysroot into the
+# binaries, work needed to remove this
+INSANE_SKIP:${PN}-dbg += "buildpaths"
diff --git a/meta-xilinx-core/recipes-kernel/perf/perf.bb b/meta-xilinx-core/recipes-kernel/perf/perf.bb
new file mode 100644
index 00000000..9164d93a
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/perf/perf.bb
@@ -0,0 +1,414 @@
+SUMMARY = "Performance analysis tools for Linux"
+DESCRIPTION = "Performance counters for Linux are a new kernel-based \
+subsystem that provide a framework for all things \
+performance analysis. It covers hardware level \
+(CPU/PMU, Performance Monitoring Unit) features \
+and software features (software counters, tracepoints) \
+as well."
+HOMEPAGE = "https://perf.wiki.kernel.org/index.php/Main_Page"
+
+LICENSE = "GPL-2.0-only"
+
+PE = '1'
+
+PACKAGECONFIG ??= "python tui libunwind libtraceevent"
+PACKAGECONFIG[dwarf] = ",NO_DWARF=1"
+PACKAGECONFIG[perl] = ",NO_LIBPERL=1,perl"
+PACKAGECONFIG[python] = ",NO_LIBPYTHON=1,python3 python3-setuptools-native"
+# gui support was added with kernel 3.6.35
+# since 3.10 libnewt was replaced by slang
+# to cover a wide range of kernel we add both dependencies
+PACKAGECONFIG[tui] = ",NO_NEWT=1,libnewt slang"
+PACKAGECONFIG[libunwind] = ",NO_LIBUNWIND=1 NO_LIBDW_DWARF_UNWIND=1,libunwind"
+PACKAGECONFIG[libnuma] = ",NO_LIBNUMA=1"
+PACKAGECONFIG[bfd] = ",NO_LIBBFD=1"
+PACKAGECONFIG[systemtap] = ",NO_SDT=1,systemtap"
+PACKAGECONFIG[jvmti] = ",NO_JVMTI=1"
+# libaudit support would need scripting to be enabled
+PACKAGECONFIG[audit] = ",NO_LIBAUDIT=1,audit"
+PACKAGECONFIG[manpages] = ",,xmlto-native asciidoc-native"
+PACKAGECONFIG[cap] = ",,libcap"
+PACKAGECONFIG[libtraceevent] = ",NO_LIBTRACEEVENT=1,libtraceevent"
+# jevents requires host python for generating a .c file, but is
+# unrelated to the python item.
+PACKAGECONFIG[jevents] = ",NO_JEVENTS=1,python3-native"
+# Arm CoreSight
+PACKAGECONFIG[coresight] = "CORESIGHT=1,,opencsd"
+PACKAGECONFIG[pfm4] = ",NO_LIBPFM4=1,libpfm4"
+PACKAGECONFIG[babeltrace] = ",NO_LIBBABELTRACE=1,babeltrace"
+
+# libunwind is not yet ported for some architectures
+PACKAGECONFIG:remove:arc = "libunwind"
+PACKAGECONFIG:remove:riscv32 = "libunwind"
+
+DEPENDS = " \
+    virtual/${MLPREFIX}libc \
+    ${MLPREFIX}elfutils \
+    ${MLPREFIX}binutils \
+    bison-native flex-native xz \
+"
+
+do_configure[depends] += "virtual/kernel:do_shared_workdir"
+
+PROVIDES = "virtual/perf"
+
+inherit linux-kernel-base kernel-arch manpages
+
+# needed for building the tools/perf Python bindings
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)}
+inherit python3-dir
+export PYTHON_SITEPACKAGES_DIR
+
+#kernel 3.1+ supports WERROR to disable warnings as errors
+export WERROR = "0"
+
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
+
+# needed for building the tools/perf Perl binding
+include ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perf-perl.inc', '', d)}
+
+inherit kernelsrc
+
+S = "${WORKDIR}/${BP}"
+SPDX_S = "${S}/tools/perf"
+
+# The LDFLAGS is required or some old kernels fails due missing
+# symbols and this is preferred than requiring patches to every old
+# supported kernel.
+LDFLAGS="-ldl -lutil"
+
+# Perf's build system adds its own optimization flags for most TUs,
+# overriding the flags included here. But for some, perf does not add
+# any -O option, so ensure the distro's chosen optimization gets used
+# for those. Since ${SELECTED_OPTIMIZATION} always includes
+# ${DEBUG_FLAGS} which in turn includes ${DEBUG_PREFIX_MAP}, this also
+# ensures perf is built with appropriate -f*-prefix-map options,
+# avoiding the 'buildpaths' QA warning.
+TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}"
+
+EXTRA_OEMAKE = '\
+    V=1 \
+    VF=1 \
+    -C ${S}/tools/perf \
+    O=${B} \
+    CROSS_COMPILE=${TARGET_PREFIX} \
+    ARCH=${ARCH} \
+    CC="${CC}" \
+    CCLD="${CC}" \
+    LDSHARED="${CC} -shared" \
+    AR="${AR}" \
+    LD="${LD}" \
+    EXTRA_CFLAGS="-ldw -I${S}" \
+    YFLAGS='-y --file-prefix-map=${WORKDIR}=${TARGET_DBGSRC_DIR}' \
+    EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
+    perfexecdir=${libexecdir} \
+    NO_GTK2=1 \
+    ${PACKAGECONFIG_CONFARGS} \
+    PKG_CONFIG=pkg-config \
+    TMPDIR="${B}" \
+    LIBUNWIND_DIR=${STAGING_EXECPREFIXDIR} \
+'
+
+EXTRA_OEMAKE += "\
+    'DESTDIR=${D}' \
+    'prefix=${prefix}' \
+    'bindir=${bindir}' \
+    'sharedir=${datadir}' \
+    'sysconfdir=${sysconfdir}' \
+    'perfexecdir=${libexecdir}/perf-core' \
+    'ETC_PERFCONFIG=${@os.path.relpath(sysconfdir, prefix)}' \
+    'sharedir=${@os.path.relpath(datadir, prefix)}' \
+    'mandir=${@os.path.relpath(mandir, prefix)}' \
+    'infodir=${@os.path.relpath(infodir, prefix)}' \
+    ${@bb.utils.contains('PACKAGECONFIG', 'python', 'PYTHON=python3 PYTHON_CONFIG=python3-config', '', d)} \
+"
+
+# During do_configure, we might run a 'make clean'. That often breaks
+# when done in parallel, so disable parallelism for do_configure. Note
+# that it has to be done this way rather than by passing -j1, since
+# perf's build system by default ignores any -j argument, but does
+# honour a JOBS variable.
+EXTRA_OEMAKE:append:task-configure = " JOBS=1"
+
+PERF_SRC ?= "Makefile \
+             tools/arch \
+             tools/build \
+             tools/include \
+             tools/lib \
+             tools/Makefile \
+             tools/perf \
+             tools/scripts \
+             scripts/ \
+             arch/arm64/tools \
+             arch/${ARCH}/Makefile \
+"
+
+PERF_EXTRA_LDFLAGS = ""
+
+# MIPS N32/N64
+PERF_EXTRA_LDFLAGS:mipsarchn32eb = "-m elf32btsmipn32"
+PERF_EXTRA_LDFLAGS:mipsarchn32el = "-m elf32ltsmipn32"
+PERF_EXTRA_LDFLAGS:mipsarchn64eb = "-m elf64btsmip"
+PERF_EXTRA_LDFLAGS:mipsarchn64el = "-m elf64ltsmip"
+
+do_compile() {
+        # Linux kernel build system is expected to do the right thing
+        unset CFLAGS
+        test -e ${S}/tools/lib/traceevent/plugins/Makefile && \
+            sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/lib/traceevent/plugins/Makefile
+        test -e ${S}/tools/perf/Makefile.config && \
+            sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/perf/Makefile.config
+        oe_runmake all
+}
+
+do_install() {
+        # Linux kernel build system is expected to do the right thing
+        unset CFLAGS
+        oe_runmake install
+        # we are checking for this make target to be compatible with older perf versions
+        if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)} && grep -q install-python_ext ${S}/tools/perf/Makefile*; then
+            oe_runmake DESTDIR=${D} install-python_ext
+            if [ -e ${D}${libdir}/python*/site-packages/perf-*/SOURCES.txt ]; then
+                sed -i -e 's#${WORKDIR}##g' ${D}${libdir}/python*/site-packages/perf-*/SOURCES.txt
+            fi
+        fi
+}
+
+do_configure[prefuncs] += "copy_perf_source_from_kernel"
+python copy_perf_source_from_kernel() {
+    sources = (d.getVar("PERF_SRC") or "").split()
+    src_dir = d.getVar("STAGING_KERNEL_DIR")
+    dest_dir = d.getVar("S")
+    bb.utils.mkdirhier(dest_dir)
+    bb.utils.prunedir(dest_dir)
+    for s in sources:
+        src = oe.path.join(src_dir, s)
+        dest = oe.path.join(dest_dir, s)
+        if not os.path.exists(src):
+            bb.warn("Path does not exist: %s. Maybe PERF_SRC lists more files than what your kernel version provides and needs." % src)
+            continue
+        if os.path.isdir(src):
+            oe.path.copyhardlinktree(src, dest)
+        else:
+            src_path = os.path.dirname(s)
+            os.makedirs(os.path.join(dest_dir,src_path),exist_ok=True)
+            bb.utils.copyfile(src, dest)
+}
+
+do_configure:prepend () {
+    # If building a multlib based perf, the incorrect library path will be
+    # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit
+    # build, with a 64 bit multilib, the arch won't match and the detection of a 
+    # 64 bit build (and library) are not exected. To ensure that libraries are
+    # installed to the correct location, we can use the weak assignment in the
+    # config/Makefile.
+    #
+    # Also need to relocate .config-detected to $(OUTPUT)/config-detected
+    # for kernel sources that do not already do this
+    # as two builds (e.g. perf and lib32-perf from mutlilib can conflict
+    # with each other if its in the shared source directory
+    #
+    if [ -e "${S}/tools/perf/config/Makefile" ]; then
+        perfconfig="${S}/tools/perf/config/Makefile"
+    fi
+    if [ -e "${S}/tools/perf/Makefile.config" ]; then
+        perfconfig="${S}/tools/perf/Makefile.config"
+    fi
+    if [ -n "${perfconfig}" ]; then
+        # Match $(prefix)/$(lib) and $(prefix)/lib
+        sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \
+               -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \
+               -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
+            ${perfconfig}
+    fi
+    # The man pages installation is "$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)"
+    # in ${S}/tools/perf/Documentation/Makefile, if the mandir set to '?=', it
+    # will use the relative path 'share/man', in the way it will resulting in
+    # incorrect installation for man pages.
+    if [ -e "${S}/tools/perf/Documentation/Makefile" ]; then
+        sed -i 's,^mandir?=,mandir:=,' ${S}/tools/perf/Documentation/Makefile
+    fi
+    if [ -e "${S}/tools/perf/Makefile.perf" ]; then
+        sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
+            ${S}/tools/perf/Makefile.perf
+        sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \
+            ${S}/tools/perf/Makefile.perf
+        # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8
+        sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \
+            ${S}/tools/perf/Makefile.perf
+    fi
+    sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
+        ${S}/tools/perf/Makefile*
+
+    if [ -e "${S}/tools/build/Makefile.build" ]; then
+        sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
+            ${S}/tools/build/Makefile.build
+    fi
+
+    # start reproducibility substitutions
+    if [ -e "${S}/tools/perf/Makefile.config" ]; then
+        # The following line in the Makefle:
+        #     override PYTHON := $(call get-executable-or-default,PYTHON,$(PYTHON_AUTO))
+        # "PYTHON" / "PYTHON_AUTO" have the full path as part of the variable. We've
+        # ensure that the environment is setup and we do not need the full path to be
+        # captured, since the symbol gets built into the executable, making it not
+        # reproducible.
+        sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(PYTHON_AUTO)),$(notdir $(call get-executable-or-default\,PYTHON\,$(PYTHON_AUTO))),g' \
+            ${S}/tools/perf/Makefile.config
+        # The same line is in older releases, but looking explicitly for Python 2
+        sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(PYTHON2)),$(notdir $(call get-executable-or-default\,PYTHON\,$(PYTHON2))),g' \
+            ${S}/tools/perf/Makefile.config
+
+        # likewise with this substitution. Kernels with commit 18f2967418d031a39
+        # [perf tools: Use Python devtools for version autodetection rather than runtime]
+        # need this substitution for reproducibility.
+        sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(subst -config\,\,$(PYTHON_AUTO))),$(notdir $(call get-executable-or-default\,PYTHON\,$(subst -config\,\,$(PYTHON_AUTO)))),g' \
+            ${S}/tools/perf/Makefile.config
+
+        # The following line:
+        #     srcdir_SQ = $(patsubst %tools/perf,tools/perf,$(subst ','\'',$(srcdir))),
+        # Captures the full src path of perf, which of course makes it not
+        # reproducible. We really only need the relative location 'tools/perf', so we
+        # change the Makefile line to remove everything before 'tools/perf'
+        sed -i -e "s%srcdir_SQ = \$(subst ','\\\'',\$(srcdir))%srcdir_SQ = \$(patsubst \%tools/perf,tools/perf,\$(subst ','\\\'',\$(srcdir)))%g" \
+            ${S}/tools/perf/Makefile.config
+        # Avoid hardcoded path to python-native
+        sed -i -e 's#\(PYTHON_WORD := \)$(call shell-wordify,$(PYTHON))#\1 python3#g' \
+            ${S}/tools/perf/Makefile.config
+    fi
+    if [ -e "${S}/tools/perf/tests/Build" ]; then
+        # OUTPUT is the full path, we have python on the path so we remove it from the
+        # definition. This is captured in the perf binary, so breaks reproducibility
+        sed -i -e 's,PYTHONPATH="BUILD_STR($(OUTPUT)python)",PYTHONPATH="BUILD_STR(python)",g' \
+            ${S}/tools/perf/tests/Build
+    fi
+    if [ -e "${S}/tools/perf/util/Build" ]; then
+        # To avoid bison generating #ifdefs that have captured paths, we make sure
+        # all the calls have YFLAGS, which contains prefix mapping information.
+        sed -i -e 's,$(BISON),$(BISON) $(YFLAGS),g' ${S}/tools/perf/util/Build
+    fi
+    if [ -e "${S}/scripts/Makefile.host" ]; then
+        # To avoid yacc (bison) generating #ifdefs that have captured paths, we make sure
+        # all the calls have YFLAGS, which contains prefix mapping information.
+        sed -i -e 's,$(YACC),$(YACC) $(YFLAGS),g' ${S}/scripts/Makefile.host
+    fi
+    if [ -e "${S}/tools/perf/pmu-events/Build" ]; then
+        target='$(OUTPUT)pmu-events/pmu-events.c $(V)'
+        replacement1='$(OUTPUT)pmu-events/pmu-events.c $(V)\n'
+        replacement2='\t$(srctree)/sort-pmuevents.py $(OUTPUT)pmu-events/pmu-events.c $(OUTPUT)pmu-events/pmu-events.c.new\n'
+        replacement3='\tcp $(OUTPUT)pmu-events/pmu-events.c.new $(OUTPUT)pmu-events/pmu-events.c'
+        sed -i -e "s,$target,$replacement1$replacement2$replacement3,g" \
+                       "${S}/tools/perf/pmu-events/Build"
+    fi
+    if [ -e "${S}/tools/perf/pmu-events/jevents.py" ]; then
+        sed -i -e "s#os.scandir(path)#sorted(os.scandir(path), key=lambda e: e.name)#g" \
+                       "${S}/tools/perf/pmu-events/jevents.py"
+    fi
+    if [ -e "${S}/tools/perf/arch/arm64/Makefile" ]; then
+        sed -i 's,sysdef := $(srctree)/,sysdef := ,' ${S}/tools/perf/arch/arm64/Makefile
+        sed -i 's,$(incpath) $(sysdef),$(incpath) $(srctree)/$(sysdef) $(sysdef),' ${S}/tools/perf/arch/arm64/Makefile
+    fi
+    if [ -e "${S}/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl" ]; then
+        if ! grep -q input_rel ${S}/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl; then
+            sed -i 's,input=$4,input=$4\ninput_rel=$5,' ${S}/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl
+        fi
+        sed -i 's,#include \\"\$input\\",#include \\"\$input_rel\\",'  ${S}/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl
+    fi
+    # end reproducibility substitutions
+
+    # We need to ensure the --sysroot option in CC is preserved
+    if [ -e "${S}/tools/perf/Makefile.perf" ]; then
+        sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/perf/Makefile.perf
+        sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/perf/Makefile.perf
+        sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/perf/Makefile.perf
+        sed -i 's,PKG_CONFIG = $(CROSS_COMPILE)pkg-config,#PKG_CONFIG,' ${S}/tools/perf/Makefile.perf
+    fi
+    if [ -e "${S}/tools/lib/api/Makefile" ]; then
+        sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/api/Makefile
+        sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/lib/api/Makefile
+        sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/lib/api/Makefile
+    fi
+    if [ -e "${S}/tools/lib/subcmd/Makefile" ]; then
+        sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/subcmd/Makefile
+        sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/lib/subcmd/Makefile
+    fi
+    if [ -e "${S}/tools/perf/config/feature-checks/Makefile" ]; then
+        sed -i 's,CC := $(CROSS_COMPILE)gcc -MD,CC += -MD,' ${S}/tools/perf/config/feature-checks/Makefile
+    fi
+    if [ -e "${S}/tools/build/Makefile.feature" ]; then
+        sed -i 's,CFLAGS=,CC="\$(CC)" CFLAGS=,' ${S}/tools/build/Makefile.feature
+    fi
+    # The libperl feature check produces fatal warnings due to -Werror being
+    # used, silence enough errors that the check passes.
+    sed -i 's/\(FLAGS_PERL_EMBED=.*\)/\1 -Wno-error=unused-function -Wno-error=attributes/' ${S}/tools/build/feature/Makefile
+
+    # 3.17-rc1+ has a include issue for arm/powerpc. Temporarily sed in the appropriate include
+    if [ -e "${S}/tools/perf/arch/$ARCH/util/skip-callchain-idx.c" ]; then
+        sed -i 's,#include "util/callchain.h",#include "util/callchain.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/$ARCH/util/skip-callchain-idx.c
+    fi
+    if [ -e "${S}/tools/perf/arch/arm/util/unwind-libunwind.c" ] && [ -e "${S}/tools/perf/arch/arm/tests/dwarf-unwind.c" ]; then
+        sed -i 's,#include "tests/tests.h",#include "tests/tests.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/arm/tests/dwarf-unwind.c
+        sed -i 's,#include "perf_regs.h",#include "perf_regs.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/arm/util/unwind-libunwind.c
+    fi
+
+    # use /usr/bin/env instead of version specific python
+    for s in `find ${S}/tools/perf/ -name '*.py'` `find ${S}/scripts/ -name 'bpf_helpers_doc.py'`; do
+        sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s}
+    done
+
+    # unistd.h can be out of sync between libc-headers and the captured version in the perf source
+    # so we copy it from the sysroot unistd.h to the perf unistd.h
+    install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
+    install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h
+
+    # the fetcher is inhibited by the 'inherit kernelsrc', so we do a quick check and
+    # copy for a helper script we need
+    for p in $(echo ${FILESPATH} | tr ':' '\n'); do
+        if [ -e $p/sort-pmuevents.py ]; then
+            cp $p/sort-pmuevents.py ${S}
+        fi
+    done
+}
+
+python do_package:prepend() {
+    d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+
+PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
+
+RDEPENDS:${PN} += "elfutils bash"
+RDEPENDS:${PN}-archive =+ "bash"
+RDEPENDS:${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}"
+RDEPENDS:${PN}-perl =+ "bash perl perl-modules"
+RDEPENDS:${PN}-tests =+ "python3 bash"
+
+RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl', '', d)} \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)} \
+                    "
+FILES_SOLIBSDEV = ""
+FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent* ${libdir}/libperf-jvmti.so"
+FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
+FILES:${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests"
+FILES:${PN}-python = " \
+                       ${PYTHON_SITEPACKAGES_DIR} \
+                       ${libexecdir}/perf-core/scripts/python \
+                       "
+FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl"
+
+DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized"
+
+PACKAGESPLITFUNCS =+ "perf_fix_sources"
+
+perf_fix_sources () {
+        for f in util/parse-events-flex.h util/parse-events-flex.c util/pmu-flex.c \
+                        util/pmu-flex.h util/expr-flex.h util/expr-flex.c; do
+                f=${PKGD}${TARGET_DBGSRC_DIR}/$f
+                if [ -e $f ]; then
+                        sed -i -e 's#${S}/##g' $f
+                fi
+        done
+}
diff --git a/meta-xilinx-core/recipes-kernel/perf/perf/sort-pmuevents.py b/meta-xilinx-core/recipes-kernel/perf/perf/sort-pmuevents.py
new file mode 100755
index 00000000..0362f2d8
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/perf/perf/sort-pmuevents.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+
+# perf pmu-events sorting tool
+#
+# Copyright (C) 2021 Bruce Ashfield
+#
+# SPDX-License-Identifier: MIT
+#
+
+import sys
+import os
+import re
+from collections import OrderedDict
+
+if len(sys.argv) < 2:
+    print( "[ERROR]: input and output pmu files missing" )
+    sys.exit(1)
+
+if len(sys.argv) < 3:
+    print( "[ERROR]: output pmu file missing" )
+    sys.exit(1)
+
+infile = sys.argv[1]
+outfile = sys.argv[2]
+
+if not os.path.exists(infile):
+    print( "ERROR. input file does not exist: %s" % infile )
+    sys.exit(1)
+
+if os.path.exists(outfile):
+    print( "WARNING. output file will be overwritten: %s" % infile )
+
+with open(infile, 'r') as file:
+    data = file.read()
+
+preamble_regex = re.compile( '^(.*?)^(struct|const struct|static struct|static const struct)', re.MULTILINE | re.DOTALL )
+
+preamble = re.search( preamble_regex, data )
+struct_block_regex = re.compile( '^(struct|const struct|static struct|static const struct).*?(\w+) (.*?)\[\] = {(.*?)^};', re.MULTILINE | re.DOTALL )
+field_regex =  re.compile( '{.*?},', re.MULTILINE | re.DOTALL )
+cpuid_regex = re.compile( '\.cpuid = (.*?),', re.MULTILINE | re.DOTALL )
+name_regex = re.compile( '\.name = (.*?),', re.MULTILINE | re.DOTALL )
+
+# create a dictionary structure to store all the structs, their
+# types and then their fields.
+entry_dict = {}
+for struct in re.findall( struct_block_regex, data ):
+    # print( "struct: %s %s %s" % (struct[0],struct[1],struct[2]) )
+    entry_dict[struct[2]] = {}
+    entry_dict[struct[2]]['type_prefix'] = struct[0]
+    entry_dict[struct[2]]['type'] = struct[1]
+    entry_dict[struct[2]]['fields'] = {}
+    for entry in re.findall( field_regex, struct[3] ):
+        #print( "    entry: %s" % entry )
+        cpuid = re.search( cpuid_regex, entry )
+        if cpuid:
+            #print( "    cpuid found: %s" % cpuid.group(1) )
+            entry_dict[struct[2]]['fields'][cpuid.group(1)] = entry
+
+        name = re.search( name_regex, entry )
+        if name:
+            #print( "    name found: %s" % name.group(1) )
+            entry_dict[struct[2]]['fields'][name.group(1)] = entry
+
+        # unmatched entries are most likely array terminators and
+        # should end up as the last element in the sorted list, which
+        # is achieved by using '0' as the key
+        if not cpuid and not name:
+            entry_dict[struct[2]]['fields']['0'] = entry
+
+# created ordered dictionaries from the captured values. These are ordered by
+# a sorted() iteration of the keys. We don't care about the order we read
+# things, just the sorted order. Hency why we couldn't create these during
+# reading.
+#
+# yes, there's a more concise way to do this, but our nested dictionaries of
+# fields make it complex enough that it becomes unreadable.
+entry_dict_sorted = OrderedDict()
+for i in sorted(entry_dict.keys()):
+    entry_dict_sorted[i] = {}
+    entry_dict_sorted[i]['type_prefix'] = entry_dict[i]['type_prefix']
+    entry_dict_sorted[i]['type'] = entry_dict[i]['type']
+    entry_dict_sorted[i]['fields'] = {}
+    for f in sorted(entry_dict[i]['fields'].keys()):
+        entry_dict_sorted[i]['fields'][f] = entry_dict[i]['fields'][f] 
+
+# dump the sorted elements to the outfile
+outf = open( outfile, 'w' )
+
+print( preamble.group(1) )
+outf.write( preamble.group(1) )
+for d in entry_dict_sorted:
+    outf.write( "%s %s %s[] = {\n" % (entry_dict_sorted[d]['type_prefix'], entry_dict_sorted[d]['type'],d) )
+    for f in entry_dict_sorted[d]['fields']:
+        outf.write( entry_dict_sorted[d]['fields'][f] + '\n' )
+
+    outf.write( "};\n" )
+
+outf.close()
+    
diff --git a/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio/0001-default.pai.in-disable-tsched-system-timer-based-mod.patch b/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio/0001-default.pai.in-disable-tsched-system-timer-based-mod.patch
new file mode 100644
index 00000000..c7777360
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio/0001-default.pai.in-disable-tsched-system-timer-based-mod.patch
@@ -0,0 +1,31 @@
+From 059f28d8eae7a1ef237eccbaaa7493480f83b764 Mon Sep 17 00:00:00 2001
+From: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Date: Fri, 2 Sep 2022 01:56:47 -0700
+Subject: [PATCH] default.pai.in: disable tsched (system-timer based model)
+
+With tsched enabled we see clicking noise on DisplayPort for initial 5 sec
+every time audio is played. Disabling the same fixes the issue.
+
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com>
+---
+ src/daemon/default.pa.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
+index a3ddad9..37af3f2 100755
+--- a/src/daemon/default.pa.in
++++ b/src/daemon/default.pa.in
+@@ -55,7 +55,7 @@ ifelse(@HAVE_MKFIFO@, 1, [dnl
+ ### Automatically load driver modules depending on the hardware available
+ ifelse(@HAVE_UDEV@, 1, [dnl
+ .ifexists module-udev-detect@PA_SOEXT@
+-load-module module-udev-detect
++load-module module-udev-detect tsched=0
+ .else
+ ], @HAVE_COREAUDIO@, 1, [dnl
+ .ifexists module-coreaudio-detect@PA_SOEXT@
+-- 
+2.17.1
+
diff --git a/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
new file mode 100644
index 00000000..7aae4a3a
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -0,0 +1,7 @@
+# This change appears to only affect ZynqMP configurations
+# but needs to be applied generically to all aarch64 since it affects a lot of
+# dependencies.
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append = " \
+                file://0001-default.pai.in-disable-tsched-system-timer-based-mod.patch \
+                "
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch b/meta-xilinx-core/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch
new file mode 100644
index 00000000..fac2d719
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch
@@ -0,0 +1,61 @@
+From 373923a8cddb0b1854d3040a6ba0cf016a244128 Mon Sep 17 00:00:00 2001
+From: Anil Kumar M <amamidal@xilinx.com>
+Date: Mon, 24 Feb 2020 14:45:46 +0530
+Subject: [PATCH] v4l-utils: Add support for new media bus codes
+
+Add new media bus format codes for supporting xilinx
+specific formats.
+
+Signed-off-by: Anil Kumar M <amamidal@xilinx.com>
+---
+ include/linux/media-bus-format.h | 12 ++++++++++++
+ utils/media-ctl/libv4l2subdev.c  | 11 +++++++++++
+ 2 files changed, 23 insertions(+)
+
+diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
+index d6a5a3b..3fb2346 100644
+--- a/include/linux/media-bus-format.h
++++ b/include/linux/media-bus-format.h
+@@ -108,6 +108,18 @@
+ #define MEDIA_BUS_FMT_YUV16_1X48               0x202a
+ #define MEDIA_BUS_FMT_UYYVYY16_0_5X48          0x202b
+
++/* YUV: Xilinx Specific - next is       0x2109 */
++#define MEDIA_BUS_FMT_VYYUYY8_1X24             0x2100
++#define MEDIA_BUS_FMT_VYYUYY10_4X20            0x2101
++#define MEDIA_BUS_FMT_VUY10_1X30               0x2102
++#define MEDIA_BUS_FMT_UYYVYY12_4X24            0x2103
++#define MEDIA_BUS_FMT_VUY12_1X36               0x2104
++#define MEDIA_BUS_FMT_Y16_1X16                 0x2105
++#define MEDIA_BUS_FMT_UYYVYY16_4X32            0x2106
++#define MEDIA_BUS_FMT_VUY16_1X48               0x2107
++#define MEDIA_BUS_FMT_UYVY16_2X32              0x2108
++
++
+ /* Bayer - next is     0x3021 */
+ #define MEDIA_BUS_FMT_SBGGR8_1X8               0x3001
+ #define MEDIA_BUS_FMT_SGBRG8_1X8               0x3013
+diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c
+index a989efb..a37541f 100644
+--- a/utils/media-ctl/libv4l2subdev.c
++++ b/utils/media-ctl/libv4l2subdev.c
+@@ -34,6 +34,17 @@
+
+ #include <linux/v4l2-subdev.h>
+
++/* YUV: Xilinx Specific - next is 0x2109 */
++#define MEDIA_BUS_FMT_VYYUYY8_1X24     (0x2100)
++#define MEDIA_BUS_FMT_VYYUYY10_4X20    (0x2101)
++#define MEDIA_BUS_FMT_VUY10_1X30       (0x2102)
++#define MEDIA_BUS_FMT_UYYVYY12_4X24    (0x2103)
++#define MEDIA_BUS_FMT_VUY12_1X36       (0x2104)
++#define MEDIA_BUS_FMT_Y16_1X16         (0x2105)
++#define MEDIA_BUS_FMT_UYYVYY16_4X32    (0x2106)
++#define MEDIA_BUS_FMT_VUY16_1X48       (0x2107)
++#define MEDIA_BUS_FMT_UYVY16_2X32      (0x2108)
++
+ #include "mediactl.h"
+ #include "mediactl-priv.h"
+ #include "tools.h"
+--
+2.7.4
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend b/meta-xilinx-core/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
new file mode 100644
index 00000000..3d177bce
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
@@ -0,0 +1,2 @@
+SRC_URI:append = " file://0001-v4l-utils-Add-support-for-new-media-bus-codes.patch"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0001-Add-support-for-3-planar-YUV444P-8bpc.patch b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0001-Add-support-for-3-planar-YUV444P-8bpc.patch
new file mode 100644
index 00000000..42b108fe
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0001-Add-support-for-3-planar-YUV444P-8bpc.patch
@@ -0,0 +1,39 @@
+From 4d8ac36340423844be76ceb506bc0e4f48772944 Mon Sep 17 00:00:00 2001
+From: Devarsh Thakkar <devarsh.thakkar@xilinx.com>
+Date: Tue, 7 Sep 2021 06:08:55 -0700
+Subject: [PATCH 1/2] Add support for 3 planar YUV444P 8bpc
+
+This patch adds support for single contiguous buffer 3 planar YUV444P
+8 bpc format.
+
+Signed-off-by: Devarsh Thakkar <devarsh.thakkar@xilinx.com>
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ include/linux/videodev2.h | 1 +
+ yavta.c                   | 1 +
+ 2 files changed, 2 insertions(+)
+
+Index: git/include/linux/videodev2.h
+===================================================================
+--- git.orig/include/linux/videodev2.h
++++ git/include/linux/videodev2.h
+@@ -545,6 +545,7 @@ struct v4l2_pix_format {
+ #define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
+ #define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
+ #define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
++#define V4L2_PIX_FMT_YUV444P v4l2_fourcc('4', '4', '4', 'P') /* 24  YUV444 planar */
+ #define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
+ #define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
+ #define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
+Index: git/yavta.c
+===================================================================
+--- git.orig/yavta.c
++++ git/yavta.c
+@@ -309,6 +309,7 @@ static struct v4l2_format_info {
+        { "YVYU", V4L2_PIX_FMT_YVYU, 1 },
+        { "NV12", V4L2_PIX_FMT_NV12, 1 },
+        { "NV12M", V4L2_PIX_FMT_NV12M, 2 },
++       { "YUV444P", V4L2_PIX_FMT_YUV444P, 1 },
+        { "NV21", V4L2_PIX_FMT_NV21, 1 },
+        { "NV21M", V4L2_PIX_FMT_NV21M, 2 },
+        { "NV16", V4L2_PIX_FMT_NV16, 1 },
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch
new file mode 100644
index 00000000..5dfbfa2e
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch
@@ -0,0 +1,41 @@
+From dedd0eb76ced425610bdd695029489f553923b2e Mon Sep 17 00:00:00 2001
+From: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Date: Wed, 27 Oct 2021 02:45:39 -0700
+Subject: [PATCH 2/2] Add support 3 planar YUV 444 10bpc pixel format in
+ contiguous memory
+
+The new format X403 is added to support 3 planar YUV 444 10bpc
+30 bits per sample image data in a single contiguous buffer.
+
+Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ include/linux/videodev2.h | 2 ++
+ yavta.c                   | 1 +
+ 2 files changed, 3 insertions(+)
+
+Index: git/include/linux/videodev2.h
+===================================================================
+--- git.orig/include/linux/videodev2.h
++++ git/include/linux/videodev2.h
+@@ -585,6 +585,8 @@ struct v4l2_pix_format {
+ #define V4L2_PIX_FMT_YUV444M v4l2_fourcc('Y', 'M', '2', '4') /* 24  YUV444 planar */
+ #define V4L2_PIX_FMT_YVU444M v4l2_fourcc('Y', 'M', '4', '2') /* 24  YVU444 planar */
+ 
++#define V4L2_PIX_FMT_X403    v4l2_fourcc('X', '4', '0', '3') /* 32  YUV planar 4:4:4 10-bit */
++
+ /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
+ #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
+ #define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
+Index: git/yavta.c
+===================================================================
+--- git.orig/yavta.c
++++ git/yavta.c
+@@ -324,6 +324,7 @@ static struct v4l2_format_info {
+        { "YVU420M", V4L2_PIX_FMT_YVU420M, 3 },
+        { "YVU422M", V4L2_PIX_FMT_YVU422M, 3 },
+        { "YVU444M", V4L2_PIX_FMT_YVU444M, 3 },
++       { "X403", V4L2_PIX_FMT_X403, 1 },
+        { "SBGGR8", V4L2_PIX_FMT_SBGGR8, 1 },
+        { "SGBRG8", V4L2_PIX_FMT_SGBRG8, 1 },
+        { "SGRBG8", V4L2_PIX_FMT_SGRBG8, 1 },
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta_%.bbappend b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta_%.bbappend
new file mode 100644
index 00000000..52eab13d
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append = " \
+                file://0001-Add-support-for-3-planar-YUV444P-8bpc.patch \
+                file://0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch \
+                "
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules b/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules
index 4643ad37..1e0008a0 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules
+++ b/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules
@@ -5,3 +5,6 @@ SUBSYSTEM=="allegro_decode_class", KERNEL=="allegroDecodeIP", MODE="0660", GROUP
 # Xilinx Video DMA driver
 SUBSYSTEM=="char", KERNEL=="dmaproxy", MODE="0660", GROUP="video"
 
+# Xilinx SyncIP driver
+SUBSYSTEM=="xlnxsync", KERNEL=="xlnxsync0", MODE="0660", GROUP="video"
+
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
new file mode 100644
index 00000000..35dffb16
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
@@ -0,0 +1,39 @@
+SUMMARY = "Linux kernel module for Video Code Unit"
+DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
+SECTION = "kernel/modules"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
+
+XILINX_VCU_VERSION = "1.0.0"
+PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+BRANCH = "master"
+REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
+SRCREV = "2ae83fc79f8a2db74be65883583cc6ad32d245e5"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = " \
+    ${REPO};${BRANCHARG} \
+    file://99-vcu-enc-dec.rules \
+    "
+
+inherit module features_check
+
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
+
+RDEPENDS:${PN} = "vcu-firmware"
+
+KERNEL_MODULE_AUTOLOAD += "dmaproxy"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}/udev/rules.d
+    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
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
new file mode 100644
index 00000000..420fdf1d
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2024.1.bb
@@ -0,0 +1,50 @@
+SUMMARY = "OpenMAX Integration layer for VCU"
+DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
+
+XILINX_VCU_VERSION = "1.0.0"
+PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
+SRCREV = "01e45e0ac2f869cd46286307ae94d19010fd46df"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+S  = "${WORKDIR}/git"
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "libvcu-xlnx"
+RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
+
+EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
+
+EXTRA_OEMAKE = " \
+    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
+    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
+    "
+
+do_install() {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}/vcu-omx-il
+
+    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
+
+    oe_runmake install INSTALL_PATH=${D}${bindir}
+
+    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
+    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
+    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
+}
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+
+EXCLUDE_FROM_WORLD = "1"
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
new file mode 100644
index 00000000..ac7e4aa3
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2024.1.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Control Software for VCU"
+DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
+
+XILINX_VCU_VERSION = "1.0.0"
+PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
+SRCREV = "918ec1e87c67b2746fe0f2bfa9f1503d307b9bc2"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+S  = "${WORKDIR}/git"
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+RDEPENDS:${PN} = "kernel-module-vcu"
+
+EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
+
+do_install() {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}/vcu-ctrl-sw/include
+
+    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include INSTALL_PATH=${D}/${bindir}
+    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
+    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
+}
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+
+EXCLUDE_FROM_WORLD = "1"
+
+# Disable buildpaths QA check warnings.
+INSANE_SKIP:${PN} += "buildpaths"
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
new file mode 100644
index 00000000..cc6cd5bb
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2024.1.bb
@@ -0,0 +1,38 @@
+SUMMARY = "Firmware for VCU"
+DESCRIPTION = "Firmware binaries provider for VCU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9bef8aa9d1eba8aca1b7dffdef500262"
+
+XILINX_VCU_VERSION = "1.0.0"
+PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+S  = "${WORKDIR}/git"
+
+BRANCH ?= "master"
+REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
+SRCREV = "ffe29273f378619a711aa10664612e6c660ee590"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI   = "${REPO};${BRANCHARG}"
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+do_install() {
+    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}${nonarch_base_libdir}/firmware/al5d_b.fw
+    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}${nonarch_base_libdir}/firmware/al5d.fw
+    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}${nonarch_base_libdir}/firmware/al5e_b.fw
+    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}${nonarch_base_libdir}/firmware/al5e.fw
+}
+
+# Inhibit warnings about files being stripped
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+EXCLUDE_FROM_WORLD = "1"
+
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb
index 9b835490..df943bc6 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb
@@ -28,10 +28,6 @@ EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 
 RDEPENDS:${PN} = "vdu-firmware"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 do_install:append() {
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
index 1c9ba8ad..6856ec3a 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
@@ -28,10 +28,6 @@ EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 
 RDEPENDS:${PN} = "vdu-firmware"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 do_install:append() {
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
new file mode 100644
index 00000000..0e3afbc1
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
@@ -0,0 +1,38 @@
+SUMMARY = "Linux kernel module for Video Decode Unit"
+DESCRIPTION = "Out-of-tree VDU decoder common kernel modules"
+SECTION = "kernel/modules"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
+
+XILINX_VDU_VERSION = "1.0.0"
+PV =. "${XILINX_VDU_VERSION}-xilinx-v"
+PV .= "+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+BRANCH ?= "master"
+REPO ?= "git://github.com/Xilinx/vdu-modules.git;protocol=https"
+SRCREV ?= "1529b6aaf784fb5e1cafb11c949c3cb3c69d1dfd"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG} \
+        file://99-vdu-enc-dec.rules \
+"
+
+inherit module features_check
+
+REQUIRED_MACHINE_FEATURES = "vdu"
+
+EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
+
+RDEPENDS:${PN} = "vdu-firmware"
+
+PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}/udev/rules.d
+    install -m 0644 ${WORKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb
index f9228678..c553d99b 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb
@@ -22,10 +22,6 @@ SRC_URI = "${REPO};${BRANCHARG} \
 
 S  = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 RDEPENDS:${PN} = "kernel-module-vdu"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb
index f8b36a93..5c47a81e 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb
@@ -22,10 +22,6 @@ SRC_URI = "${REPO};${BRANCHARG} \
 
 S  = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 RDEPENDS:${PN} = "kernel-module-vdu"
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
new file mode 100644
index 00000000..09a06c3e
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Control Software for VDU"
+DESCRIPTION = "Control software libraries, test applications and headers provider for VDU"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
+
+XILINX_VDU_VERSION = "1.0.0"
+PV =. "${XILINX_VDU_VERSION}-xilinx-v"
+PV .= "+git${SRCPV}"
+
+inherit autotools features_check
+
+REQUIRED_MACHINE_FEATURES = "vdu"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
+SRCREV ?= "db37dc935785dff57a52eabc41ac0bf26b0a1707"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+S  = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+
+RDEPENDS:${PN} = "kernel-module-vdu"
+
+do_compile[dirs] = "${S}"
+do_install[dirs] = "${S}"
+
+EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
+EXTRA_OEMAKE +=" INSTALL_HDR_PATH=${D}${includedir}/vdu-ctrl-sw/include INSTALL_PATH=${D}${bindir}"
+
+do_install:append() {
+
+    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
+}
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+
+EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb
index b3c02ca2..f501212d 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb
@@ -21,10 +21,6 @@ inherit autotools features_check
 
 REQUIRED_MACHINE_FEATURES = "vdu"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 DEPENDS = "libvdu-ctrlsw"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb
index 04860b79..fe66c20c 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb
@@ -21,10 +21,6 @@ inherit autotools features_check
 
 REQUIRED_MACHINE_FEATURES = "vdu"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 DEPENDS = "libvdu-ctrlsw"
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
new file mode 100644
index 00000000..51a03803
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2024.1.bb
@@ -0,0 +1,50 @@
+SUMMARY = "OpenMAX Integration layer for VDU"
+DESCRIPTION = "OMX IL Libraries,test application and headers for VDU"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
+
+XILINX_VDU_VERSION = "1.0.0"
+PV =. "${XILINX_VDU_VERSION}-xilinx-v"
+PV .= "+git${SRCPV}"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/Xilinx/vdu-omx-il.git;protocol=https"
+SRCREV ?= "a116b0729ace66117ccb7c2aca125c33994b0f41"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG} \
+          "
+S  = "${WORKDIR}/git"
+
+inherit autotools features_check
+
+REQUIRED_MACHINE_FEATURES = "vdu"
+
+PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+
+DEPENDS = "libvdu-ctrlsw"
+RDEPENDS:${PN} = "kernel-module-vdu libvdu-ctrlsw"
+
+EXTERNAL_INCLUDE="${STAGING_INCDIR}/vdu-ctrl-sw/include"
+
+do_compile[dirs] = "${S}"
+do_install[dirs] = "${S}"
+
+EXTRA_OEMAKE = " \
+    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
+    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
+    INSTALL_PATH=${D}${bindir} \
+    INCLUDE_INST_PATH=${D}${includedir} \
+    "
+
+do_install:append() {
+    install -d ${D}${libdir}
+
+    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
+    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
+}
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+
+EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
index 419dd681..bdb4a7be 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
@@ -20,10 +20,6 @@ SRCREV ?= "63fe2fce6e46d5bf03e33300a58a37d8568722ee"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
 
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
index ade73a4e..b60b66c2 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
@@ -20,10 +20,6 @@ SRCREV ?= "731897772730178f6a4e77eedeb4fb53faa1ab4d"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
 
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
new file mode 100644
index 00000000..42806ea4
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2024.1.bb
@@ -0,0 +1,38 @@
+SUMMARY = "Firmware for VDU"
+DESCRIPTION = "Firmware binaries provider for VDU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=722a9d20bf58ac06585a6d91ee36e60e"
+
+XILINX_VDU_VERSION = "1.0.0"
+PV =. "${XILINX_VDU_VERSION}-xilinx-v"
+PV .= "+git${SRCPV}"
+
+S  = "${WORKDIR}/git"
+
+inherit autotools features_check
+
+REQUIRED_MACHINE_FEATURES = "vdu"
+
+BRANCH ?= "master"
+REPO ?= "git://github.com/Xilinx/vdu-firmware.git;protocol=https"
+SRCREV ?= "7c4662d0f5b514cbb0b9890bc3011d9450bf3661"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI   = "${REPO};${BRANCHARG}"
+
+PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
+
+do_compile[noexec] = "1"
+do_install[dirs] = "${S}"
+
+# Inhibit warnings about files being stripped
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+EXCLUDE_FROM_WORLD = "1"
+
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch b/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch
deleted file mode 100644
index c7d4aefd..00000000
--- a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch
+++ /dev/null
@@ -1,370 +0,0 @@
-From 1128691f6e2709b44eccafb0b303b07da55a814e Mon Sep 17 00:00:00 2001
-From: Christian Kohn <chris.kohn@amd.com>
-Date: Mon, 17 Oct 2022 19:28:22 -0700
-Subject: [PATCH] Add initial support for Xilinx OEM FRU records
-
-The supported Xilinx OEM FRU records are MAC_ID and FREE_FORM. This FRU OEM
-extension parses these records and prints them with proper formatting.
-
-To use this feature, run the ipmi-fru command as follows:
-$ sudo ./ipmi-fru --fru-file=/sys/devices/platform/axi/ff030000.i2c/i2c-1/1-0051/eeprom \
-  --interpret-oem-data
-
-Note: The EEPROM address can vary between different platforms. This is just an
-      example.
-
-This feature has been tested with the Xilinx Kria KV260 and KR260 Starter Kits.
-
-Signed-off-by: Christian Kohn <chris.kohn@amd.com>
----
- ipmi-fru/Makefile.am                          |   2 +
- ipmi-fru/ipmi-fru-oem-xilinx.c                | 171 ++++++++++++++++++
- ipmi-fru/ipmi-fru-oem-xilinx.h                |  33 ++++
- ipmi-fru/ipmi-fru-output.c                    |  14 ++
- libfreeipmi/include/freeipmi/freeipmi.h.in    |   1 +
- .../oem/ipmi-fru-xilinx-oem-record-format.h   |  45 +++++
- .../spec/ipmi-iana-enterprise-numbers-spec.h  |   1 +
- 7 files changed, 267 insertions(+)
- create mode 100644 ipmi-fru/ipmi-fru-oem-xilinx.c
- create mode 100644 ipmi-fru/ipmi-fru-oem-xilinx.h
- create mode 100644 libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h
-
-diff --git a/ipmi-fru/Makefile.am b/ipmi-fru/Makefile.am
-index c92ba0e8c..c8545eede 100644
---- a/ipmi-fru/Makefile.am
-+++ b/ipmi-fru/Makefile.am
-@@ -25,6 +25,8 @@ ipmi_fru_SOURCES = \
-        ipmi-fru-argp.h \
-        ipmi-fru-oem-wistron.c \
-        ipmi-fru-oem-wistron.h \
-+       ipmi-fru-oem-xilinx.c \
-+       ipmi-fru-oem-xilinx.h \
-        ipmi-fru-output.c \
-        ipmi-fru-output.h
- 
-diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.c b/ipmi-fru/ipmi-fru-oem-xilinx.c
-new file mode 100644
-index 000000000..87bb18f00
---- /dev/null
-+++ b/ipmi-fru/ipmi-fru-oem-xilinx.c
-@@ -0,0 +1,171 @@
-+/*
-+ * Copyright (C) 2022, Advanced Micro Devices, Inc.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#if HAVE_CONFIG_H
-+#include "config.h"
-+#endif /* HAVE_CONFIG_H */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#if STDC_HEADERS
-+#include <string.h>
-+#endif /* STDC_HEADERS */
-+#include <assert.h>
-+
-+#include <freeipmi/freeipmi.h>
-+
-+#include "ipmi-fru_.h"
-+#include "ipmi-fru-oem-xilinx.h"
-+
-+#include "freeipmi-portability.h"
-+
-+static char *
-+_version_str (uint8_t version)
-+{
-+  switch (version)
-+    {
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_BOARD:
-+      return "Board";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_SYSCTL:
-+      return "System Controller";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_MODULE:
-+      return "Module";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_MAC:
-+      return "DUT - MAC";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT:
-+      return "DUT - EtherCAT";
-+    default:
-+      return "";
-+    }
-+
-+  return (NULL);                /* NOT REACHED */
-+}
-+
-+int
-+ipmi_fru_oem_xilinx_oem_record (ipmi_fru_state_data_t *state_data,
-+                                uint8_t record_type_id,
-+                                uint32_t manufacturer_id,
-+                                uint8_t *oem_data,
-+                                unsigned int oem_data_len)
-+{
-+  assert (state_data);
-+  assert (manufacturer_id == IPMI_IANA_ENTERPRISE_ID_XILINX);
-+  assert (oem_data);
-+
-+  /* The MAC_ID record type ID is 0xD2. The MAC ID record consists of a 1 byte
-+   * version ID followed by one or more 6-byte MAC addresses. If the MAC ID
-+   * version is set to "DUT - EtherCAT", a 4-byte EtherCAT ID is used instead of
-+   * a 6-byte MAC address.
-+   */
-+  if (record_type_id == IPMI_FRU_OEM_XILINX_MAC_ID && oem_data_len)
-+    {
-+      uint8_t version = oem_data[0];
-+      unsigned int len = oem_data_len - 1;
-+
-+      pstdout_printf (state_data->pstate,
-+                      "  FRU OEM MAC Version: %s (%xh)\n",
-+                      _version_str(version),
-+                      version);
-+
-+      /* The MAC_ID record can hold multiple MAC addresses that are 6 bytes long
-+       * each if version is set to 0x31.
-+       */
-+      if ((version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_BOARD ||
-+           version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_SYSCTL ||
-+           version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_MODULE ||
-+           version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_MAC ) &&
-+          (len % 6) == 0)
-+        {
-+          unsigned int i, j, start, stop;
-+          unsigned int mac_cnt = len / 6;
-+
-+          for (j = 0; j < mac_cnt; j++)
-+            {
-+              pstdout_printf (state_data->pstate, "  FRU OEM MAC ID %d: ", j);
-+
-+              start = j*6 + 1;
-+              stop = start + 5;
-+
-+              for (i = start; i < stop; i++)
-+                {
-+                  pstdout_printf (state_data->pstate, "%02x:", oem_data[i]);
-+                }
-+
-+              pstdout_printf (state_data->pstate, "%02x\n", oem_data[i]);
-+            }
-+
-+          return (1);
-+        }
-+
-+      /* The MAC_ID record holds one EtherCAT ID that is 4 bytes long if version
-+       * is set to 0x32. The assigned EtherCAT ID for Xilinx is 0x0000056F.
-+       */
-+      if (version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT &&
-+          len == 4)
-+        {
-+          pstdout_printf (state_data->pstate, "  FRU OEM EtherCAT ID: 0x");
-+
-+          for (unsigned int i = 1; i < len+1; i++)
-+            {
-+              pstdout_printf (state_data->pstate, "%02X", oem_data[i]);
-+            }
-+
-+          pstdout_printf (state_data->pstate, "\n");
-+
-+          return (1);
-+        }
-+    }
-+
-+  /* The free form data record type ID is 0xD3. It consists of one or more
-+   * fields where each field is split into N byte identifier and M byte data
-+   * followed by a 0x00 end of field delimiter. The below code parses the free
-+   * form record and prints each field on a new line prefixed with 'FRU OEM '.
-+   */
-+  if (record_type_id == IPMI_FRU_OEM_XILINX_FREE_FORM && oem_data_len)
-+    {
-+      unsigned int i;
-+      unsigned int new_field = 1;
-+
-+      for (i = 0; i < oem_data_len; i++)
-+        {
-+          /* 0x00 marks the end of the field */
-+          if (oem_data[i] == 0)
-+            {
-+              if (new_field == 0)
-+                {
-+                  pstdout_printf (state_data->pstate, "\n");
-+                }
-+              new_field = 1;
-+              continue;
-+            }
-+
-+          /* Start of a new field */
-+          if (new_field == 1)
-+            {
-+              new_field = 0;
-+              pstdout_printf (state_data->pstate, "  FRU OEM ");
-+            }
-+
-+          pstdout_printf (state_data->pstate, "%c", oem_data[i]);
-+        }
-+
-+      return (1);
-+    }
-+
-+  return (0);
-+}
-diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.h b/ipmi-fru/ipmi-fru-oem-xilinx.h
-new file mode 100644
-index 000000000..2484cd515
---- /dev/null
-+++ b/ipmi-fru/ipmi-fru-oem-xilinx.h
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright (C) 2022, Advanced Micro Devices, Inc.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#ifndef IPMI_FRU_OEM_XILINX_H
-+#define IPMI_FRU_OEM_XILINX_H
-+
-+#include <freeipmi/freeipmi.h>
-+
-+#include "ipmi-fru_.h"
-+
-+/* Returns 1 on interpretation, 0 if not, -1 on error */
-+int ipmi_fru_oem_xilinx_oem_record (ipmi_fru_state_data_t *state_data,
-+                                    uint8_t record_type_id,
-+                                    uint32_t manufacturer_id,
-+                                    uint8_t *oem_data,
-+                                    unsigned int oem_data_len);
-+
-+#endif /* IPMI_FRU_OEM_XILINX_H */
-diff --git a/ipmi-fru/ipmi-fru-output.c b/ipmi-fru/ipmi-fru-output.c
-index 845971018..d29c4470e 100644
---- a/ipmi-fru/ipmi-fru-output.c
-+++ b/ipmi-fru/ipmi-fru-output.c
-@@ -51,6 +51,7 @@
- #include "ipmi-fru_.h"
- #include "ipmi-fru-output.h"
- #include "ipmi-fru-oem-wistron.h"
-+#include "ipmi-fru-oem-xilinx.h"
- #include "tool-util-common.h"
- 
- #include "freeipmi-portability.h"
-@@ -1201,6 +1202,19 @@ ipmi_fru_output_oem_record (ipmi_fru_state_data_t *state_data,
-           if (ret)
-             return (0);
-         }
-+
-+      if (manufacturer_id == IPMI_IANA_ENTERPRISE_ID_XILINX)
-+        {
-+          if ((ret = ipmi_fru_oem_xilinx_oem_record (state_data,
-+                                                     record_type_id,
-+                                                     manufacturer_id,
-+                                                     oem_data,
-+                                                     oem_data_len)) < 0)
-+            return (-1);
-+
-+          if (ret)
-+            return (0);
-+        }
-     }
- 
-   if (oem_data_len)
-diff --git a/libfreeipmi/include/freeipmi/freeipmi.h.in b/libfreeipmi/include/freeipmi/freeipmi.h.in
-index a03178e97..fbd6749e9 100644
---- a/libfreeipmi/include/freeipmi/freeipmi.h.in
-+++ b/libfreeipmi/include/freeipmi/freeipmi.h.in
-@@ -82,6 +82,7 @@ extern "C" {
- #include <freeipmi/record-format/ipmi-sdr-record-format.h>
- #include <freeipmi/record-format/ipmi-sel-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-fru-wistron-oem-record-format.h>
-+#include <freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-sdr-oem-intel-node-manager-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-sdr-oem-intel-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-sel-oem-intel-record-format.h>
-diff --git a/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h b/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h
-new file mode 100644
-index 000000000..434e2031a
---- /dev/null
-+++ b/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h
-@@ -0,0 +1,45 @@
-+/*
-+ * Copyright (C) 2022, Advanced Micro Devices, Inc.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#ifndef IPMI_FRU_OEM_XILINX_RECORD_FORMAT_H
-+#define IPMI_FRU_OEM_XILINX_RECORD_FORMAT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <freeipmi/fiid/fiid.h>
-+
-+/* OEM multi-record IDs used by Xilinx */
-+#define IPMI_FRU_OEM_XILINX_THERMAL   0xD0
-+#define IPMI_FRU_OEM_XILINX_POWER     0xD1
-+#define IPMI_FRU_OEM_XILINX_MAC_ID    0xD2
-+#define IPMI_FRU_OEM_XILINX_FREE_FORM 0xD3
-+
-+/* OEM MAC ID versions used by Xilinx */
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_BOARD        0x01
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_SYSCTL       0x11
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_MODULE       0x21
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_MAC      0x31
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT 0x32
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* IPMI_FRU_OEM_XILINX_RECORD_FORMAT_H */
-diff --git a/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h b/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h
-index d286f33a4..4c24b5259 100644
---- a/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h
-+++ b/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h
-@@ -29,6 +29,7 @@ extern "C" {
- #define IPMI_IANA_ENTERPRISE_ID_SUN_MICROSYSTEMS         42
- #define IPMI_IANA_ENTERPRISE_ID_INTEL                   343
- #define IPMI_IANA_ENTERPRISE_ID_DELL                    674
-+#define IPMI_IANA_ENTERPRISE_ID_XILINX                 4314
- #define IPMI_IANA_ENTERPRISE_ID_MAGNUM_TECHNOLOGIES    5593
- #define IPMI_IANA_ENTERPRISE_ID_QUANTA                 7244
- #define IPMI_IANA_ENTERPRISE_ID_FUJITSU               10368
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch b/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch
deleted file mode 100644
index c0f36405..00000000
--- a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c578c999b7d9aabbd6e54b0310a609b8f96ae962 Mon Sep 17 00:00:00 2001
-From: Albert Chu <chu11@llnl.gov>
-Date: Tue, 8 Nov 2022 16:33:39 -0800
-Subject: [PATCH] ipmi-fru: fix compilation for non C99 compilation
-
----
- ipmi-fru/ipmi-fru-oem-xilinx.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.c b/ipmi-fru/ipmi-fru-oem-xilinx.c
-index 87bb18f00..937aa7614 100644
---- a/ipmi-fru/ipmi-fru-oem-xilinx.c
-+++ b/ipmi-fru/ipmi-fru-oem-xilinx.c
-@@ -118,9 +118,11 @@ ipmi_fru_oem_xilinx_oem_record (ipmi_fru_state_data_t *state_data,
-       if (version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT &&
-           len == 4)
-         {
-+          unsigned int i;
-+
-           pstdout_printf (state_data->pstate, "  FRU OEM EtherCAT ID: 0x");
- 
--          for (unsigned int i = 1; i < len+1; i++)
-+          for (i = 1; i < len+1; i++)
-             {
-               pstdout_printf (state_data->pstate, "%02X", oem_data[i]);
-             }
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb b/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
index db4f25b4..0da7b6f6 100644
--- a/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
+++ b/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
@@ -31,10 +31,8 @@ LIC_FILES_CHKSUM = " \
 BRANCH ?= "freeipmi-1-6-0-stable"
 SRC_URI = " \
         git://git.savannah.gnu.org/git/freeipmi.git;protocol=https;branch=${BRANCH} \
-        file://0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch \
-        file://0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch \
         "
-SRCREV ?= "1f7eea294c2967802019100b07cf1e44b3160a2b"
+SRCREV ?= "816a69eb15a9034351381211d9cd15de81da10c7"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_git.bb
new file mode 100644
index 00000000..e0edbb7b
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_git.bb
@@ -0,0 +1,29 @@
+SUMMARY  = "Xilinx Runtime(XRT) - minimal native build for xclbinutil"
+DESCRIPTION = "Native build of xclbinutil using XRT codebase"
+
+require xrt.inc
+
+FILESEXTRAPATHS:append := ":${THISDIR}/xrt"
+
+LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = " \
+    file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
+    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
+    file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \
+"
+
+S = "${WORKDIR}/git/src"
+
+inherit cmake pkgconfig native
+
+DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native"
+
+EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
+}
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
index 14b2b968..89dc87cc 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
@@ -2,9 +2,9 @@ REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG};name=xrt"
 
-BRANCH= "2023.2"
-SRCREV_xrt = "2865a62b6a417dea523d2d5646154aa94a2cbc28"
-PV = "202320.2.16.0"
+BRANCH= "master"
+SRCREV_xrt = "8426f5733c01018acbd8d12745bc9e5ffc4535e6"
+PV = "202320.2.17.0"
 
 SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https"
 SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt/disable_aie_profiling.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt/disable_aie_profiling.patch
new file mode 100644
index 00000000..f2f63470
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt/disable_aie_profiling.patch
@@ -0,0 +1,17 @@
+diff --git a/src/runtime_src/xdp/profile/plugin/CMakeLists.txt b/src/runtime_src/xdp/profile/plugin/CMakeLists.txt
+index 8ef7a2f..9b8baac 100644
+--- a/src/runtime_src/xdp/profile/plugin/CMakeLists.txt
++++ b/src/runtime_src/xdp/profile/plugin/CMakeLists.txt
+@@ -33,9 +33,9 @@ if (NOT WIN32)
+ # =========================================================
+ # The plugins to be built on Linux only
+ # =========================================================
+-add_subdirectory(aie_status)
+-add_subdirectory(aie_profile)
+-add_subdirectory(aie_trace)
++#add_subdirectory(aie_status)
++#add_subdirectory(aie_profile)
++#add_subdirectory(aie_trace)
+ add_subdirectory(device_offload/hw_emu)
+ add_subdirectory(noc)
+ add_subdirectory(power)
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
index ef3c7172..bd6f3796 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
 
 require xrt.inc
 
-SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
+SRC_URI += "file://disable_aie_profiling.patch;striplevel=2"
 
 LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
@@ -24,7 +24,7 @@ inherit cmake pkgconfig
 BBCLASSEXTEND = "native nativesdk"
 
 # util-linux is for libuuid-dev.
-DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson"
+DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson systemtap"
 RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
 
 EXTRA_OECMAKE += " \
diff --git a/meta-xilinx-standalone-experimental/README.md b/meta-xilinx-standalone-experimental/README.md
index 31aa0f63..1c80dc8f 100644
--- a/meta-xilinx-standalone-experimental/README.md
+++ b/meta-xilinx-standalone-experimental/README.md
@@ -1,44 +1,150 @@
 # meta-xilinx-standalone-experimental
 
-This layer contains experimental items that may eventually be added
-to the meta-xilinx-standalone layer.  The components in this layer
-may or may not be buildable as they may require unreleased code.
+This layer contains experimental items that may eventually be added to the
+meta-xilinx-standalone layer.  The components in this layer may or may not be
+buildable as they may require unreleased code.
 
-The non-Linux software components are still in development and
-this should be considered to be a preview release only.  For instance,
-some components may not be buildable, expect APIs to change on various
-parts and pieces.
+The non-Linux software components are still in development and this should be
+considered to be a preview release only.  For instance, some components may not
+be buildable, expect APIs to change on various parts and pieces.
 
 ## Build Instructions
 
-**Note:** to use this layer you must REMOVE meta-xilinx-tools from your
-project.  meta-xilinx-tools is not compatible with this experimental
-approach.  You may also have to remove other layers that depend
-on meta-xilinx-tools, such as meta-kria and meta-system-controller.
+> **Note:**
+> * To use this layer you must REMOVE meta-xilinx-tools from your project.
+meta-xilinx-tools is not compatible with this experimental approach. You may
+also have to remove other layers that depend on meta-xilinx-tools, such as
+meta-kria and meta-system-controller.
+> * To use the experimental version of the embedded software (firmware) as well
+as system configuration, you must build through gen-machineconf tool. This tool
+is passed a output of system device tree directory.
 
-To use the experimental version of the embedded software (firmware)
-as well as system configuration, you must build the 'meta-xilinx-setup'
-SDK.  This SDK is passed a device tree, constructed from System Device tree and
-produces a number of configuration files.
+The Yocto Project setup for the System Device Tree (SDT) workflow is as follows.
+Be sure to read everything below.
+
+1. Follow [Building Instructions](https://github.com/Xilinx/meta-xilinx/blob/master/README.building.md)
+   upto step 4.
+
+2. Remove meta-xilinx-tools and meta-xilinx-tools dependency layers(such as
+   meta-kria and meta-system-controller if included in bblayers.conf), then add
+   the meta-xilinx-standalone-experimental layer.
+
+> **Note:** SDT builds for following devices are not supported in 2024.1 release.
+> * Zynq 7000
+> * MicoBlaze
+> * Kria
+> * System Controller
 
-1. Remove meta-xilinx-tools, meta-kria and meta-system-controller, then add the decoupling layer
 ```
 $ bitbake-layers remove-layer meta-xilinx-tools
 $ bitbake-layers remove-layer meta-kria
 $ bitbake-layers remove-layer meta-system-controller
 $ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-xilinx-standalone-experimental
 ```
-2. Build the setup SDK
+
+3. Export gen-machineconf tool.
 ```
-$ bitbake meta-xilinx-setup
+$ export PATH=$PATH:<ABSOLUTE_PATH>/gen-machine-conf
 ```
-3. Install the setup SDK:
+
+4. Run the script from the build or ${TOPDIR} directory. This step describes
+   System Device Tree (SDT) with and without pl overlays. Configruations are same
+   for both SDT with and without pl overlays except for linux dts content.
+
+> **Note:**
+> 1. The -l option will automatically add the necessary parameters to the
+   local.conf file.  If you need to re-run this comment, you just clear the
+   parameters from the end of the file.  Without the -l option the items are
+   printed to the screen and must be manually added to your conf/local.conf
+> 2. The --soc-family argument is an optional argument and user can skip this.
+> 3. By default minimal set of multiconfigs are generated by gen-machineconf tool.
+>    To enable full multiconfig(APU/RPU baremetal or FreeRTOS) then use
+>    `--multiconfigfull` option.
+
+   a. Without SDT pl overlay:
 ```
-$ .${TMPDIR}/tmp/deploy/sdk/x86_64-xilinx-nativesdk-prestep-2023.2....sh -d prestep -y
+ $ gen-machineconf --hw-description <path_to_sdtgen_output_directory> -c <conf> -l conf/local.conf
+```
+
+   b. With SDT pl overlay:
+      To generate SDT pl overlay run gen-machineconf command with
+      `-g {full|dfx}` option. Once SDT pl overlay command is executed successfully
+      pl.dtsi will be generated under <conf>/dts/${MACHINE}/pl-overlay-{full|dfx}
+      directory. User can use this pl.dtsi as input to full or dfx static firmware
+      recipes.
+
+> **Note:** DFx partial dtsi is not processed by gen-machineconf(lopper) tool, User
+>          needs to use the *_partial.dtsi and *_partial.pdi/bit from sdtgen output
+>          artifacts to DFx partial firmware recipes.
+
+   * ZynqMP Full bitstream or Versal Segmented Configuration:
+```
+ $ gen-machineconf parse-sdt --hw-description <path_to_sdtgen_output_directory> -c <conf> -l conf/local.conf -g full
+```
+
+   * ZynqMP or Versal DFx:
+```
+ $ gen-machineconf parse-sdt --hw-description <path_to_sdtgen_output_directory> -c <conf> -l conf/local.conf -g dfx
+```
+
+For example, zynqmp:
 ```
+$ gen-machineconf --soc-family zynqmp --hw-description <path_to_sdtgen_output_directory> -c conf/ -l conf/local.conf
+```
+The following will be written to the end of the conf/local.conf file:
+
+```
+# Use the newly generated MACHINE
+MACHINE = "xlnx-zynqmp-zcu102-rev1-0"
+
+# Avoid errors in some baremetal configs as these layers may be present
+# but are not used.  Note the following lines are optional and can be
+# safetly disabled.
+SKIP_META_VIRT_SANITY_CHECK = "1"
+SKIP_META_SECURITY_SANITY_CHECK = "1"
+SKIP_META_TPM_SANITY_CHECK = "1"
+
+# Each generated multiconfig defines it's own TMPDIR, either edit the
+# multiconfig files, or uncomment and adjust MC_TMPDIR_PREFIX below
+#MC_TMPDIR_PREFIX = "${TOPDIR}/tmp"
+```
+
+For example, versal:
+```
+$ gen-machineconf --soc-family versal --hw-description <path_to_sdtgen_output_directory> -c conf/ -l conf/local.conf
+```
+
+The following will be written to the end of the conf/local.conf file:
+
+```
+# Use the newly generated MACHINE
+MACHINE = "xlnx-versal-vmk180-rev1-1-x-ebm-01-reva"
+
+# Avoid errors in some baremetal configs as these layers may be present
+# but are not used.  Note the following lines are optional and can be
+# safetly disabled.
+SKIP_META_VIRT_SANITY_CHECK = "1"
+SKIP_META_SECURITY_SANITY_CHECK = "1"
+SKIP_META_TPM_SANITY_CHECK = "1"
+
+# Each generated multiconfig defines it's own TMPDIR, either edit the
+# multiconfig files, or uncomment and adjust MC_TMPDIR_PREFIX below
+#MC_TMPDIR_PREFIX = "${TOPDIR}/tmp"
+```
+> **Bitbake Performance Note:**
+Each BBMULTICONFIG value requires all of the recipes to be parsed for that
+configuration.  Thus each multiconfig will add more parsing time.  A long list
+can lead to a very slow parse (many minutes).  To speed up parsing, it is
+suggested that you trim this down to only the configurations you require.
+A minimum configuration is included with the generated configuration.
+
 
-Then follow the instructions in the 'prestep/README-setup' file.
+5. Build your project, You should now be able to build your project normally.
+   See the Yocto Project documentation if you have questions on how to work with
+   the multiconfig recipes. The following is a simple build for testing.
 
+6. Continue [Building Instructions](https://github.com/Xilinx/meta-xilinx/blob/master/README.building.md)
+   from step 6.
 
 ## Dependencies
 
@@ -58,3 +164,5 @@ This layer depends on:
         layers: meta-xilinx-core, meta-xilinx-bsp, meta-xilinx-standalone
         branch: langdale or amd xilinx release version (e.g. rel-v2023.1)
 
+       URI: https://git.yoctoproject.org/meta-virtualization
+       branch: langdale
diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes-recipe/esw.bbclass
index febdebad..f13df66b 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes-recipe/esw.bbclass
@@ -2,9 +2,6 @@ PV = "${ESW_VER}"
 
 inherit python3native xlnx-embeddedsw pkgconfig cmake
 
-# Override xlnx-embeddedsw with out version
-require conf/dtb-embeddedsw.inc
-
 SRCREV_FORMAT = "src_decouple"
 
 S = "${WORKDIR}/git"
@@ -35,37 +32,43 @@ do_configure[depends] += "device-tree:do_deploy"
 do_compile[depends] += "device-tree:do_deploy"
 do_install[depends] += "device-tree:do_deploy"
 
-def get_xlnx_cmake_machine(fam, d):
+def get_xlnx_cmake_machine(fam, variant, d):
     cmake_machine = fam
     if (fam == 'zynqmp'):
         cmake_machine = 'ZynqMP'
     elif (fam == 'versal'):
         cmake_machine = 'Versal'
+        if (variant == 'net'):
+            cmake_machine = 'VersalNet'
     elif (fam == 'zynq'):
         cmake_machine = 'Zynq'
     return cmake_machine
 
-def get_xlnx_cmake_processor(tune, machine, d):
+def get_xlnx_cmake_processor(tune, machine, variant, d):
     cmake_processor = tune
     if tune.startswith('microblaze'):
         if (machine == 'psu_pmu_0'):
             cmake_processor = 'pmu_microblaze'
-        elif (machine == 'psv_pmc_0'):
+        elif (machine in [ 'psv_pmc_0', 'psx_pmc_0' ]):
             cmake_processor = 'plm_microblaze'
         else:
             cmake_processor = 'microblaze'
-    elif tune == 'cortexr5':
+    elif (tune in [ 'cortexr5', 'cortexr5hf' ]):
         cmake_processor = 'cortexr5'
+    elif (tune in [ 'cortexr52', 'cortexr52hf' ]):
+        cmake_processor = 'cortexr52'
     elif tune.startswith('cortexa9'):
         cmake_processor = 'cortexa9'
     elif (tune in [ 'cortexa53', 'cortexa72-cortexa53' ]):
         cmake_processor = 'cortexa53'
     elif tune == 'cortexa72':
         cmake_processor = 'cortexa72'
+        if (variant == 'net'):
+            cmake_processor = 'cortexa78'
     return cmake_processor
 
-XLNX_CMAKE_MACHINE = "${@get_xlnx_cmake_machine(d.getVar('SOC_FAMILY'), d)}"
-XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('ESW_MACHINE'), d)}"
+XLNX_CMAKE_MACHINE = "${@get_xlnx_cmake_machine(d.getVar('SOC_FAMILY'), d.getVar('SOC_VARIANT'), d)}"
+XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('ESW_MACHINE'), d.getVar('SOC_VARIANT'), d)}"
 XLNX_CMAKE_SYSTEM_NAME ?= "Generic"
 XLNX_CMAKE_BSP_VARS ?= ""
 
@@ -80,11 +83,11 @@ cmake_do_generate_toolchain_file:append() {
     # set( CMAKE_SYSTEM_NAME `echo elf | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` )
     set( CMAKE_SYSTEM_NAME "${XLNX_CMAKE_SYSTEM_NAME}" )
     set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${S}/cmake)
-    set( CMAKE_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR})
+    set( CMAKE_LIBRARY_PATH ${B})
     if ("${XLNX_CMAKE_PROCESSOR}" STREQUAL "plm_microblaze")
         set( CMAKE_BUILD_TYPE Release)
     endif()
-    add_definitions( "${XLNX_CMAKE_BSP_VARS}" )
+    add_definitions( "${XLNX_CMAKE_BSP_VARS} -DSDT" )
 EOF
 }
 
@@ -96,6 +99,15 @@ do_install() {
 }
 
 CFLAGS:append = " ${ESW_CFLAGS}"
+EXTRA_OECMAKE += "-DYOCTO=ON"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx ${ESW_MACHINE} ${S}/lib/bsp/standalone/src/ hwcmake_metadata ${S}
+    install -m 0755 StandaloneExample.cmake ${S}/cmake/Findcommonmeta.cmake
+    )
+}
 
 # We need to find the license file, which vaires depending on the component
 # recurse a maximum of x times, could be fancier but it gets complicated since
@@ -135,9 +147,9 @@ python do_generate_driver_data() {
     os.chdir(d.getVar('B'))
     command = ["lopper"] + ["-f"] + [system_dt[0]] + ["--"] + ["baremetalconfig_xlnx.py"] + [machine] + [src_dir[0]]
     subprocess.run(command, check = True)
-    src_file = str("x") + driver_name.replace('-', '_') + str("_g.c")
-    if os.path.exists(src_file):
+    src_file = glob.glob('*_g.c')
+    if os.path.exists(src_file[0]):
          bb.note("Generated config file for driver %s" % driver_name)
-         command = ["install"] + ["-m"] + ["0755"] + [src_file] + [src_dir[0]]
+         command = ["install"] + ["-m"] + ["0755"] + [src_file[0]] + [src_dir[0]]
          subprocess.run(command, check = True)
 }
diff --git a/meta-xilinx-standalone-experimental/classes-recipe/esw_apps_common.bbclass b/meta-xilinx-standalone-experimental/classes-recipe/esw_apps_common.bbclass
new file mode 100644
index 00000000..85b753a5
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/classes-recipe/esw_apps_common.bbclass
@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This bbclass is inherited by esw application recipes. This class provides
+# common code for elf name, bitbake install and deploy task functionality for
+# multiconfig target images.
+
+inherit deploy image-artifact-names
+
+APP_IMAGE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${BB_CURRENT_MC}${IMAGE_VERSION_SUFFIX}"
+
+ESW_EXECUTABLE_NAME ?= ""
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    # Note that we have to make the ELF executable for it to be stripped
+    install -m 0755  ${B}/${ESW_EXECUTABLE_NAME}* ${D}/${base_libdir}/firmware
+}
+
+do_deploy() {
+    # We need to deploy the stripped elf, hence why not doing it from ${D}
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.elf ${DEPLOYDIR}/${APP_IMAGE_NAME}.elf
+    ln -sf ${APP_IMAGE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}-${BB_CURRENT_MC}.elf
+    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.elf ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.bin
+    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.bin ${DEPLOYDIR}/${APP_IMAGE_NAME}.bin
+    ln -sf ${APP_IMAGE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}-${BB_CURRENT_MC}.bin
+}
+
+addtask deploy before do_build after do_package
diff --git a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass b/meta-xilinx-standalone-experimental/classes-recipe/esw_examples.bbclass
index 43e78191..9a94f3cd 100644
--- a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
+++ b/meta-xilinx-standalone-experimental/classes-recipe/esw_examples.bbclass
@@ -7,6 +7,7 @@ do_configure:prepend() {
     cd ${S}
     lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
     install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
     )
 }
 
diff --git a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
deleted file mode 100644
index a9192f62..00000000
--- a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-# The format of this file must be compatible with
-# meta-xilinx/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
-
-# Make it clear decoupling is 'experimental' in the version
-ESW_VER = "2023_sdt_experimental"
-
-REPO = "git://github.com/Xilinx/embeddedsw-experimental-dt-support.git;protocol=https"
-
-ESW_BRANCH[2023_sdt_experimental] = "xlnx_rel_v2023.2_sdt"
-ESW_REV[2023_sdt_experimental] = "742a608800e7621fb7c376daf5124333b5826d6d"
-LIC_FILES_CHKSUM[xlnx_rel_v2023.2_sdt] = 'ce611484168a6000bd35df68fc4f4290'
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/ddr-self-refresh/ddr-self-refresh_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/ddr-self-refresh/ddr-self-refresh_2024.1.bb
new file mode 100644
index 00000000..4287bb0a
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/ddr-self-refresh/ddr-self-refresh_2024.1.bb
@@ -0,0 +1,29 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/ddr_self_refresh/src/"
+
+DEPENDS += "libxil xiltimer xilpm"
+
+ESW_EXECUTABLE_NAME = "ddr_self_refresh"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/ddr_self_refresh*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_2024.1.bb
index d62779ae..2c70796a 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_2024.1.bb
@@ -1,11 +1,9 @@
-inherit esw deploy
+inherit esw deploy python3native
 
 ESW_COMPONENT_SRC = "/lib/sw_apps/empty_application/src/"
 
 DEPENDS += "libxil xiltimer"
 
-inherit python3native
-
 do_configure:prepend() {
     (
     cd ${S}
@@ -24,7 +22,7 @@ EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
 
 inherit image-artifact-names
 
-CUSTOM_APP_BASE_NAME ?= "${CUSTOM_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
+CUSTOM_APP_BASE_NAME ?= "${CUSTOM_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${BB_CURRENT_MC}${IMAGE_VERSION_SUFFIX}"
 
 ESW_COMPONENT ??= "empty_application.elf"
 
@@ -38,8 +36,8 @@ do_install() {
 
 do_deploy() {
     install -Dm 0644 ${B}/${ESW_COMPONENT} ${DEPLOYDIR}/${CUSTOM_APP_BASE_NAME}.elf
-    ln -sf ${CUSTOM_APP_BASE_NAME}.elf ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}.elf
+    ln -sf ${CUSTOM_APP_BASE_NAME}.elf ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}-${MACHINE}-${BB_CURRENT_MC}.elf
     install -m 0644 ${B}/empty_application.bin ${DEPLOYDIR}/${CUSTOM_APP_BASE_NAME}.bin
-    ln -sf ${CUSTOM_APP_BASE_NAME}.bin ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}.bin
+    ln -sf ${CUSTOM_APP_BASE_NAME}.bin ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}-${MACHINE}-${BB_CURRENT_MC}.bin
 }
 addtask deploy before do_build after do_install
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_2024.1.bb
new file mode 100644
index 00000000..97d2ba0a
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_2024.1.bb
@@ -0,0 +1,19 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_hello_world/src/"
+
+DEPENDS += "libxil xilstandalone freertos10-xilinx xiltimer"
+
+ESW_EXECUTABLE_NAME = "freertos_hello_world"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    )
+}
+
+FILES:${PN} = "${base_libdir}/firmware/freertos_hello_world*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb
deleted file mode 100644
index 8106684b..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_hello_world/src/"
-
-DEPENDS += "libxil xilstandalone freertos10-xilinx xiltimer"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    )
-}
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_hello_world* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-FREERTOS_HELLO_WORLD_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.elf ${DEPLOYDIR}/${FREERTOS_HELLO_WORLD_BASE_NAME}.elf
-    ln -sf ${FREERTOS_HELLO_WORLD_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf 
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.bin ${DEPLOYDIR}/${FREERTOS_HELLO_WORLD_BASE_NAME}.bin
-    ln -sf ${FREERTOS_HELLO_WORLD_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/freertos_hello_world*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_2024.1.bb
new file mode 100644
index 00000000..58d5b9c7
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_echo_server/src/"
+
+DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
+
+ESW_EXECUTABLE_NAME = "freertos_lwip_echo_server"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_echo*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb
deleted file mode 100644
index f7eae1dc..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_echo_server/src/"
-
-DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    )
-}
-
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_lwip_echo* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-FREERTOS_LWIP_ECHO_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.elf ${DEPLOYDIR}/${FREERTOS_LWIP_ECHO_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_ECHO_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.bin ${DEPLOYDIR}/${FREERTOS_LWIP_ECHO_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_ECHO_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_echo*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_2024.1.bb
new file mode 100644
index 00000000..5c00254c
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_client/src/"
+
+DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
+
+ESW_EXECUTABLE_NAME = "freertos_lwip_tcp_perf_client"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb
deleted file mode 100644
index 51b89b8e..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_client/src/"
-
-DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    )
-}
-
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_lwip_tcp_perf_client* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.elf ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.bin ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_2024.1.bb
new file mode 100644
index 00000000..910a6fa2
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_server/src/"
+
+DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
+
+ESW_EXECUTABLE_NAME = "freertos_lwip_tcp_perf_server"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb
deleted file mode 100644
index 606fd01e..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_server/src/"
-
-DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    )
-}
-
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_lwip_tcp_perf_server* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.elf ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.bin ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_2024.1.bb
new file mode 100644
index 00000000..c20d640d
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_client/src/"
+
+DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
+
+ESW_EXECUTABLE_NAME = "freertos_lwip_udp_perf_client"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb
deleted file mode 100644
index 7f9d86e2..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_client/src/"
-
-DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_lwip_udp_perf_client* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.elf ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.bin ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_2024.1.bb
new file mode 100644
index 00000000..194b0565
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_server/src/"
+
+DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
+
+ESW_EXECUTABLE_NAME = "freertos_lwip_udp_perf_server"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb
deleted file mode 100644
index 4fc02f36..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_server/src/"
-
-DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_lwip_udp_perf_server* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.elf ${DEPLOYDIR}/${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.bin ${DEPLOYDIR}/${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_2024.1.bb
new file mode 100644
index 00000000..ee0afec5
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_2024.1.bb
@@ -0,0 +1,22 @@
+inherit esw deploy python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/hello_world/src/"
+
+DEPENDS += "libxil xiltimer"
+
+ESW_EXECUTABLE_NAME = "hello_world"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+FILES:${PN} = "${base_libdir}/firmware/hello_world*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb
deleted file mode 100644
index 1de5ef8c..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-inherit esw deploy
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/hello_world/src/"
-
-DEPENDS += "libxil xiltimer"
-
-inherit python3native
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/hello_world* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-HELLO_WORLD_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-ESW_CUSTOM_LINKER_FILE ?= "None"
-EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/hello_world.elf ${DEPLOYDIR}/${HELLO_WORLD_BASE_NAME}.elf
-    ln -sf ${HELLO_WORLD_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/hello_world.elf ${WORKDIR}/package/${base_libdir}/firmware/hello_world.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/hello_world.bin ${DEPLOYDIR}/${HELLO_WORLD_BASE_NAME}.bin
-    ln -sf ${HELLO_WORLD_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/hello_world*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_2024.1.bb
new file mode 100644
index 00000000..f3397f7f
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_echo_server/src/"
+
+DEPENDS += "libxil lwip xiltimer"
+
+ESW_EXECUTABLE_NAME = "lwip_echo_server"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/lwip_echo*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb
deleted file mode 100644
index c59d816e..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_echo_server/src/"
-
-DEPENDS += "libxil lwip xiltimer"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/lwip_echo* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-LWIP_ECHO_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo_server.elf ${DEPLOYDIR}/${LWIP_ECHO_BASE_NAME}.elf
-    ln -sf ${LWIP_ECHO_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo_server.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo.bin ${DEPLOYDIR}/${LWIP_ECHO_BASE_NAME}.bin
-    ln -sf ${LWIP_ECHO_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/lwip_echo*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_2024.1.bb
new file mode 100644
index 00000000..bc90046e
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_client/src/"
+
+DEPENDS += "libxil lwip xiltimer"
+
+ESW_EXECUTABLE_NAME = "lwip_tcp_perf_client"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb
deleted file mode 100644
index b9834e34..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_client/src/"
-
-DEPENDS += "libxil lwip xiltimer"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/lwip_tcp_perf_client* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-LWIP_TCP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.elf ${DEPLOYDIR}/${LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.bin ${DEPLOYDIR}/${LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_2024.1.bb
new file mode 100644
index 00000000..5c9cd5fa
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_server/src/"
+
+DEPENDS += "libxil lwip xiltimer"
+
+ESW_EXECUTABLE_NAME = "lwip_tcp_perf_server"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb
deleted file mode 100644
index 0acc4b8f..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_server/src/"
-
-DEPENDS += "libxil lwip xiltimer"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/lwip_tcp_perf_server* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-LWIP_TCP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.elf ${DEPLOYDIR}/${LWIP_TCP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${LWIP_TCP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.bin ${DEPLOYDIR}/${LWIP_TCP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${LWIP_TCP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_2024.1.bb
new file mode 100644
index 00000000..2855b08c
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_client/src/"
+
+DEPENDS += "libxil lwip xiltimer"
+
+ESW_EXECUTABLE_NAME = "lwip_udp_perf_client"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb
deleted file mode 100644
index 00a9eaa6..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_client/src/"
-
-DEPENDS += "libxil lwip xiltimer"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/lwip_udp_perf_client* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-LWIP_UDP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.elf ${DEPLOYDIR}/${LWIP_UDP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${LWIP_UDP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.bin ${DEPLOYDIR}/${LWIP_UDP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${LWIP_UDP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_2024.1.bb
new file mode 100644
index 00000000..149e7a6c
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_server/src/"
+
+DEPENDS += "libxil lwip xiltimer"
+
+ESW_EXECUTABLE_NAME = "lwip_udp_perf_server"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb
deleted file mode 100644
index 5f54caf9..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_server/src/"
-
-DEPENDS += "libxil lwip xiltimer"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/lwip_udp_perf_server* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-LWIP_UDP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.elf ${DEPLOYDIR}/${LWIP_UDP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${LWIP_UDP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.bin ${DEPLOYDIR}/${LWIP_UDP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${LWIP_UDP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_2024.1.bb
new file mode 100644
index 00000000..8420171b
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_2024.1.bb
@@ -0,0 +1,19 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/memory_tests/src/"
+
+DEPENDS += "libxil xiltimer"
+
+ESW_EXECUTABLE_NAME = "memory_tests"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} memtest
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+FILES:${PN} = "${base_libdir}/firmware/memory_tests*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb
deleted file mode 100644
index 1ece5a8c..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/memory_tests/src/"
-
-DEPENDS += "libxil xiltimer"
-
-inherit python3native
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} memtest
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/memory_tests* ${D}/${base_libdir}/firmware
-}
-
-inherit image-artifact-names
-
-MEMORY_TESTS_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/memory_tests.elf ${DEPLOYDIR}/${MEMORY_TESTS_BASE_NAME}.elf
-    ln -sf ${MEMORY_TESTS_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/memory_tests.elf ${WORKDIR}/package/${base_libdir}/firmware/memory_tests.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/memory_tests.bin ${DEPLOYDIR}/${MEMORY_TESTS_BASE_NAME}.bin
-    ln -sf ${MEMORY_TESTS_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/memory_tests*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-echo-testd.bb b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-echo-testd.bb
new file mode 100644
index 00000000..58f08bf2
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-echo-testd.bb
@@ -0,0 +1,6 @@
+require openamp-fw.inc
+
+PROVIDES:append:armv7r = " openamp-fw-echo-testd "
+
+OPENAMP_FW_SRC_NAME = "rpmsg-echo.out"
+OPENAMP_FW_NAME = "image_echo_test"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-mat-muld.bb b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-mat-muld.bb
new file mode 100644
index 00000000..c8d4382d
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-mat-muld.bb
@@ -0,0 +1,6 @@
+require openamp-fw.inc
+
+PROVIDES:append:armv7r = " openamp-fw-mat-muld "
+
+OPENAMP_FW_SRC_NAME = "matrix_multiplyd.out"
+OPENAMP_FW_NAME = "image_matrix_multiply"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-rpc-demo.bb b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-rpc-demo.bb
new file mode 100644
index 00000000..4efdb4c6
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-rpc-demo.bb
@@ -0,0 +1,9 @@
+require openamp-fw.inc
+
+PROVIDES:append:armv7r = " openamp-fw-rpc-demo "
+
+OPENAMP_FW_SRC_NAME = "rpc_demo.out"
+OPENAMP_FW_NAME = "image_rpc_demo"
+OPENAMP_WITH_PROXY = "ON"
+
+# NOTE: BSP should have flag ESW_CFLAGS:append = " -DUNDEFINE_FILE_OPS=1 "
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw.inc b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw.inc
new file mode 100644
index 00000000..398f8dce
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw.inc
@@ -0,0 +1,27 @@
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+LICENSE = "MIT"
+INSANE_SKIP:${PN} = "arch"
+
+FW_LIB_DIR = "/lib/firmware"
+
+OPENAMP_FW_SRC_NAME ?= "rpmsg-echo.out"
+OPENAMP_FW_NAME ?= "image_echo_test"
+
+FW_MACHINE:zynqmp = "cortexr5-0-zynqmp"
+FW_MACHINE:versal = "cortexr5-0-versal"
+FW_MACHINE:versal-net = "cortexr52-0-versal-net"
+FW_OS ?= "baremetal"
+
+OPENAMP_FW_DEPLOY_DIR ?= "${MC_TMPDIR_PREFIX}-${FW_MACHINE}-${FW_OS}/deploy/images/${MACHINE}"
+DEPENDS = " open-amp-xlnx "
+do_install[mcdepends] += "mc::${FW_MACHINE}-${FW_OS}:open-amp-xlnx:do_deploy"
+do_install() {
+        install -d ${D}${FW_LIB_DIR}
+        src=${OPENAMP_FW_DEPLOY_DIR}/${OPENAMP_FW_SRC_NAME}
+        dest=${D}${FW_LIB_DIR}/${OPENAMP_FW_NAME}
+        install -m 0644 ${src} ${dest}
+}
+
+do_compile[noexec] = "1"
+
+FILES:${PN} = "/lib/firmware/${OPENAMP_FW_NAME}"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_2024.1.bb
index b6b15d5a..d2fb106a 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_2024.1.bb
@@ -1,10 +1,10 @@
-inherit esw deploy
+inherit esw python3native esw_apps_common
 
 ESW_COMPONENT_SRC = "/lib/sw_apps/peripheral_tests/src/"
 
 DEPENDS += "libxil xiltimer"
 
-inherit python3native
+ESW_EXECUTABLE_NAME = "peripheral_tests"
 
 do_configure:prepend() {
     (
@@ -37,16 +37,8 @@ python do_generate_app_data() {
 addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
 do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
 
-PERIPHERAL_TEST_APP_IMAGE_NAME ??= "${BPN}"
-
-inherit image-artifact-names
-
-PERIPHERAL_TEST_BASE_NAME ?= "${PERIPHERAL_TEST_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-ESW_COMPONENT ??= "peripheral_tests.elf"
-
 do_compile:append() {
-    ${OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/peripheral_tests.bin
+    ${OBJCOPY} -O binary ${B}/${ESW_EXECUTABLE_NAME}.elf ${B}${ESW_EXECUTABLE_NAME}.bin
 }
 
 do_install() {
@@ -54,9 +46,8 @@ do_install() {
 }
 
 do_deploy() {
-    install -Dm 0644 ${B}/${ESW_COMPONENT} ${DEPLOYDIR}/${PERIPHERAL_TEST_BASE_NAME}.elf
-    ln -sf ${PERIPHERAL_TEST_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    install -m 0644 ${B}/peripheral_tests.bin ${DEPLOYDIR}/${PERIPHERAL_TEST_BASE_NAME}.bin
-    ln -sf ${PERIPHERAL_TEST_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
+    install -Dm 0644 ${B}/${ESW_EXECUTABLE_NAME}.elf ${DEPLOYDIR}/${APP_IMAGE_NAME}.elf
+    ln -sf ${APP_IMAGE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}-${BB_CURRENT_MC}.elf
+    install -m 0644 ${B}/${ESW_EXECUTABLE_NAME}.bin ${DEPLOYDIR}/${APP_IMAGE_NAME}.bin
+    ln -sf ${APP_IMAGE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}-${BB_CURRENT_MC}.bin
 }
-addtask deploy before do_build after do_install
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/sample-fw-package/sample-fw-package.bb b/meta-xilinx-standalone-experimental/recipes-applications/sample-fw-package/sample-fw-package.bb
new file mode 100644
index 00000000..5def36c3
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/sample-fw-package/sample-fw-package.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Sample recipe to package and deploy baremetal or freertos elf or bin to linux rootfs"
+LICENSE = "CLOSED"
+
+inherit fw-package
+
+FW_NAME = "hello-world"
+
+TARGET_MC = "cortexr5-0-zynqmp-baremetal"
+
+FW_MCDEPENDS := "${@bb.utils.contains('BBMULTICONFIG', '${TARGET_MC}', 'mc::${TARGET_MC}:${FW_NAME}:do_deploy', '', d)}"
+FW_DEPLOY_DIR := "${@bb.utils.contains('BBMULTICONFIG', '${TARGET_MC}', '${TOPDIR}/tmp-${TARGET_MC}/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/srec-bootloader/srec-bootloader_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/srec-bootloader/srec-bootloader_2024.1.bb
new file mode 100644
index 00000000..03ada8c1
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/srec-bootloader/srec-bootloader_2024.1.bb
@@ -0,0 +1,22 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/srec_bootloader/src/"
+
+DEPENDS += "libxil xiltimer"
+
+ESW_EXECUTABLE_NAME = "srec_bootloader"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+FILES:${PN} = "${base_libdir}/firmware/srec_bootloader*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/srec-spi-bootloader/srec-spi-bootloader_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/srec-spi-bootloader/srec-spi-bootloader_2024.1.bb
new file mode 100644
index 00000000..e6f29570
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/srec-spi-bootloader/srec-spi-bootloader_2024.1.bb
@@ -0,0 +1,22 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/srec_spi_bootloader/src/"
+
+DEPENDS += "libxil xiltimer"
+
+ESW_EXECUTABLE_NAME = "srec_spi_bootloader"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+FILES:${PN} = "${base_libdir}/firmware/srec_spi_bootloader*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/zynq-dram-test/zynq-dram-test_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/zynq-dram-test/zynq-dram-test_2024.1.bb
new file mode 100644
index 00000000..8e0b0c06
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/zynq-dram-test/zynq-dram-test_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/zynq_dram_test/src/"
+
+DEPENDS += "libxil xiltimer"
+
+ESW_EXECUTABLE_NAME = "zynq_dram_test"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/zynq_dram*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/zynqmp-dram-test/zynqmp-dram-test_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/zynqmp-dram-test/zynqmp-dram-test_2024.1.bb
new file mode 100644
index 00000000..25215801
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/zynqmp-dram-test/zynqmp-dram-test_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/zynqmp_dram_test/src/"
+
+DEPENDS += "libxil xiltimer"
+
+ESW_EXECUTABLE_NAME = "zynqmp_dram_test"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+
+do_generate_app_data() {
+    # This script should also not rely on relative paths and such
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+FILES:${PN} = "${base_libdir}/firmware/zynqmp_dram*"
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_git.bb b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
index e6cf1d8b..f99db010 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
@@ -1,9 +1,6 @@
 # Can't depend on esw since this is needed for setup!
 inherit xlnx-embeddedsw
 
-# We need to override the inherit
-require conf/dtb-embeddedsw.inc
-
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bbappend
index d40f3cdb..d40f3cdb 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bbappend
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_2024.1.bbappend
index cc6d757f..cc6d757f 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_2024.1.bbappend
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_2024.1.bbappend
index b5908d46..b5908d46 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_2024.1.bbappend
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_2024.1.bbappend
index c4953ce7..c4953ce7 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_2024.1.bbappend
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
deleted file mode 100644
index 0a5736d8..00000000
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
+++ /dev/null
@@ -1,102 +0,0 @@
-Document Version: 20230112
-
-The Yocto Project setup for the System Device Tree workflow is as follows.
-Be sure to read everything below, as the steps will be updated in the future
-if the setup script changes.
-
-The steps in this document expect that you have already built the setup
-(meta-xilinx-setup) SDK, and installed it.
-
-* Run the setup script
-
-The setup environment should be run in a new shell (not the build shell)
-to ensure that you do not contaminate the environment for your build.
-
-We will assume below that the directory "prestep" was used for the SDK,
-however you may use any path you wish.
-
-Source the SDK environment file
- $ . <build>/prestep/environment-setup-x86_64-petalinux-linux
-
-Run the script from the same directory as this README
- $ <build>/prestep/dt-processor.sh -c <conf> -s <dtb> -l conf/local.conf
-
-Note: The -l option will automatically add the necessary parameters to the
-local.conf file.  If you need to re-run this comment, you just clear the
-parameters from the end of the file.  Without the -l option the items are
-printed to the screen and must be manually added to your conf/local.conf
-
-For example, zynqmp:
- $ ./prestep/dt-processor.sh -c conf -s /proj/yocto/zcu102-sdt/system-top.dts -l conf/local.conf
-
-The following will be written to the end of the conf/local.conf file:
-
-  # Each multiconfig will define it's own TMPDIR, this is the new default based
-  # on BASE_TMPDIR for the Linux build
-  TMPDIR = "${BASE_TMPDIR}/tmp"
-
-  # Use the newly generated MACHINE
-  MACHINE = "xlnx-zynqmp-zcu102-rev1-0"
-  
-  # All of the TMPDIRs must be in a common parent directory. This is defined
-  # as BASE_TMPDIR.
-  # Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere, such as /tmp
-  BASE_TMPDIR ?= "${TOPDIR}"
-  
-  # The following is the full set of multiconfigs for this configuration
-  # A large list can cause a slow parse.
-  BBMULTICONFIG = " cortexa53-0-zynqmp-fsbl-baremetal cortexa53-0-zynqmp-baremetal cortexa53-0-zynqmp-freertos cortexa53-1-zynqmp-baremetal cortexa53-1-zynqmp-freertos cortexa53-2-zynqmp-baremetal cortexa53-2-zynqmp-freertos cortexa53-3-zynqmp-baremetal cortexa53-3-zynqmp-freertos cortexr5-0-zynqmp-fsbl-baremetal cortexr5-0-zynqmp-baremetal cortexr5-0-zynqmp-freertos cortexr5-1-zynqmp-baremetal cortexr5-1-zynqmp-freertos microblaze-0-pmu"
-  # Alternatively trim the list to the minimum
-  #BBMULTICONFIG = " cortexa53-0-zynqmp-fsbl-baremetal microblaze-0-pmu"
-
-
-For example, versal:
- $ ./prestep/dt-processor.sh -c conf -s /proj/yocto/vmk180-sdt/system-top.dts -l conf/local.conf
-
-The following will be written to the end of the conf/local.conf file:
-
-  # Each multiconfig will define it's own TMPDIR, this is the new default based
-  # on BASE_TMPDIR for the Linux build
-  TMPDIR = "${BASE_TMPDIR}/tmp"
-  
-  # Use the newly generated MACHINE
-  MACHINE = "xlnx-versal-vmk180-rev1-1-x-ebm-01-reva"
-  
-  # All of the TMPDIRs must be in a common parent directory. This is defined
-  # as BASE_TMPDIR.
-  # Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere, such as /tmp
-  BASE_TMPDIR ?= "${TOPDIR}"
-  
-  # The following is the full set of multiconfigs for this configuration
-  # A large list can cause a slow parse.
-  BBMULTICONFIG = " cortexa72-0-versal-baremetal cortexa72-0-versal-freertos cortexa72-1-versal-baremetal cortexa72-1-versal-freertos microblaze-0-pmc microblaze-0-psm cortexr5-0-versal-baremetal cortexr5-0-versal-freertos cortexr5-1-versal-baremetal cortexr5-1-versal-freertos"
-  # Alternatively trim the list to the minimum
-  #BBMULTICONFIG = " microblaze-0-pmc microblaze-0-psm"
-
-
-You can now EXIT THE NEW SHELL return the build environment for the remaining steps.
-
-* Bitbake Performance Note
-
-Each BBMULTICONFIG value requires all of the recipes to be parsed for that
-configuration.  Thus each multiconfig will add more parsing time.  A long list
-can lead to a very slow parse (many minutes).  To speed up parsing, it is
-suggested that you trim this down to only the configurations you require.
-A minimum configuration is included with the generated configuration.
-
-* Build your project
-
-You should now be able to build your project normally.  See the Yocto Project
-documentation if you have questions on how to work with the multiconfig
-recipes.  The following is a simple build for testing.
-
-In the original build shell
-Build your Linux sytem:
- $ bitbake petalinux-image-minimal
-
-The output will be in tmp/deploy/images/...
-
-If the system is QEMU capable execute QEMU using:
- $ runqemu nographic slirp core-image-minimal
-
-To terminate qemu, usually the command is ctrl-a x
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
deleted file mode 100755
index 1c754689..00000000
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
+++ /dev/null
@@ -1,1260 +0,0 @@
-#! /bin/bash
-
-# Copyright (c) 2021-2022 Xilinx Inc
-# Copyright (C) 2022-2023 Advanced Micro Devices, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# This script configures the Yocto Project build system for use with the System
-# Device Tree workflow when building for a Xilinx FPGA, such as the ZynqMP or
-# Versal.
-
-error() { echo "ERROR: $1" >&2; exit 1; }
-
-warn() { echo "WARNING: $1"; }
-
-info() { echo "INFO: $1"; }
-
-usage() {
-  cat <<EOF
-$0
-    -c <config_dir>         Location of the build conf directory
-    -s <system_dts>         Path to system dts
-    [-d <domain_file>]      Path to domain file (.yml/.dts)
-    [-o <overlay_dts>]      Generate overlay dts
-    [-e <external_fpga>]    Apply a partial overlay
-    [-m <machine_conf>]     The name of the machine .conf to generate
-    [-D <dts_path>]         Absolute path or subdirectory of conf/dts to place DTS files in (usually auto detected from DTS)
-    [-t <machine>]          Machine type: zynqmp or versal (usually auto detected)
-    [-v <soc_variant>]      SOC Variant: cg, dr, eg, ev, ai-prime, premium (usually auto detected)
-    [-r <require_machine>]  This machine will be required, instead of the generic machine if defined
-    [-O <overrides>]        Optional, can add additional overrides to the generated machine
-    [-p <psu_init_path>]    Path to psu_init files, defaults to system_dts path
-    [-i <pdi_path>]         Path to the pdi file
-    [-l <config_file>]      write local.conf changes to this file
-    [-P <petalinux_schema>] Path to petalinux schema file
-
-EOF
-  exit
-}
-
-parse_args() {
-  [ $# -eq 0 ] && usage
-  [ $1 = "--help" ] && usage
-
-  while getopts ":c:s:d:o:e:m:D:l:hP:p:i:t:v:r:O:" opt; do
-    case ${opt} in
-      c) config_dir=$OPTARG ;;
-      s) system_dts=$OPTARG ;;
-      o) overlay_dts=$OPTARG ;;
-      d) domain_file=$OPTARG ;;
-      e) external_fpga=$OPTARG ;;
-      m) mach_conf=$OPTARG ; mach_conf=${mach_conf%%.conf} ;;
-      D) dts_path=$OPTARG ;;
-      t) machine=$OPTARG ;;
-      v) soc_variant=$OPTARG ;;
-      r) incmachine=$OPTARG ;;
-      O) overrides=$OPTARG ;;
-      p) psu_init_path=$OPTARG ;;
-      i) pdi_path=$OPTARG ;;
-      l) localconf=$OPTARG ;;
-      P) petalinux_schema=$OPTARG ;;
-      h) usage ;;
-      :) error "Missing argument for -$OPTARG" ;;
-      \?) error "Invalid option -$OPTARG" ;;
-    esac
-  done
-
-  [ -z "${config_dir}" ] && error "You must specify the path to the build conf directory with -c"
-  [ -z "${system_dts}" ] && error "You must specify the path to the system device tree with -s"
-  [ -f "${config_dir}/local.conf" ] || error "Invalid config dir: ${config_dir}"
-  [ -f "${system_dts}" ] || error "Unable to find: ${system_dts}"
-  system_dts=$(realpath ${system_dts})
-  if [ -z "$psu_init_path" ]; then
-    psu_init_path=$(dirname ${system_dts})
-  else
-    psu_init_path=$(realpath ${psu_init_path})
-  fi
-  if [ -z "$pdi_path" ]; then
-    pdi_path=$(dirname ${system_dts})
-  else
-    pdi_path=$(realpath ${pdi_path})
-  fi
-  if [ -n "$domain_file" ]; then
-    domain_file=$(realpath ${domain_file})
-  fi
-
-}
-
-detect_machine() {
-  if [ -z "${machine}" ]; then
-    if [ -n "${deviceid}" ]; then
-      case ${deviceid} in
-         # ZynqMP variants
-         xczu*cg)
-           machine="zynqmp"
-           soc_variant="cg" ;;
-         xczu*dr)
-           machine="zynqmp"
-           soc_variant="dr" ;;
-         xczu*eg)
-           machine="zynqmp"
-           soc_variant="eg" ;;
-         xczu*ev)
-           machine="zynqmp"
-           soc_variant="ev" ;;
-         # Versal variants
-         xcvm*)
-           machine="versal"
-           soc_variant="prime" ;;
-         xcvc*)
-           machine="versal"
-           soc_variant="ai-core" ;;
-         xcve*)
-           machine="versal"
-           soc_variant="ai-edge" ;;
-         xcvn*)
-           machine="versal"
-           soc_variant="net" ;;
-         xcvp*)
-           machine="versal"
-           soc_variant="premium" ;;
-         xcvh*)
-           machine="versal"
-           soc_variant="hbm" ;;
-         # Special Case Starter Kit SOMs
-         xck26)
-           if [ -z "${incmachine}" ]; then
-             incmachine="k26-smk.conf"
-           fi
-           machine="zynqmp"
-           soc_variant="ev" ;;
-         xck24)
-           if [ -z "${incmachine}" ]; then
-             incmachine="k24-smk.conf"
-           fi
-           machine="zynqmp"
-           soc_variant="eg" ;;
-      esac
-    else
-      # Identify the system type first using PSM/PMC/PMU
-      while read -r cpu core domain cpu_name os_hint; do
-        case ${cpu} in
-          pmu-microblaze)
-            machine="zynqmp" ;;
-          pmc-microblaze | psm-microblaze)
-            machine="versal" ;;
-        esac
-      done <${cpulist}
-    fi
-  fi
-
-  # Machine not provided and we cannot identify..
-  [ -z ${machine} ] && \
-    error "Unable to autodetect machine type, use -t to specify the machine."
-
-  case ${machine} in
-    zynqmp | versal) : ;;
-    *) error "Invalid machine type ${machine}; please choose zynqmp or versal"
-  esac
-
-  [ -z ${soc_variant} ] && \
-    warn "Unable to autodetect soc variant, use -v to specify a variant."
-}
-
-dump_cpus() {
-    prefix="$1"
-    while read -r cpu core domain cpu_name os_hint; do
-      case ${cpu} in
-        \#*) ;;
-        \[*) ;;
-        pmu-microblaze)   echo "${prefix}zynqmp-pmu ${cpu_name}" ;;
-        pmc-microblaze)   echo "${prefix}versal-plm ${cpu_name}" ;;
-        psm-microblaze)   echo "${prefix}versal-psm ${cpu_name}" ;;
-        xlnx,microblaze)  echo "${prefix}microblaze ${core} ${cpu_name}";;
-        arm,*)            echo "${prefix}${cpu/,/ } ${core} ${cpu_name}";;
-        *)                echo "${prefix}${cpu} ${core} ${cpu_name}";;
-      esac
-    done <${cpulist}
-}
-
-cortex_a53_linux() {
-  info "cortex-a53 for Linux [ $1 ]"
-
-  if [ "$1" = "None" ]; then
-    dts_file="cortexa53-${machine}-linux.dts"
-    system_conf=${dts_file}
-    conf_file=""
-  else
-    mc_name=cortexa53-${machine}-$1-linux
-    dts_file="${mc_name}.dts"
-    multiconf="${multiconf} ${mc_name}"
-    conf_file=multiconfig/${mc_name}.conf
-  fi
-
-  # Check if it is overlay dts otherwise just create linux dts
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ "${overlay_dts}" = "true" ]; then
-      if [ "${external_fpga}" = "true" ]; then
-        LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- xlnx_overlay_dt ${machine} full \
-          || error "lopper failed"
-      else
-        LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} "${system_dts}" -- xlnx_overlay_dt ${machine} partial \
-          || error "lopper failed"
-      fi
-      dtc -q -O dtb -o pl.dtbo -b 0 -@ pl.dtsi || error "dtc failed"
-    elif [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \
-        -i "${lops_dir}/lop-domain-linux-a53.dts" \
-        -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \
-        "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a53-imux.dts" \
-        -i "${lops_dir}/lop-domain-linux-a53.dts" \
-        -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \
-        "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    fi
-    rm -f pl.dtsi lop-a53-imux.dts.dtb lop-domain-linux-a53.dts.dtb lop-domain-linux-a53-prune.dts.dtb
-  )
-
-  if [ -z "${conf_file}" ]; then
-      return $?
-  fi
-
-  ## Generate a multiconfig
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-EOF
-}
-
-a53_fsbl_done=0
-cortex_a53_baremetal() {
-  if [ "$1" = "fsbl" ]; then
-    [ ${a53_fsbl_done} = 1 ] && return
-    info "cortex-a53 FSBL baremetal configuration"
-  else
-    info "cortex-a53 baremetal configuration for core $2 [ $1 ]"
-  fi
-
-  suffix=""; lto="-nolto"
-  if [ "$1" != "None" ]; then
-    suffix="-$1"; lto=""
-  fi
-
-  mc_name="cortexa53-$2-${machine}${suffix}-baremetal"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  yocto_distro="xilinx-standalone${lto}"
-  if [ "$1" = "fsbl" ]; then
-    fsbl_mcdepends="mc::${mc_name}:fsbl-firmware:do_deploy"
-    fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
-    multiconf_min="${multiconf_min} ${mc_name}"
-    a53_fsbl_done=1
-  fi
-
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a53-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-a53-imux.dts.dtb
-  )
-
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-
-  if [ "$1" = "fsbl" ]; then
-    if [ ! -e "${psu_init_path}/psu_init.c" ]; then
-      warn "Warning: Unable to find psu_init.c in ${psu_init_path}"
-    fi
-    if [ ! -e "${psu_init_path}/psu_init.h" ]; then
-      warn "Warning: Unable to find psu_init.h in ${psu_init_path}"
-    fi
-
-    cat <<EOF >"${conf_file}"
-PSU_INIT_PATH = "${psu_init_path}"
-EOF
-  else
-    cat /dev/null >"${conf_file}"
-  fi
-  cat <<EOF >>"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexa53"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-
-DISTRO = "${yocto_distro}"
-EOF
-}
-
-cortex_a53_freertos() {
-  info "cortex-a53 FreeRTOS configuration for core $2 [ $1 ]"
-
-  suffix=""
-  [ "$1" != "None" ] && suffix="-$1"
-
-  mc_name="cortexa53-$2-${machine}${suffix}-freertos"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a53-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-a53-imux.dts.dtb
-  )
-
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexa53"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-
-DISTRO = "xilinx-freertos"
-EOF
-}
-
-cortex_a72_linux() {
-  info "cortex-a72 for Linux [ $1 ]"
-
-  # Find the first file ending in .pdi
-  full_pdi_path=$(ls ${pdi_path}/*.pdi 2>/dev/null | head -n 1)
-  if [ -z "${full_pdi_path}" ]; then
-    error "Unable to find a pdi file in ${pdi_path}, use the -i option to point to the directory containing a .pdi file"
-    full_pdi_path="__PATH TO PDI FILE HERE__"
-  elif [ "${full_pdi_path}" != "$(ls ${pdi_path}/*.pdi 2>/dev/null)" ]; then
-    warn "Warning: multiple PDI files found, using first found $(basename ${full_pdi_path})."
-  fi
-
-  if [ "$1" = "None" ]; then
-    dts_file="cortexa72-${machine}-linux.dts"
-    system_conf=${dts_file}
-    conf_file=""
-  else
-    mc_name="cortexa72-${machine}-$1-linux"
-    dts_file="${mc_name}.dts"
-    multiconf="${multiconf} ${mc_name}"
-    conf_file=multiconfig/${mc_name}.conf
-  fi
-
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    # Check if it is overlay dts otherwise just create linux dts
-    if [ "${overlay_dts}" = "true" ]; then
-      # As there is no partial support on Versal, As per fpga manager implementation there is
-      # a flag "external_fpga" which says apply overlay without loading the bit file.
-      if [ "${external_fpga}" = "true" ]; then
-        LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- xlnx_overlay_dt \
-          ${machine} full external_fpga || error "lopper failed"
-      else
-        # If there is no external_fpga flag, then the default is full
-        LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} "${system_dts}" -- xlnx_overlay_dt \
-          ${machine} full || error "lopper failed"
-      fi
-      dtc -q -O dtb -o pl.dtbo -b 0 -@ pl.dtsi || error "dtc failed"
-    elif [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" \
-        -i "${lops_dir}/lop-domain-a72.dts" \
-        -i "${lops_dir}/lop-domain-a72-prune.dts" \
-        "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a72-imux.dts" \
-        -i "${lops_dir}/lop-domain-a72.dts" \
-        -i "${lops_dir}/lop-domain-a72-prune.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f pl.dtsi lop-a72-imux.dts.dtb lop-domain-a72.dts.dtb lop-domain-a72-prune.dts.dtb
-  )
-
-  if [ -z "${conf_file}" ]; then
-      return $?
-  fi
-
-  ## Generate a multiconfig
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-EOF
-}
-
-cortex_a72_baremetal() {
-  info "cortex-a72 baremetal configuration for core $2 [ $1 ]"
-
-  suffix=""
-  [ "$1" != "None" ] && suffix="-$1"
-
-  mc_name="cortexa72-$2-${machine}${suffix}-baremetal"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f   --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a72-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-a72-imux.dts.dtb
-  )
-
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexa72"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-
-DISTRO = "xilinx-standalone-nolto"
-EOF
-}
-
-cortex_a72_freertos() {
-  info "cortex-a72 FreeRTOS configuration for core $2 [ $1 ]"
-
-  suffix=""
-  [ "$1" != "None" ] && suffix="-$1"
-
-  mc_name="cortexa72-$2-${machine}${suffix}-freertos"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" lopper -f --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a72-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-a72-imux.dts.dtb
-  )
-
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexa72"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-
-DISTRO = "xilinx-freertos"
-EOF
-}
-
-r5_fsbl_done=0
-cortex_r5_baremetal() {
-  if [ "$1" = "fsbl" ]; then
-    [ ${r5_fsbl_done} = 1 ] && return
-    info "cortex-r5 FSBL baremetal configuration"
-  else
-    info "cortex-r5 baremetal configuration for core $2 [ $1 ]"
-  fi
-
-  suffix=""; lto="-nolto"
-  if [ "$1" != "None" ]; then
-    suffix="-$1"; lto=""
-  fi
-
-  mc_name="cortexr5-$2-${machine}${suffix}-baremetal"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  yocto_distro="xilinx-standalone${lto}"
-
-  if [ "$1" = "fsbl" ]; then
-    r5fsbl_mcdepends="mc::${mc_name}:fsbl-firmware:do_deploy"
-    r5fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
-    r5_fsbl_done=1
-  fi
-
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "$domain_file" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-r5-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-r5-imux.dts.dtb
-  )
-
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-
-  if [ "$1" = "fsbl" ]; then
-    if [ ! -e "${psu_init_path}/psu_init.c" ]; then
-      warn "Warning: Unable to find psu_init.c in ${psu_init_path}"
-    fi
-    if [ ! -e "${psu_init_path}/psu_init.h" ]; then
-      warn "Warning: Unable to find psu_init.h in ${psu_init_path}"
-    fi
-
-    cat <<EOF >"${conf_file}"
-PSU_INIT_PATH = "${psu_init_path}"
-EOF
-  else
-    cat /dev/null >"${conf_file}"
-  fi
-  cat <<EOF >>"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexr5"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-
-DISTRO = "$yocto_distro"
-EOF
-}
-
-cortex_r5_freertos() {
-  info "cortex-r5 FreeRTOS configuration for core $2 [ $1 ]"
-
-  suffix=""
-  [ "$1" != "None" ] && suffix="-$1"
-
-  mc_name="cortexr5-$2-${machine}${suffix}-freertos"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "$domain_file" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-r5-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-r5-imux.dts.dtb
-  )
-
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexr5"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-
-DISTRO = "xilinx-freertos"
-EOF
-}
-
-# Generate microblaze tunings
-microblaze_done=0
-process_microblaze() {
-  [ ${microblaze_done} = 1 ] && return
-
-  info "Generating microblaze processor tunes"
-
-  mkdir -p machine/include/${mach_conf}
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-microblaze-yocto.dts" "${system_dts}" \
-      || error "lopper failed"
-    rm -f lop-microblaze-yocto.dts.dtb
-  ) >machine/include/${mach_conf}/microblaze.inc
-
-  echo "require conf/machine/include/xilinx-microblaze.inc" >> machine/include/${mach_conf}/microblaze.inc
-
-  microblaze_done=1
-}
-
-# pmu-microblaze is ALWAYS baremetal, no domain
-pmu-microblaze() {
-  info "Microblaze ZynqMP PMU"
-
-  process_microblaze
-
-  mc_name="microblaze-0-pmu"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  multiconf_min="${multiconf_min} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-
-  pmu_mcdepends="mc::${mc_name}:pmu-firmware:do_deploy"
-  pmu_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
-
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
-  )
-
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $1 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $1 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-ESW_MACHINE = "$1"
-
-DEFAULTTUNE = "microblaze-pmu"
-
-TARGET_CFLAGS += "-DPSU_PMU=1U"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-
-DISTRO = "xilinx-standalone"
-EOF
-}
-
-# pmc-microblaze is ALWAYS baremetal, no domain
-pmc-microblaze() {
-  info "Microblaze Versal PMC"
-
-  process_microblaze
-
-  mc_name="microblaze-0-pmc"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  multiconf_min="${multiconf_min} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-
-  plm_mcdepends="mc::${mc_name}:plm-firmware:do_deploy"
-  plm_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
-
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
-  )
-
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $1 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $1 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-ESW_MACHINE = "$1"
-
-DEFAULTTUNE = "microblaze-pmc"
-
-TARGET_CFLAGS += "-DVERSAL_PLM=1"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-
-DISTRO = "xilinx-standalone"
-EOF
-}
-
-# psm-microblaze is ALWAYS baremetal, no domain
-psm-microblaze() {
-  info "Microblaze Versal PSM"
-
-  process_microblaze
-
-  mc_name="microblaze-0-psm"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  multiconf_min="${multiconf_min} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-
-  psm_mcdepends="mc::${mc_name}:psm-firmware:do_deploy"
-  psm_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
-
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
-  )
-
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $1 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $1 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-
-ESW_MACHINE = "$1"
-
-DEFAULTTUNE = "microblaze-psm"
-
-TARGET_CFLAGS += "-DVERSAL_psm=1"
-
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-
-DISTRO = "xilinx-standalone"
-EOF
-}
-
-generate_machine() {
-  info "Generating machine conf file"
-  conf_file="machine/${mach_conf}.conf"
-
-  # Machine include file
-  if [ -z ${incmachine} ]; then
-    if [ -n ${soc_variant} ]; then
-      incmachine="${machine}-${soc_variant}-generic.conf"
-    else
-      incmachine="${machine}-generic.conf"
-    fi
-  fi
-
-  mkdir -p machine
-  # Generate header
-  cat <<EOF >"${conf_file}"
-#@TYPE: Machine
-#@NAME: ${mach_conf}
-#@DESCRIPTION: ${model}
-
-#### Preamble
-MACHINEOVERRIDES =. "\${@['', '${mach_conf}:']['${mach_conf}' != '\${MACHINE}']}"
-#### Regular settings follow
-
-EOF
-
-  if [ -n "${overrides}" ]; then
-    cat <<EOF >>"${conf_file}"
-MACHINEOVERRIDES .= ":${overrides}"
-
-EOF
-  fi
-
-  if [ "${machine}" == "zynqmp" ]; then
-    cat <<EOF >>"${conf_file}"
-TUNEFILE[microblaze-pmu] = "conf/machine/include/${mach_conf}/microblaze.inc"
-EOF
-  elif [ "${machine}" == "versal" ]; then
-    cat <<EOF >>"${conf_file}"
-TUNEFILE[microblaze-pmc] = "conf/machine/include/${mach_conf}/microblaze.inc"
-TUNEFILE[microblaze-psm] = "conf/machine/include/${mach_conf}/microblaze.inc"
-EOF
-  fi
-
-  sysdt_path=$(dirname ${system_dts})
-  sysdt_base=$(basename ${system_dts})
-  cat <<EOF >>"${conf_file}"
-
-# Set the default (linux) domain device tree
-CONFIG_DTFILE ?= "${dts_file_path}/${system_conf}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-
-require conf/machine/${incmachine}
-
-# System Device Tree does not use HDF_MACHINE
-HDF_MACHINE = ""
-
-# Set the system device trees
-SYSTEM_DTFILE_DIR = "${sysdt_path}"
-SYSTEM_DTFILE = "\${SYSTEM_DTFILE_DIR}/${sysdt_base}"
-SYSTEM_DTFILE[vardepsexclude] += "SYSTEM_DTFILE_DIR"
-
-# Load the dynamic machine features
-include conf/machine/include/${mach_conf}/\${BB_CURRENT_MC}-features.conf
-LIBXIL_CONFIG = "conf/machine/include/${mach_conf}/\${BB_CURRENT_MC}-libxil.conf"
-
-EOF
-
-  if [ -n "${fsbl_mcdepends}" ]; then
-    cat <<EOF >>"${conf_file}"
-# First Stage Boot Loader
-FSBL_DEPENDS = ""
-FSBL_MCDEPENDS = "${fsbl_mcdepends}"
-FSBL_DEPLOY_DIR = "${fsbl_deploy_dir}"
-
-EOF
-  fi
-  if [ -n "${r5fsbl_mcdepends}" ]; then
-    cat <<EOF >>"${conf_file}"
-# Cortex-R5 First Stage Boot Loader
-R5FSBL_DEPENDS = ""
-R5FSBL_MCDEPENDS = "${r5fsbl_mcdepends}"
-R5FSBL_DEPLOY_DIR = "${r5fsbl_deploy_dir}"
-
-EOF
-  fi
-  if [ -n "${pmu_mcdepends}" ]; then
-    cat <<EOF >>"${conf_file}"
-# PMU Firware
-PMU_DEPENDS = ""
-PMU_MCDEPENDS = "${pmu_mcdepends}"
-PMU_FIRMWARE_DEPLOY_DIR = "${pmu_firmware_deploy_dir}"
-
-EOF
-  fi
-  if [ -n "${plm_mcdepends}" ]; then
-    cat <<EOF >>"${conf_file}"
-# Platform Loader and Manager
-PLM_DEPENDS = ""
-PLM_MCDEPENDS = "${plm_mcdepends}"
-PLM_DEPLOY_DIR = "${plm_deploy_dir}"
-
-EOF
-  fi
-  if [ -n "${psm_mcdepends}" ]; then
-    cat <<EOF >>"${conf_file}"
-# PSM Firmware
-PSM_DEPENDS = ""
-PSM_MCDEPENDS = "${psm_mcdepends}"
-PSM_FIRMWARE_DEPLOY_DIR = "${psm_firmware_deploy_dir}"
-
-EOF
-  fi
-
-  if [ -n "${full_pdi_path}" ]; then
-    pdi_path_dir=$(dirname ${full_pdi_path})
-    pdi_path_base=$(basename ${full_pdi_path})
-    cat <<EOF >>"${conf_file}"
-# Versal PDI
-PDI_PATH_DIR = "${pdi_path_dir}"
-PDI_PATH = "\${PDI_PATH_DIR}/${pdi_path_base}"
-PDI_PATH[vardepsexclude] += "PDI_PATH_DIR"
-
-EOF
-  fi
-
-  cat <<EOF >>"${conf_file}"
-# Enable the correct version of the firmware components
-PREFERRED_VERSION_fsbl-firmware = "2023_sdt_experimental%"
-PREFERRED_VERSION_pmu-firmware = "2023_sdt_experimental%"
-PREFERRED_VERSION_plm-firmware = "2023_sdt_experimental%"
-PREFERRED_VERSION_psm-firmware = "2023_sdt_experimental%"
-
-# Exclude BASE_TMPDIR from hash calculations
-BB_HASHEXCLUDE_COMMON:append = " BASE_TMPDIR"
-
-# Update bootbin to use proper device tree
-BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE').replace('.dts', '.dtb'))}"
-# Remap boot files to ensure the right device tree is listed first
-IMAGE_BOOT_FILES =+ "devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE').replace('.dts', '.dtb'))}"
-
-#### No additional settings should be after the Postamble
-#### Postamble
-PACKAGE_EXTRA_ARCHS:append = "\${@['', ' ${mach_conf//-/_}']['${mach_conf}' != "\${MACHINE}"]}"
-EOF
-}
-
-parse_cpus() {
-  gen_linux_dts="None"
-  while read -r cpu core domain cpu_name os_hint; do
-    # Skip commented lines and WARNINGs
-    case ${cpu} in
-      \#* | \[WARNING\]:) continue ;;
-    esac
-
-    case ${cpu} in
-
-      arm,cortex-a53)
-        # We need a base cortex_a53_baremetal for the FSBL
-        if [ "${core}" == 0 ]; then
-          cortex_a53_baremetal fsbl ${core} ${cpu_name}
-        fi
-        if [ "${os_hint}" == "None" ]; then
-          if [ "${gen_linux_dts}" == "None" ]; then
-            cortex_a53_linux "${domain}"
-            gen_linux_dts="True"
-          fi
-          cortex_a53_baremetal "${domain}" ${core} ${cpu_name}
-          cortex_a53_freertos "${domain}" ${core} ${cpu_name}
-        else
-          case "${os_hint}" in
-            linux*)
-              if [ "${gen_linux_dts}" == "None" ]; then
-                cortex_a53_linux "${domain}"
-                gen_linux_dts="True"
-              fi
-              ;;
-            baremetal*)
-              cortex_a53_baremetal "${domain}" ${core} ${cpu_name};;
-            freertos*)
-              cortex_a53_freertos "${domain}" ${core} ${cpu_name};;
-            *)
-              warn "cortex-a53 for unknown OS (${os_hint}), parsing baremetal. ${domain}"
-              cortex_a53_baremetal "${domain}"
-          esac
-        fi
-        ;;
-
-      arm,cortex-a72)
-        if [ "${os_hint}" == "None" ]; then
-          if [ "${gen_linux_dts}" == "None" ]; then
-            cortex_a72_linux "${domain}"
-            gen_linux_dts="True"
-          fi
-          cortex_a72_baremetal "${domain}" ${core} ${cpu_name}
-          cortex_a72_freertos "${domain}" ${core} ${cpu_name}
-        else
-          case "${os_hint}" in
-            linux*)
-              if [ "${gen_linux_dts}" == "None" ]; then
-                cortex_a72_linux "${domain}"
-                gen_linux_dts="True"
-              fi
-              ;;
-            baremetal*)
-              cortex_a72_baremetal "${domain}" ${core} ${cpu_name};;
-            freertos*)
-              cortex_a72_freertos "${domain}" ${core} ${cpu_name};;
-            *)
-              warn "cortex-a72 for unknown OS (${os_hint}), parsing baremetal. ${domain}"
-              cortex_a72_baremetal "${domain}"
-          esac
-        fi
-        ;;
-      arm,cortex-r5)
-        if [ "${os_hint}" == "None" ]; then
-          # We need a base cortex_r5_baremetal for the FSBL for ZynqMP platform
-          [ "${machine}" = "zynqmp" ] && cortex_r5_baremetal fsbl ${core} ${cpu_name}
-          cortex_r5_baremetal "${domain}" ${core} ${cpu_name}
-          cortex_r5_freertos "${domain}" ${core} ${cpu_name}
-        else
-          case "${os_hint}" in
-            baremetal*)
-              cortex_r5_baremetal "${domain}" ${core} ${cpu_name};;
-            freertos*)
-              cortex_r5_freertos "${domain}" ${core} ${cpu_name};;
-            *)
-              warn "cortex-r5 for unknown OS (${os_hint}), parsing baremetal. ${domain}"
-              cortex_r5_baremetal "${domain}"
-          esac
-        fi
-        ;;
-
-      xlnx,microblaze)
-        process_microblaze
-        case "${os_hint}" in
-          None | baremetal*)
-            warn "Microblaze for Baremetal ${domain} not yet implemented" ;;
-          Linux)
-            warn "Microblaze for Linux ${domain} not yet implemented" ;;
-          *)
-            warn "Microblaze for unknown OS (${os_hint}), not yet implemented. ${domain}" ;;
-        esac
-        ;;
-
-      pmu-microblaze)
-        pmu-microblaze ${cpu_name};;
-
-      pmc-microblaze)
-        pmc-microblaze ${cpu_name};;
-
-      psm-microblaze)
-        psm-microblaze ${cpu_name};;
-      *)
-        warn "Unknown CPU ${cpu}"
-
-    esac
-  done <${cpulist}
-}
-
-gen_local_conf() {
-  cat << EOF >> $1
-
-# Avoid errors in some baremetal configs as these layers may be present
-# but are not used.  Note the following lines are optional and can be
-# safetly disabled.
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
-
-# Each multiconfig will define it's own TMPDIR, this is the new default based
-# on BASE_TMPDIR for the Linux build
-TMPDIR = "\${BASE_TMPDIR}/tmp"
-
-# Use the newly generated MACHINE
-MACHINE = "${mach_conf}"
-
-# All of the TMPDIRs must be in a common parent directory. This is defined
-# as BASE_TMPDIR.
-# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere, such as /tmp
-BASE_TMPDIR ?= "\${TOPDIR}"
-
-# The following is the full set of multiconfigs for this configuration
-# A large list can cause a slow parse.
-#BBMULTICONFIG ?= "${multiconf}"
-# Alternatively trim the list to the minimum
-BBMULTICONFIG = "${multiconf_min}"
-EOF
-}
-
-gen_petalinux_conf() {
-  cd "${config_dir}" || exit
-  (
-    if [ "$machine" == "zynqmp" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} "${system_dts}" -- petalinuxconfig_xlnx psu_cortexa53_0 ${petalinux_schema} \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} "${system_dts}" -- petalinuxconfig_xlnx psv_cortexa72_0 ${petalinux_schema} \
-        || error "lopper failed"
-    fi
-  )
-}
-parse_args "$@"
-
-lopper=$(command -v lopper)
-lopper_dir=$(dirname "${lopper}")
-lops_dir=$(ls -d $(dirname "${lopper_dir}")/lib/python*/site-packages/lopper/lops | head -n 1)
-embeddedsw=$(dirname "${lopper_dir}")/share/embeddedsw
-system_conf=""
-multiconf=""
-
-[ -z "${lopper}" ] && error "Unable to find lopper, please source the prestep environment"
-
-cpulist=$(mktemp)
-
-priordir=$(pwd)
-cd "${config_dir}" || exit
-mkdir -p dts multiconfig machine/include
-# Get mach_conf name and model name
-(
-  cd dts || error "Unable to cd to dts dir"
-  LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-machine-name.dts" "${system_dts}" \
-    /dev/null > ${cpulist} || error "lopper failed"
-  rm -f "lop-machine-name.dts.dtb"
-)
-read local_mach_conf deviceid model < ${cpulist}
-if [ -z "${mach_conf}" ]; then
-    mach_conf=${local_mach_conf}
-fi
-
-if [ -z "${dts_path}"]; then
-    dts_path=${local_mach_conf}
-fi
-# Is it relative?  If so, relative to conf/dts
-if [ "${dts_path##/}" = "${dts_path}" ]; then
-    dts_path="dts/${dts_path}"
-else
-    dts_path=$(realpath ${dts_path})
-fi
-# Convert the DTS_PATH into something we can put in a config file
-if [ "${dts_path##/}" = "${dts_path}" ]; then
-    dts_file_path="\${TOPDIR}/conf/${dts_path}"
-else
-    dts_file_path="${dts_path}"
-fi
-
-# Generate CPU list
-(
-  cd dts || error "Unable to cd to dts dir"
-  LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-xilinx-id-cpus.dts" "${system_dts}" \
-    /dev/null > ${cpulist} || error "lopper failed"
-  rm -f "lop-xilinx-id-cpus.dts.dtb"
-)
-
-detect_machine
-# Now that we know the machine name, we can create the directory
-mkdir -p machine/include/${mach_conf}
-mkdir -p ${dts_path}
-
-echo "System Configuration:"
-echo "MODEL       = \"${model}\""
-echo "MACHINE     = \"${mach_conf}\""
-echo "DEVICE_ID   = \"${deviceid}\""
-echo "SOC_FAMILY  = \"${machine}\""
-echo "SOC_VARIANT = \"${soc_variant}\""
-echo "CPUs:"
-dump_cpus "            = "
-echo
-
-info "Generating configuration..."
-parse_cpus
-
-generate_machine
-
-cd ${priordir}
-if [ -z "${localconf}" ]; then
-  echo
-  echo "To enable this, add the following to your local.conf:"
-  echo
-  tmpfile=$(mktemp)
-  gen_local_conf ${tmpfile}
-  cat $tmpfile
-  rm $tmpfile
-else
-  echo
-  echo "Configuration for local.conf written to ${localconf}"
-  echo
-  gen_local_conf ${localconf}
-fi
-
-if [ -n "${petalinux_schema}" ]; then
-  echo
-  echo "Generating petalinux config file:"
-  echo
-  gen_petalinux_conf
-fi
-
-# Cleanup our temp file
-rm -rf ${cpulist} ${config_dir}/CMakeLists.txt ${config_dir}/DRVLISTConfig.cmake
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb b/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
deleted file mode 100644
index dc7d647a..00000000
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
+++ /dev/null
@@ -1,91 +0,0 @@
-DESCRIPTION = "Xilinx Device Tree based configuration generator"
-LICENSE = "MIT"
-
-SRC_URI += " \
-    file://dt-processor.sh \
-    file://README-setup \
-"
-
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-TOOLCHAIN_TARGET_TASK = ""
-
-TOOLCHAIN_HOST_TASK = "\
-    nativesdk-sdk-provides-dummy \
-    nativesdk-lopper \
-    nativesdk-xilinx-lops \
-    nativesdk-esw-conf \
-    "
-
-MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
-PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}"
-PACKAGE_ARCHS = ""
-TARGET_ARCH = "none"
-TARGET_OS = "none"
-
-SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}"
-
-TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-xilinx-nativesdk-prestep-${DISTRO_VERSION}"
-
-SDK_TITLE = "Device Tree setup tools"
-
-RDEPENDS = "${TOOLCHAIN_HOST_TASK}"
-
-EXCLUDE_FROM_WORLD = "1"
-
-inherit populate_sdk
-inherit toolchain-scripts-base
-inherit nopackages
-
-deltask install
-deltask populate_sysroot
-
-do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}"
-
-REAL_MULTIMACH_TARGET_SYS = "none"
-
-# Needed to ensure README-setup and dt-processor.sh are available
-addtask do_populate_sdk after do_unpack
-
-create_sdk_files:append () {
-
-        install -m 0644 ${WORKDIR}/README-setup ${SDK_OUTPUT}/${SDKPATH}/.
-        install -m 0755 ${WORKDIR}/dt-processor.sh ${SDK_OUTPUT}/${SDKPATH}/.
-
-        rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-*
-        rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*
-        rm -f ${SDK_OUTPUT}/${SDKPATH}/version-*
-
-        # Generate new (mini) sdk-environment-setup file
-        script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}}
-        touch $script
-        echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> $script
-        echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
-        echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script
-        echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script
-
-        toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS}
-
-        cat >> $script <<EOF
-if [ -d "\$OECORE_NATIVE_SYSROOT/environment-setup.d" ]; then
-        for envfile in \$OECORE_NATIVE_SYSROOT/environment-setup.d/*.sh; do
-                . \$envfile
-        done
-fi
-# We have to unset this else it can confuse oe-selftest and other tools
-# which may also use the overlapping namespace.
-unset OECORE_NATIVE_SYSROOT
-EOF
-
-        if [ "${SDKMACHINE}" = "i686" ]; then
-                echo 'export NO32LIBS="0"' >>$script
-                echo 'echo "$BB_ENV_PASSTHROUGH_ADDITIONS" | grep -q "NO32LIBS"' >>$script
-                echo '[ $? != 0 ] && export BB_ENV_PASSTHROUGH_ADDITIONS="NO32LIBS $BB_ENV_PASSTHROUGH_ADDITIONS"' >>$script
-        fi
-}
-
-# buildtools-tarball doesn't need config site
-TOOLCHAIN_NEED_CONFIGSITE_CACHE = ""
-
-# The recipe doesn't need any default deps
-INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_2024.1.bb
index 7edd2d9d..7edd2d9d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_2024.1.bb
index 1846b291..1846b291 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_2024.1.bb
index 47111dc5..47111dc5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_2024.1.bb
index 68a26f45..68a26f45 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axidma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axidma_2024.1.bb
index c385d13f..c385d13f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axidma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axidma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_2024.1.bb
index 04c2c151..04c2c151 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_2024.1.bb
index 0b635859..0b635859 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_2024.1.bb
index 4aa716e7..4aa716e7 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_2024.1.bb
index ff2eae91..ff2eae91 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_2024.1.bb
index b34dedb0..b34dedb0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_2024.1.bb
index 2866c02b..2866c02b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_2024.1.bb
index 15268629..15268629 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_2024.1.bb
index a3145467..a3145467 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/bram_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/bram_2024.1.bb
index 3c81c619..3c81c619 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/bram_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/bram_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/can-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/can-example_2024.1.bb
index 115852fa..115852fa 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/can-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/can-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/can_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/can_2024.1.bb
index eb7fc473..eb7fc473 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/can_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/can_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_2024.1.bb
index 84276569..84276569 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canfd_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canfd_2024.1.bb
index 5f2e6ea8..5f2e6ea8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canfd_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canfd_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_2024.1.bb
index 574dc563..574dc563 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canps_2024.1.bb
index c9f61cd2..c9f61cd2 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/cframe_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/cframe_2024.1.bb
index 6ffdf85d..6ffdf85d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/cframe_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/cframe_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_2024.1.bb
index 3cb675bc..3cb675bc 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz-example_2024.1.bb
new file mode 100644
index 00000000..71ffdc32
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz-example_2024.1.bb
@@ -0,0 +1,5 @@
+inherit esw_examples features_check
+
+REQUIRED_MACHINE_FEATURES = "clk-wiz"
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/clk_wiz/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_2024.1.bb
index ae0453a1..ae0453a1 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_2024.1.bb
index f9c5bce6..f9c5bce6 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clockps_2024.1.bb
index 4bddb2c0..3a464480 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clockps_2024.1.bb
@@ -8,3 +8,6 @@ DEPENDS += "xilstandalone "
 
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/clockps/src/"
 ESW_COMPONENT_NAME = "libclockps.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/common_2024.1.bb
index 541ff225..10635f7f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/common_2024.1.bb
@@ -13,11 +13,13 @@ PACKAGECONFIG[clockps] = "${RECIPE_SYSROOT}/usr/lib/libclockps.a,,clockps,,"
 PACKAGECONFIG[scugic] = "${RECIPE_SYSROOT}/usr/lib/libscugic.a,,scugic,,"
 PACKAGECONFIG[intc] = "${RECIPE_SYSROOT}/usr/lib/libintc.a,,intc,,"
 
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/common/src/"
+ESW_COMPONENT_SRC = "/lib/bsp/standalone/src/common/intr/"
 ESW_COMPONENT_NAME = "libcommon.a"
 
 do_configure:prepend() {
+    (
+    cd ${S}/${ESW_COMPONENT_SRC}/
     LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/XilinxProcessorIPLib/drivers/intc/src/
     LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/XilinxProcessorIPLib/drivers/scugic/src/
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_2024.1.bb
index 9110b51e..9110b51e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_2024.1.bb
index 5706967a..5706967a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/csudma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/csudma_2024.1.bb
index 8283ce8d..8283ce8d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/csudma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/csudma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_2024.1.bb
index 4728b6c5..4728b6c5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_2024.1.bb
index dd70e09d..dd70e09d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_2024.1.bb
index 4b794d22..4b794d22 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf-example_2024.1.bb
new file mode 100644
index 00000000..fd01b757
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+
+REQUIRED_MACHINE_FEATURES = "dfeccf"
+
+DEPENDS += " dfeccf"
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeccf/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf_2024.1.bb
new file mode 100644
index 00000000..86a55b9f
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf_2024.1.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dfeccf"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone libmetal "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeccf/src/"
+ESW_COMPONENT_NAME = "libdfeccf.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ-example_2024.1.bb
new file mode 100644
index 00000000..0f4d45be
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+
+REQUIRED_MACHINE_FEATURES = "dfeequ"
+
+DEPENDS += " dfeequ"
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeequ/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ_2024.1.bb
new file mode 100644
index 00000000..8ad43c1b
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ_2024.1.bb
@@ -0,0 +1,15 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dfeequ"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone libmetal "
+
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeequ/src/"
+ESW_COMPONENT_NAME = "libdfeequ.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfemix-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfemix-example_2024.1.bb
new file mode 100644
index 00000000..9149e9c4
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfemix-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+
+REQUIRED_MACHINE_FEATURES = "dfemix"
+
+DEPENDS += " dfemix"
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfemix/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfemix_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfemix_2024.1.bb
new file mode 100644
index 00000000..31c7b8ed
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfemix_2024.1.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dfemix"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone libmetal "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfemix/src/"
+ESW_COMPONENT_NAME = "libdfemix.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm-example_2024.1.bb
new file mode 100644
index 00000000..661c2768
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+
+REQUIRED_MACHINE_FEATURES = "dfeofdm"
+
+DEPENDS += " dfeofdm"
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeofdm/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm_2024.1.bb
new file mode 100644
index 00000000..a02ceae7
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm_2024.1.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dfeofdm"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone libmetal "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeofdm/src/"
+ESW_COMPONENT_NAME = "libdfeofdm.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach-example_2024.1.bb
new file mode 100644
index 00000000..10ac2029
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+
+REQUIRED_MACHINE_FEATURES = "dfeprach"
+
+DEPENDS += " dfeprach"
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeprach/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach_2024.1.bb
new file mode 100644
index 00000000..0890ff3b
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach_2024.1.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dfeprach"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone libmetal "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeprach/src/"
+ESW_COMPONENT_NAME = "libdfeprach.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_2024.1.bb
index 974dd48b..974dd48b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_2024.1.bb
index 81f2157b..81f2157b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_2024.1.bb
index 40d08e4b..40d08e4b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dmaps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dmaps_2024.1.bb
index 1dcd8404..1dcd8404 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dmaps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dmaps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dp14_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dp14_2024.1.bb
new file mode 100644
index 00000000..ab63d3a1
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dp14_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dp14"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dp14/src/"
+ESW_COMPONENT_NAME = "libdp14.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dp14rxss_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dp14rxss_2024.1.bb
new file mode 100644
index 00000000..4e98b2e4
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dp14rxss_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dp14rxss"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dp14rxss/src/"
+ESW_COMPONENT_NAME = "libdp14rxss.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_2024.1.bb
index 3adb88a6..3adb88a6 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_2024.1.bb
index 87cca884..87cca884 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_2024.1.bb
index 6ed717fb..6ed717fb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_2024.1.bb
index 9ceb477f..9ceb477f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_2024.1.bb
index 2c57eafe..2c57eafe 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emacps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emacps_2024.1.bb
index 8ed85984..8ed85984 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emacps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emacps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emc_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emc_2024.1.bb
new file mode 100644
index 00000000..0f46f99b
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emc_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "emc"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/emc/src/"
+ESW_COMPONENT_NAME = "libemc.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_2024.1.bb
index 3f79cfec..3f79cfec 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpio_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpio_2024.1.bb
index 83a746b7..83a746b7 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpio_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpio_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_2024.1.bb
index cc2e1703..cc2e1703 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_2024.1.bb
index 4bd63d1e..4bd63d1e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/hwicap_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/hwicap_2024.1.bb
new file mode 100644
index 00000000..37d70f6a
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/hwicap_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "hwicap"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/hwicap/src/"
+ESW_COMPONENT_NAME = "libhwicap.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/i2srx_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/i2srx_2024.1.bb
new file mode 100644
index 00000000..27333e13
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/i2srx_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "i2srx"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/i2srx/src/"
+ESW_COMPONENT_NAME = "libi2srx.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/i2stx_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/i2stx_2024.1.bb
new file mode 100644
index 00000000..ca09a7f0
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/i2stx_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "i2stx"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/i2stx/src/"
+ESW_COMPONENT_NAME = "libi2stx.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx-example_2024.1.bb
new file mode 100644
index 00000000..699b9d97
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx-example_2024.1.bb
@@ -0,0 +1,5 @@
+inherit esw_examples features_check
+
+REQUIRED_MACHINE_FEATURES = "i3cpsx"
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/i3cpsx/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx_2024.1.bb
new file mode 100644
index 00000000..7b88520d
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx_2024.1.bb
@@ -0,0 +1,13 @@
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "i3cpsx"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/i3cpsx/src/"
+ESW_COMPONENT_NAME = "libi3cpsx.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_2024.1.bb
index b781b82c..b781b82c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iic_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iic_2024.1.bb
index 7011f90b..7011f90b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iic_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iic_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_2024.1.bb
index e9df1cbd..e9df1cbd 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iicps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iicps_2024.1.bb
index e96dc2ac..e96dc2ac 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iicps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iicps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_2024.1.bb
index 0b4b95a8..0b4b95a8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/intc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/intc_2024.1.bb
index 331c2e32..331c2e32 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/intc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/intc_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_2024.1.bb
index 1f625521..1f625521 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_2024.1.bb
index 0b31601d..0b31601d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_2024.1.bb
index 3e2ccc0b..3e2ccc0b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_2024.1.bb
index 6b1c211a..6b1c211a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_2024.1.bb
index 1fb76b18..1fb76b18 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_2024.1.bb
index 3c4870b4..3c4870b4 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mbox_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mbox_2024.1.bb
index 5c1b8393..5c1b8393 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mbox_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mbox_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_2024.1.bb
index 64979470..64979470 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_2024.1.bb
index f13a7e54..f13a7e54 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_2024.1.bb
index fc0527da..fc0527da 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mutex_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mutex_2024.1.bb
index 98abc948..98abc948 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mutex_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mutex_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/nandps_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/nandps_2024.1.bb
new file mode 100644
index 00000000..ce3f7898
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/nandps_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "nandps"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/nandps/src/"
+ESW_COMPONENT_NAME = "libnandps.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_2024.1.bb
index 8b7a88b5..8b7a88b5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_2024.1.bb
index 6d2a71c5..6d2a71c5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_2024.1.bb
index 0ded4fd2..0ded4fd2 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_2024.1.bb
index f0548efc..f0548efc 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_2024.1.bb
index 23895fba..23895fba 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_2024.1.bb
index ccedb1df..ccedb1df 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/prc_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/prc_2024.1.bb
new file mode 100644
index 00000000..12390ae2
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/prc_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "prc"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/prc/src/"
+ESW_COMPONENT_NAME = "libprc.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/prd_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/prd_2024.1.bb
new file mode 100644
index 00000000..9ea7b2d8
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/prd_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "prd"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/prd/src/"
+ESW_COMPONENT_NAME = "libprd.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_2024.1.bb
index 674b879a..674b879a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspips_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspips_2024.1.bb
index fa28d901..fa28d901 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspips_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspips_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_2024.1.bb
index 21231450..21231450 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_2024.1.bb
index 5b4b1614..5b4b1614 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_2024.1.bb
index 243393bb..243393bb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/resetps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/resetps_2024.1.bb
index c753c666..c753c666 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/resetps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/resetps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/rfdc-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/rfdc-example_2024.1.bb
new file mode 100644
index 00000000..973e5177
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/rfdc-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+
+REQUIRED_MACHINE_FEATURES = "rfdc"
+
+DEPENDS += " rfdc"
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/rfdc/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/rfdc_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/rfdc_2024.1.bb
new file mode 100644
index 00000000..cfc106b6
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/rfdc_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "rfdc"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone libmetal"
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/rfdc/src/"
+ESW_COMPONENT_NAME = "librfdc.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_2024.1.bb
index ac386c4c..ac386c4c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_2024.1.bb
index 7b96bf16..7b96bf16 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_2024.1.bb
index cbef3ce9..cbef3ce9 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/scugic_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/scugic_2024.1.bb
index f079354d..f079354d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/scugic_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/scugic_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/scutimer_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/scutimer_2024.1.bb
new file mode 100644
index 00000000..9e101058
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/scutimer_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "scutimer"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/scutimer/src/"
+ESW_COMPONENT_NAME = "libscutimer.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/scuwdt_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/scuwdt_2024.1.bb
new file mode 100644
index 00000000..757a5de1
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/scuwdt_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "scuwdt"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/scuwdt/src/"
+ESW_COMPONENT_NAME = "libscuwdt.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sd-fec_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sd-fec_2024.1.bb
new file mode 100644
index 00000000..e4f61219
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sd-fec_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "sd-fec"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/sd_fec/src/"
+ESW_COMPONENT_NAME = "libsd_fec.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_2024.1.bb
index 550d664b..550d664b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sdps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sdps_2024.1.bb
index 4caf0e63..4caf0e63 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sdps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sdps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/spi_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/spi_2024.1.bb
new file mode 100644
index 00000000..3e564725
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/spi_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "spi"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/spi/src/"
+ESW_COMPONENT_NAME = "libspi.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_2024.1.bb
index 71ead5d3..71ead5d3 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/spips_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/spips_2024.1.bb
index ca02fda0..ca02fda0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/spips_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/spips_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_2024.1.bb
index 5bc007ad..5bc007ad 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_2024.1.bb
index 5353f6f8..5353f6f8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_2024.1.bb
index 2c76a978..2c76a978 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_2024.1.bb
index 871a77a3..871a77a3 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_2024.1.bb
index edce2794..edce2794 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_2024.1.bb
index 2c693809..2c693809 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tft_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tft_2024.1.bb
new file mode 100644
index 00000000..d8dcff08
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tft_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "tft"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/tft/src/"
+ESW_COMPONENT_NAME = "libtft.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_2024.1.bb
index dbf3d364..dbf3d364 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_2024.1.bb
index dd91fed7..dd91fed7 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_2024.1.bb
index 8224d6fe..8224d6fe 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_2024.1.bb
index cf94a9d0..cf94a9d0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_2024.1.bb
index 84c5618c..84c5618c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_2024.1.bb
index 77d000db..77d000db 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/trngpsv_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/trngpsv_2024.1.bb
new file mode 100644
index 00000000..1651ede2
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/trngpsv_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "trngpsv"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/trngpsv/src/"
+ESW_COMPONENT_NAME = "libtrngpsv.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/trngpsx_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/trngpsx_2024.1.bb
new file mode 100644
index 00000000..7699dfe5
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/trngpsx_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "trngpsx"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/trngpsx/src/"
+ESW_COMPONENT_NAME = "libtrngpsx.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_2024.1.bb
index d294c383..d294c383 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_2024.1.bb
index ea520656..ea520656 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_2024.1.bb
index 9aa0f598..9aa0f598 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_2024.1.bb
index 5998e092..5998e092 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_2024.1.bb
index d81ce77b..d81ce77b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_2024.1.bb
index a08763cb..a08763cb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_2024.1.bb
index bbff466d..bbff466d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartps_2024.1.bb
index 932be9eb..932be9eb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_2024.1.bb
index 78f878a6..78f878a6 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_2024.1.bb
index 01e48caa..01e48caa 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_2024.1.bb
index 0d4e113a..0d4e113a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usb_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usb_2024.1.bb
index 9dac8cba..9dac8cba 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usb_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usb_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usbps_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usbps_2024.1.bb
new file mode 100644
index 00000000..c4a2fff0
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usbps_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "usbps"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/usbps/src/"
+ESW_COMPONENT_NAME = "libusbps.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_2024.1.bb
index 4eb9bc93..4eb9bc93 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_2024.1.bb
index 194b1f0f..194b1f0f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_2024.1.bb
index 068a43e9..068a43e9 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_2024.1.bb
index 741fdd91..741fdd91 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_2024.1.bb
index cf2cdf6f..cf2cdf6f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_2024.1.bb
index 79ef55f2..79ef55f2 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd-example_2024.1.bb
index fc13c194..fc13c194 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_2024.1.bb
index 91ee34d8..91ee34d8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr-example_2024.1.bb
index 87a1be53..87a1be53 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_2024.1.bb
index d88ac592..d88ac592 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut-example_2024.1.bb
index 4d5dcf03..4d5dcf03 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_2024.1.bb
index 8cf95c9d..8cf95c9d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_2024.1.bb
index 1731f984..1731f984 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmi-common_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmi-common_2024.1.bb
new file mode 100644
index 00000000..1e592d40
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmi-common_2024.1.bb
@@ -0,0 +1,11 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "v-hdmi-common"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmi_common/src/"
+ESW_COMPONENT_NAME = "libv_hdmi_common.a"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmiphy1_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmiphy1_2024.1.bb
new file mode 100644
index 00000000..d3d601cb
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmiphy1_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "v-hdmiphy1"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmiphy1/src/"
+ESW_COMPONENT_NAME = "libv_hdmiphy1.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirx1_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirx1_2024.1.bb
new file mode 100644
index 00000000..f2b576cd
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirx1_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "v-hdmirx1"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmirx1/src/"
+ESW_COMPONENT_NAME = "libv_hdmirx1.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirxss1_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirxss1_2024.1.bb
new file mode 100644
index 00000000..faf57614
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirxss1_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "v-hdmirxss1"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmirxss1/src/"
+ESW_COMPONENT_NAME = "libv_hdmirxss1.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitx1_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitx1_2024.1.bb
new file mode 100644
index 00000000..7070235e
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitx1_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "v-hdmitx1"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmitx1/src/"
+ESW_COMPONENT_NAME = "libv_hdmitx1.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitxss1_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitxss1_2024.1.bb
new file mode 100644
index 00000000..de4f4ad9
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitxss1_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "v-hdmitxss1"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmitxss1/src/"
+ESW_COMPONENT_NAME = "libv_hdmitxss1.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_2024.1.bb
index b239380e..b239380e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_2024.1.bb
index f5ad5f4e..f5ad5f4e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_2024.1.bb
index 8bafbf00..8bafbf00 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_2024.1.bb
index acc19bd0..acc19bd0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler-example_2024.1.bb
index 28660316..28660316 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_2024.1.bb
index bd725dbe..bd725dbe 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_2024.1.bb
index 2859de79..2859de79 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_2024.1.bb
index 77cf9189..77cf9189 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_2024.1.bb
index 6ea70db1..6ea70db1 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_2024.1.bb
index 45913cdc..45913cdc 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_2024.1.bb
index 9528d2e0..9528d2e0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-filter_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-filter_2024.1.bb
new file mode 100644
index 00000000..f908ce55
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-filter_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "v-warp-filter"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_warp_filter/src/"
+ESW_COMPONENT_NAME = "libv_warp_filter.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-init_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-init_2024.1.bb
new file mode 100644
index 00000000..ff04ec35
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-init_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "v-warp-init"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_warp_init/src/"
+ESW_COMPONENT_NAME = "libv_warp_init.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/video-common_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/video-common_2024.1.bb
index 278dee8a..278dee8a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/video-common_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/video-common_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vphy_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vphy_2024.1.bb
new file mode 100644
index 00000000..1a06cf60
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vphy_2024.1.bb
@@ -0,0 +1,14 @@
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "vphy"
+
+inherit esw python3native
+
+DEPENDS += "xilstandalone "
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/vphy/src/"
+ESW_COMPONENT_NAME = "libvphy.a"
+
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_2024.1.bb
index d9050ec4..d9050ec4 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_2024.1.bb
index 26b2852f..26b2852f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vtc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vtc_2024.1.bb
index a82ae5ee..a82ae5ee 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/vtc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vtc_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_2024.1.bb
index 610a7476..610a7476 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_2024.1.bb
index 2c900038..2c900038 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_2024.1.bb
index cad6ca20..cad6ca20 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_2024.1.bb
index 33331c32..33331c32 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_2024.1.bb
index f8878144..f8878144 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_2024.1.bb
index 85800a27..85800a27 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_2024.1.bb
index 26983a8f..26983a8f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_2024.1.bb
index cab8e9d0..cab8e9d0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_2024.1.bb
index d6a87183..d6a87183 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_2024.1.bb
index 491eb07c..491eb07c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_2024.1.bb
index e74e3279..e74e3279 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/zdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/zdma_2024.1.bb
index e987f560..e987f560 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/zdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/zdma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_2024.1.bb
index 22d7955e..22d7955e 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_2024.1.bb
index 2ec1d6cd..2eb08307 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_2024.1.bb
@@ -25,14 +25,10 @@ ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/"
 ESW_COMPONENT_NAME = "libxil.a"
 
 DEPENDS += "xilstandalone "
+MACHINE_FEATURES:remove = "aiengine dfeccf dfeequ dfemix dfeprach rfdc dfeofdm"
 REQUIRED_MACHINE_FEATURES = "${MACHINE_FEATURES}"
 PACKAGECONFIG ?= "${MACHINE_FEATURES}"
 
-do_configure:prepend() {
-    LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetal_xparameters_xlnx.py ${ESW_MACHINE} ${S}
-    install -m 0755 xparameters.h ${S}/${ESW_COMPONENT_SRC}/
-}
-
 do_compile() {
    # Combines the .a archives produced by all of the dependent items
    cd ${RECIPE_SYSROOT}/usr/lib/
@@ -48,3 +44,12 @@ do_compile() {
    ${AR} -M <libxil.mri
    cp libxil.a ${B}
 }
+
+do_install() {
+    install -d ${D}${libdir}
+    install -m 0755  ${B}/${ESW_COMPONENT_NAME} ${D}${libdir}
+
+    # Install Spec files for consumers of BSP
+    install -d ${D}${includedir}
+    cp -rf  ${SPECFILE_PATH} ${D}${includedir}
+}
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_2024.1.bb
index 93f0b1e8..e70dfa11 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_2024.1.bb
@@ -1,17 +1,17 @@
 inherit esw python3native
 
-ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip213/src/"
-ESW_COMPONENT_NAME = "liblwip213.a"
+ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip220/src/"
+ESW_COMPONENT_NAME = "liblwip220.a"
 
 DEPENDS += "libxil"
 DEPENDS:append:xilinx-freertos = "freertos10-xilinx"
 
-EXTRA_OECMAKE += "-Dlwip213_api_mode=RAW_API"
-EXTRA_OECMAKE += "-Dlwip213_dhcp_does_arp_check=ON"
-EXTRA_OECMAKE += "-Dlwip213_dhcp=ON"
-EXTRA_OECMAKE += "-Dlwip213_pbuf_pool_size=2048"
-EXTRA_OECMAKE += "-Dlwip213_ipv6_enable=OFF"
-EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip213_api_mode=SOCKET_API"
+EXTRA_OECMAKE += "-Dlwip220_api_mode=RAW_API"
+EXTRA_OECMAKE += "-Dlwip220_dhcp_does_arp_check=ON"
+EXTRA_OECMAKE += "-Dlwip220_dhcp=ON"
+EXTRA_OECMAKE += "-Dlwip220_pbuf_pool_size=2048"
+EXTRA_OECMAKE += "-Dlwip220_ipv6_enable=OFF"
+EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip220_api_mode=SOCKET_API"
 
 do_configure:prepend() {
     # This script should also not rely on relative paths and such
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_2024.1.bb
index cae39d17..cae39d17 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_2024.1.bb
index b8dc3b33..b8dc3b33 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_2024.1.bb
index a3fb1560..a3fb1560 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga_2024.1.bb
index 6eaf40ac..6eaf40ac 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_2024.1.bb
index 11b03c1b..11b03c1b 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_2024.1.bb
index 600369ad..600369ad 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_2024.1.bb
index 77115515..77115515 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_2024.1.bb
new file mode 100644
index 00000000..bd001f64
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_2024.1.bb
@@ -0,0 +1,33 @@
+inherit esw deploy
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilnvm/examples/"
+
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILNVM_mode="client",,"
+PACKAGECONFIG[server]  ="-DXILNVM_mode="server",,"
+
+DEPENDS += "xilnvm"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+}
+addtask deploy before do_build after do_package
+
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm_2024.1.bb
new file mode 100644
index 00000000..8aa1250d
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm_2024.1.bb
@@ -0,0 +1,10 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilnvm/src/"
+ESW_COMPONENT_NAME = "libxilnvm.a"
+
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILNVM_mode="client",,"
+PACKAGECONFIG[server]  ="-DXILNVM_mode="server",,"
+
+DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else 'xilmailbox'}"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm_git.bb
deleted file mode 100644
index 9114aa72..00000000
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-
-ESW_COMPONENT_SRC = "/lib/sw_services/xilnvm/src/"
-ESW_COMPONENT_NAME = "libxilnvm.a"
-
-DEPENDS += "libxil xiltimer xilplmi"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpdi_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpdi_2024.1.bb
index c008b069..c008b069 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpdi_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpdi_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_2024.1.bb
new file mode 100644
index 00000000..cb3b7831
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_2024.1.bb
@@ -0,0 +1,6 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilplmi/src/"
+ESW_COMPONENT_NAME = "libxilplmi.a"
+
+DEPENDS += "xilstandalone libxil cfupmc xiltimer ${@'xilmailbox' if d.getVar('ESW_MACHINE') == 'psv_cortexa72_0' or d.getVar('ESW_MACHINE') == 'psv_cortexr5_0' else ''}"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_git.bb
deleted file mode 100644
index 35a1efb0..00000000
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-
-ESW_COMPONENT_SRC = "/lib/sw_services/xilplmi/src/"
-ESW_COMPONENT_NAME = "libxilplmi.a"
-
-DEPENDS += "xilstandalone libxil cfupmc"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_2024.1.bb
index 69b505c8..69b505c8 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_2024.1.bb
index ca0abc12..bbe2920b 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_2024.1.bb
@@ -2,7 +2,11 @@ inherit esw deploy
 
 ESW_COMPONENT_SRC = "/lib/sw_services/xilpuf/examples/"
 
-DEPENDS += "xilpuf xilsecure"
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILPUF_Mode="client",,"
+PACKAGECONFIG[server]  ="-DXILPUF_Mode="server",,"
+
+DEPENDS += "xilpuf xilsecure xilmailbox xilnvm xilplmi"
 
 do_configure:prepend() {
     (
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_2024.1.bb
index 81bee095..84765a39 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_2024.1.bb
@@ -3,4 +3,8 @@ inherit esw
 ESW_COMPONENT_SRC = "/lib/sw_services/xilpuf/src/"
 ESW_COMPONENT_NAME = "libxilpuf.a"
 
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILPUF_Mode="client",,"
+PACKAGECONFIG[server]  ="-DXILPUF_Mode="server",,"
+
 DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else 'xilmailbox'}"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_2024.1.bb
index 993794b5..a2b4b7a5 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_2024.1.bb
@@ -2,6 +2,10 @@ inherit esw deploy
 
 ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/examples/"
 
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILSECURE_mode="client",,"
+PACKAGECONFIG[server]  ="-DXILSECURE_mode="server",,"
+
 DEPENDS += "xilsecure"
 
 do_configure:prepend() {
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_2024.1.bb
new file mode 100644
index 00000000..be22ba90
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_2024.1.bb
@@ -0,0 +1,14 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/src/"
+ESW_COMPONENT_NAME = "libxilsecure.a"
+
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILSECURE_mode="client",,"
+PACKAGECONFIG[server]  ="-DXILSECURE_mode="server",,"
+
+DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' or d.getVar('ESW_MACHINE') == 'psv_cortexa72_0' or d.getVar('ESW_MACHINE') == 'psv_cortexr5_0' else ''} ${@'xilmailbox' if d.getVar('ESW_MACHINE') == 'psv_cortexa72_0' or d.getVar('ESW_MACHINE') == 'psv_cortexr5_0' else ''}"
+
+do_install:append() {
+    install -m 0755  ${B}/*.a ${D}${libdir}
+}
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
deleted file mode 100644
index 0001d3fb..00000000
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-
-ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/src/"
-ESW_COMPONENT_NAME = "libxilsecure.a"
-
-DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else ''} ${@'xilmailbox' if d.getVar('ESW_MACHINE') == 'psv_cortexa72_0' or d.getVar('ESW_MACHINE') == 'psv_cortexr5_0' else ''}"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsem_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsem_2024.1.bb
index 3631d7f0..3631d7f0 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsem_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsem_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilskey-example_2024.1.bb
index a4a81c8b..a42d6fd2 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilskey-example_2024.1.bb
@@ -1,29 +1,29 @@
-inherit esw deploy
-
-ESW_COMPONENT_SRC = "/lib/sw_services/xilnvm/examples/"
-
-DEPENDS += "xilnvm"
-
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    )
-}
-
-ESW_CUSTOM_LINKER_FILE ?= "None"
-EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
-}
-
-do_deploy() {
-    install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
-}
-addtask deploy before do_build after do_package
-
-FILES:${PN} = "${base_libdir}/firmware/*.elf"
+inherit esw deploy

+

+ESW_COMPONENT_SRC = "/lib/sw_services/xilskey/examples/"

+

+DEPENDS += "xilskey xilsecure"

+

+do_configure:prepend() {

+    (

+    cd ${S}

+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}

+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/

+    )

+}

+

+ESW_CUSTOM_LINKER_FILE ?= "None"

+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"

+

+do_install() {

+    install -d ${D}/${base_libdir}/firmware

+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware

+}

+

+do_deploy() {

+    install -d ${DEPLOYDIR}/${BPN}/

+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/

+}

+addtask deploy before do_build after do_package

+

+FILES:${PN} = "${base_libdir}/firmware/*.elf"

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilskey_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilskey_2024.1.bb
index 84782554..84782554 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilskey_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilskey_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_2024.1.bb
index facbfbaa..a4b0037b 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_2024.1.bb
@@ -14,5 +14,8 @@ do_configure:prepend() {
     install -m 0755 *.c ${S}/${ESW_COMPONENT_SRC}
     lopper ${DTS_FILE} -- bmcmake_metadata_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
     install -m 0755 StandaloneExample.cmake ${S}/${ESW_COMPONENT_SRC}/common/
+    LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetal_xparameters_xlnx.py ${ESW_MACHINE} ${S}
+    install -m 0755 xparameters.h ${S}/${ESW_COMPONENT_SRC}/common/
     )
+
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_2024.1.bb
index dd19671d..dd19671d 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx_%.bbappend b/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx_%.bbappend
new file mode 100644
index 00000000..5434c9a5
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx_%.bbappend
@@ -0,0 +1 @@
+require ${LAYER_PATH_openamp-layer}/vendor/xilinx/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx.inc
diff --git a/meta-xilinx-standalone-experimental/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend b/meta-xilinx-standalone-experimental/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend
new file mode 100644
index 00000000..88b45295
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend
@@ -0,0 +1 @@
+require ${LAYER_PATH_openamp-layer}/vendor/xilinx/meta-xilinx-standalone-experimental/recipes-openamp/open-amp/open-amp-xlnx.inc
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index 15b91fdb..1618bbcd 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -3,27 +3,43 @@ ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'
 
 REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https"
 
+ESW_BRANCH[git] = "master"
 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_update"
-ESW_BRANCH[2023.2] = "xlnx_rel_v2023.2"
+ESW_BRANCH[2023.2] = "xlnx_rel_v2023.2_update"
+ESW_BRANCH[2024.1] = "xlnx_rel_v2024.1-next"
 BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}"
 
+ESW_REV[git] = "${AUTOREV}"
 ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01"
 ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2"
 ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a"
-ESW_REV[2023.2] = "c9a0ee31b2a14cbcfcb56ca369037319b4ad4847"
-SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or 'invalid'}"
+ESW_REV[2023.2] = "73f0904e41cc109f18bb19a5329d0e5a66af2434"
+ESW_REV[2024.1] = "e367a6b8df2a30b12e5c88157afd98322a06c8a6"
+SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or 'INVALID'}"
 
 EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
 EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}"
 
 LICENSE = "MIT"
+LIC_FILES_CHKSUM[master] = '9fceecdbcad88698f265578f3d4cb26c'
 LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d'
 LIC_FILES_CHKSUM[xlnx_rel_v2022.2]  = 'ce611484168a6000bd35df68fc4f4290'
 LIC_FILES_CHKSUM[xlnx_rel_v2023.1_update] = '3c310a3ee2197a4c92c6a0e2937c207c'
-LIC_FILES_CHKSUM[xlnx_rel_v2023.2] = '9fceecdbcad88698f265578f3d4cb26c'
+LIC_FILES_CHKSUM[xlnx_rel_v2023.2_update] = '9fceecdbcad88698f265578f3d4cb26c'
+LIC_FILES_CHKSUM[xlnx_rel_v2024.1-next] = '9fceecdbcad88698f265578f3d4cb26c'
 LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}"
 
 SRC_URI = "${EMBEDDEDSW_SRCURI}"
 PV .= "+git${SRCPV}"
+
+python() {
+    if d.getVar('BB_NO_NETWORK') == '1':
+        try:
+            # Just evaluating SRCPV / SRCREV can trigger an exception when BB_NO_NETWORK is enabled.
+            var = d.getVar('SRCPV')
+            var = d.getVar('SRCREV')
+        except:
+            raise bb.parse.SkipRecipe('BB_NO_NETWORK is enabled, can not fetch SRCREV (%s)' % d.getVar('SRCREV'))
+}
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
index 814cb9cd..4d591707 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
@@ -15,6 +15,9 @@ ESW_CFLAGS ?= ""
 
 # Cortex R5 requires an additional cflag to be passed for compatibility with the embeddedsw
 TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -DARMR5', '', d)}"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr52', ' -DARMR5 -DARMR52', '', d)}"
+TUNE_CCARGS:append:versal = " -Dversal"
+TUNE_CCARGS:append:versal-net = " -DVERSAL_NET"
 
 # Make sure all regular recipes are excluded from compatibility
 # Avoid using this for native, nativesdk or cross recipes
@@ -25,9 +28,8 @@ COMPATIBLE_HOST ?= "${COMPATOS}"
 
 # Clear defaults
 PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
-
-PREFERRED_VERSION_libmetal-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}"
-PREFERRED_VERSION_open-amp-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}"
+PREFERRED_PROVIDER_libmetal = "libmetal-xlnx"
+PREFERRED_PROVIDER_open-amp = "open-amp-xlnx"
 
 # Workaround for pulling in nativesdk-mingw-w64-winpthreads
 TOOLCHAIN_HOST_TASK:append:sdkmingw32 = " nativesdk-mingw-w64-winpthreads"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bb
new file mode 100644
index 00000000..8816dc4d
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bb
@@ -0,0 +1,11 @@
+require fsbl-firmware.inc
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI += " \
+            file://makefile-skip-copy_bsp.sh.patch \
+            file://fsbl-fixups.patch \
+           "
+
+# This version does not build for zynq
+COMPATIBLE_MACHINE:zynq = "none"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1.bb
new file mode 100644
index 00000000..37861b75
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1.bb
@@ -0,0 +1,29 @@
+require plm-firmware.inc
+
+# Separate build directories for versal and versal-net
+SOC_DIR = "versal"
+SOC_DIR:versal-net = "versal_net"
+B = "${S}/lib/sw_apps/versal_plm/src/${SOC_DIR}"
+
+BSP_DIR ?= "${B}/../../misc/versal_plm_bsp"
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI += " \
+            file://makefile-skip-copy_bsp.sh.patch \
+            file://0001-versal_fw-Fixup-core-makefiles.patch \
+           "
+
+EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
+
+do_configure() {
+    # manually do the copy_bsp step first, so as to be able to fix up use of
+    # mb-* commands
+    ${B}/../../misc/${SOC_DIR}/copy_bsp.sh
+}
+
+do_compile() {
+    oe_runmake
+
+    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
+}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1.bb
new file mode 100644
index 00000000..fe6deddc
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1.bb
@@ -0,0 +1,16 @@
+require pmu-firmware.inc
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI += " \
+            file://makefile-skip-copy_bsp.sh.patch \
+            file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \
+           "
+
+EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
+
+do_compile() {
+    oe_runmake
+
+    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
+}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1.bb
new file mode 100644
index 00000000..569c5a46
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1.bb
@@ -0,0 +1,34 @@
+require psm-firmware.inc
+
+# Separate build directories for versal and versal-net
+SOC_DIR = "versal"
+SOC_DIR:versal-net = "versal_net"
+B = "${S}/lib/sw_apps/versal_psmfw/src/${SOC_DIR}"
+
+BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp"
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI += " \
+            file://makefile-skip-copy_bsp.sh.patch \
+            file://0001-versal_fw-Fixup-core-makefiles.patch \
+           "
+
+EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
+
+# Override default since we're in a subdirectory deeper now...
+do_configure() {
+    # manually do the copy_bsp step first, so as to be able to fix up use of
+    # mb-* commands
+    if [ ${SOC_DIR} != "versal" ]; then
+        ${B}/../../misc/${SOC_DIR}/copy_bsp.sh
+    else
+        ${B}/../../misc/copy_bsp.sh
+    fi
+}
+
+do_compile() {
+    oe_runmake
+
+    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
+}
diff --git a/meta-xilinx-virtualization/COPYING.MIT b/meta-xilinx-virtualization/COPYING.MIT
new file mode 100644
index 00000000..fb950dc6
--- /dev/null
+++ b/meta-xilinx-virtualization/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
diff --git a/meta-xilinx-virtualization/README.md b/meta-xilinx-virtualization/README.md
new file mode 100644
index 00000000..ad6d4ada
--- /dev/null
+++ b/meta-xilinx-virtualization/README.md
@@ -0,0 +1,143 @@
+# meta-xilinx-vendor
+
+This layer enables AMD Xilinx Xen configurations and features for ZynqMP and
+Versal devices and also provides related metadata.
+
+## Xen Build Instructions
+
+The Yocto Project setup for AMD Xilinx Xen configurations workflow is as follows.
+Be sure to read everything below.
+
+1. Follow [Building Instructions](../README.building.md) upto step 2.
+
+2. Clone the meta-security repository.
+
+```
+$ git clone -b <release-branch> https://git.yoctoproject.org/meta-security
+```
+
+3. Continue [Building Instructions](../README.building.md) from step 4.
+
+> **Note:**
+> * For System Device Tree(SDT) workflow see [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md)
+
+4. Add meta-xilinx-virtualization layer to bblayers.conf as shown below.
+
+```
+$ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-xilinx-virtualization
+```
+
+5. The following variables needs to be added to the end of the conf/local.conf file.
+
+```
+# Xen variables
+BOOTMODE = "xen"
+ENABLE_XEN_UBOOT_SCR = "1"
+ENABLE_XEN_DTSI = "1"
+ENABLE_XEN_QEMU_DTSI = "1"
+
+DISTRO_FEATURES:append = " multiarch security tpm virtualization vmsep xen"
+
+IMAGE_FEATURES += "ssh-server-openssh"
+
+DISTRO_FEATURES:append = " systemd"
+VIRTUAL-RUNTIME_init_manager = "systemd"
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+
+IMAGE_INSTALL:append = " \
+    kernel-module-xen-blkback \
+    kernel-module-xen-gntalloc \
+    kernel-module-xen-gntdev \
+    kernel-module-xen-netback \
+    kernel-module-xen-wdt \
+    xen \
+    xen-tools \
+    xen-tools-xenstat \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-aarch64 qemu-keymaps', 'qemu', d)} \
+    "
+```
+
+6. Continue [Building Instructions](../README.building.md) from step 5.
+
+## Xen Boot Instructions
+
+> **Note:**
+> * This README provides instructions for Xen Dom0 only.
+
+1. Follow [Booting Instructions](../README.booting.md) upto step 2.
+
+2. Verify Xen Dom0 is up and running on QEMU or target as shown below.
+
+```
+Poky (Yocto Project Reference Distro) 4.1.4 zynqmp-generic hvc0
+
+zynqmp-generic login: root
+root@zynqmp-generic:~# xl list
+Name                                        ID   Mem VCPUs      State   Time(s)
+Domain-0                                     0  1500     1     r-----     123.5
+root@zynqmp-generic:~# xl info
+host                   : zynqmp-generic
+release                : 6.1.0-xilinx-v2024.1
+version                : #1 SMP Thu Dec 21 07:00:11 UTC 2023
+machine                : aarch64
+nr_cpus                : 4
+max_cpu_id             : 3
+nr_nodes               : 1
+cores_per_socket       : 1
+threads_per_core       : 1
+cpu_mhz                : 99.990
+hw_caps                : 00000000:00000000:00000000:00000000:00000000:00000000:00000000:00000000
+virt_caps              : hvm hvm_directio hap iommu_hap_pt_share vpmu gnttab-v1
+total_memory           : 4095
+free_memory            : 2529
+sharing_freed_memory   : 0
+sharing_used_memory    : 0
+outstanding_claims     : 0
+free_cpus              : 0
+xen_major              : 4
+xen_minor              : 17
+xen_extra              : .0
+xen_version            : 4.17.0
+xen_caps               : xen-3.0-aarch64 xen-3.0-armv7l
+xen_scheduler          : credit2
+xen_pagesize           : 4096
+platform_params        : virt_start=0x200000
+xen_changeset          : Tue Dec 12 10:08:40 2023 +0100 git:38eebc6e5c-dirty
+xen_commandline        : console=dtuart dtuart=serial0 dom0_mem=1500M dom0_max_vcpus=1 bootscrub=0 vwfi=native
+cc_compiler            : aarch64-poky-linux-gcc (GCC) 12.2.0
+cc_compile_by          : santraju
+cc_compile_domain      :
+cc_compile_date        : 2023-12-12
+build_id               : 5e2952e1dd06c52a2a09ada7476333c48d88a285
+xend_config_format     : 4
+root@zynqmp-generic:~#
+```
+
+## Dependencies
+
+This layer depends on:
+
+        URI: https://git.yoctoproject.org/poky
+        layers: meta, meta-poky
+        branch: langdale
+
+        URI: https://git.openembedded.org/meta-openembedded
+        layers: meta-oe, meta-python, meta-filesystems, meta-networking.
+        branch: langdale
+
+        URI:
+        https://git.yoctoproject.org/meta-xilinx (official version)
+        https://github.com/Xilinx/meta-xilinx (development and amd xilinx release)
+        layers: meta-xilinx-core, meta-xilinx-standalone
+        branch: langdale or amd xilinx release version (e.g. rel-v2024.1)
+
+        URI: https://git.yoctoproject.org/meta-virtualization
+        branch: langdale
+
+        URI: https://git.yoctoproject.org/meta-security
+        layers: meta-tpm
+        branch: langdale
+
+## References
+
+* https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/18842530/Xen+Hypervisor
diff --git a/meta-xilinx-virtualization/conf/layer.conf b/meta-xilinx-virtualization/conf/layer.conf
new file mode 100644
index 00000000..5e03cde4
--- /dev/null
+++ b/meta-xilinx-virtualization/conf/layer.conf
@@ -0,0 +1,27 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have packages directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "xilinx-virtualization"
+BBFILE_PATTERN_xilinx-virtualization = "^${LAYERDIR}/"
+BBFILE_PRIORITY_xilinx-virtualization = "5"
+
+LAYERDEPENDS_xilinx-virtualization = "\
+    xilinx \
+    virtualization-layer \
+    security \
+    tpm-layer \
+    "
+
+LAYERSERIES_COMPAT_xilinx-virtualization = "scarthgap"
+
+XILINX_XEN_VERSION[v2022.1] = "4.17-xilinx+git%"
+XILINX_XEN_VERSION[v2022.2] = "4.17-xilinx+git%"
+XILINX_XEN_VERSION[v2023.1] = "4.17-xilinx+git%"
+XILINX_XEN_VERSION[v2023.2] = "4.17-xilinx+git%"
+XILINX_XEN_VERSION[v2024.1] = "4.18-xilinx+git%"
+PREFERRED_VERSION_xen ?= "${@d.getVarFlag('XILINX_XEN_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
+PREFERRED_VERSION_xen-tools ?= "${@d.getVarFlag('XILINX_XEN_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-native_%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-native_%.bbappend
new file mode 100644
index 00000000..e84844cf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-native_%.bbappend
@@ -0,0 +1 @@
+require qemu-tpm.inc
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-system-native_%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-system-native_%.bbappend
new file mode 100644
index 00000000..e84844cf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-system-native_%.bbappend
@@ -0,0 +1 @@
+require qemu-tpm.inc
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-tpm.inc b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-tpm.inc
new file mode 100644
index 00000000..a582b035
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-tpm.inc
@@ -0,0 +1,4 @@
+PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm', ' tpm', '', d)}"
+
+PACKAGECONFIG[tpm] = "--enable-tpm,--disable-tpm,,swtpm libtpm"
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_7.1.inc b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_7.1.inc
new file mode 100644
index 00000000..1210a3de
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_7.1.inc
@@ -0,0 +1,33 @@
+# Xen-4.17 specific changes are only applicable on the target
+SRC_URI_XEN = ""
+SRC_URI_XEN:class-target = " \
+          file://0001-xen-pt-fix-syntax-error-that-causes-FTBFS-in-some-co.patch \
+          file://0001-xen_common-return-error-from-xen_create_ioreq_server.patch \
+          file://0002-xen-mapcache-move-xen-mapcache.c-to-hw-xen.patch \
+          file://0003-hw-i386-xen-rearrange-xen_hvm_init_pc.patch \
+          file://0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch \
+          file://0005-xen-hvm-create-arch_handle_ioreq-and-arch_xen_set_me.patch \
+          file://0006-xen-hvm-move-common-functions-to-hw-xen-xen-hvm-comm.patch \
+          file://0007-xen-skip-ioreq-creation-on-ioreq-registration-failur.patch \
+          file://0008-accel-xen-xen-all-export-xenstore_record_dm_state.patch \
+          file://0009-xen-hvm-enable-xen-hvm-common-build-for-ARM.patch \
+          file://0010-hw-arm-introduce-xenpv-machine.patch \
+          file://0011-meson.build-do-not-set-have_xen_pci_passthrough-for-.patch \
+          file://0012-xen-arm-call-qemu_find_tpm_be-if-CONFIG_TPM.patch \
+          file://0013-arm-xenpv-fix-TPM-address-print-warning.patch \
+          file://0014-xen_arm-Create-virtio-mmio-devices-during-initializa.patch \
+          file://0015-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch \
+          file://0016-xen_arm-Add-accel-xen-and-drop-extra-interface-openi.patch \
+          file://0001-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch \
+          file://0002-xen-add-pseudo-RAM-region-for-grant-mappings.patch \
+          file://0003-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch \
+          file://0004-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch \
+          file://0005-memory-add-MemoryRegion-map-and-unmap-callbacks.patch \
+          file://0006-xen-add-map-and-unmap-callbacks-for-grant-region.patch \
+          file://0007-xen-mapcache-Fix-build-on-Arm.patch \
+          file://0008-hw-arm-Add-grant-mapping.patch \
+          "
+
+FILESEXTRAPATHS:prepend:class-target := "${THISDIR}/qemu-xilinx-7.1:"
+
+SRC_URI .= "${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${SRC_URI_XEN}', '', d)}"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_8.1.inc b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_8.1.inc
new file mode 100644
index 00000000..c674dc1a
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_8.1.inc
@@ -0,0 +1,20 @@
+# Xen-4.18 specific changes are only applicable on the target
+SRC_URI_XEN = ""
+SRC_URI_XEN:class-target = " \
+    file://0001-xen_arm-Create-virtio-mmio-devices-during-initializa.patch \
+    file://0002-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch \
+    file://0003-Xen-Fix-xen_set_irq-and-xendevicemodel_set_irq_level.patch \
+    file://0004-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch \
+    file://0005-softmmu-physmem-Split-ram_block_add.patch \
+    file://0006-xen-add-pseudo-RAM-region-for-grant-mappings.patch \
+    file://0007-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch \
+    file://0008-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch \
+    file://0009-memory-add-MemoryRegion-map-and-unmap-callbacks.patch \
+    file://0010-xen-add-map-and-unmap-callbacks-for-grant-region.patch \
+    file://0011-hw-arm-Add-grant-mapping.patch \
+    file://0001-arm-xenpvh-Introduce-virtio-pci-support.patch \
+    "
+
+FILESEXTRAPATHS:prepend:class-target := "${THISDIR}/qemu-xilinx-8.1:"
+
+SRC_URI .= "${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${SRC_URI_XEN}', '', d)}"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-pt-fix-syntax-error-that-causes-FTBFS-in-some-co.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-pt-fix-syntax-error-that-causes-FTBFS-in-some-co.patch
new file mode 100644
index 00000000..99eaeeaf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-pt-fix-syntax-error-that-causes-FTBFS-in-some-co.patch
@@ -0,0 +1,40 @@
+From ba24456b93a205b728475d5f0880f3ec495e383a Mon Sep 17 00:00:00 2001
+From: Chuck Zmudzinski <brchuckz@aol.com>
+Date: Mon, 31 Oct 2022 17:35:52 -0400
+Subject: [PATCH] xen/pt: fix syntax error that causes FTBFS in some
+ configurations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When Qemu is built with --enable-xen and --disable-xen-pci-passthrough
+and the target os is linux, the build fails with:
+
+meson.build:3477:2: ERROR: File xen_pt_stub.c does not exist.
+
+Fixes: 582ea95f5f93 ("meson: convert hw/xen")
+
+Signed-off-by: Chuck Zmudzinski <brchuckz@aol.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Message-Id: <5f1342a13c09af77b1a7b0aeaba5955bcea89731.1667242033.git.brchuckz@aol.com>
+Signed-off-by: Laurent Vivier <laurent@vivier.eu>
+---
+ hw/xen/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xen/meson.build b/hw/xen/meson.build
+index 08dc1f6857..ae0ace3046 100644
+--- a/hw/xen/meson.build
++++ b/hw/xen/meson.build
+@@ -18,7 +18,7 @@ if have_xen_pci_passthrough
+     'xen_pt_msi.c',
+   ))
+ else
+-  xen_specific_ss.add('xen_pt_stub.c')
++  xen_specific_ss.add(files('xen_pt_stub.c'))
+ endif
+ 
+ specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)
+-- 
+2.17.0
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch
new file mode 100644
index 00000000..71dfb3be
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch
@@ -0,0 +1,51 @@
+From e2b85efc82bc26a838f666c8282528ee38cf6377 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Tue, 16 Mar 2021 14:00:33 +0100
+Subject: [PATCH 1/8] xen: when unplugging emulated devices skip virtio devices
+
+Virtio devices should never be unplugged at boot time, as they are
+similar to pci passthrough devices.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/i386/xen/xen_platform.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
+index a64265cca0..39bbb12675 100644
+--- a/hw/i386/xen/xen_platform.c
++++ b/hw/i386/xen/xen_platform.c
+@@ -30,6 +30,7 @@
+ #include "hw/pci/pci.h"
+ #include "hw/xen/xen_common.h"
+ #include "migration/vmstate.h"
++#include "hw/virtio/virtio-bus.h"
+ #include "hw/xen/xen-legacy-backend.h"
+ #include "trace.h"
+ #include "sysemu/xen.h"
+@@ -114,7 +115,8 @@ static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)
+     /* We have to ignore passthrough devices */
+     if (pci_get_word(d->config + PCI_CLASS_DEVICE) ==
+             PCI_CLASS_NETWORK_ETHERNET
+-            && strcmp(d->name, "xen-pci-passthrough") != 0) {
++            && strcmp(d->name, "xen-pci-passthrough") != 0
++            && !qdev_get_child_bus(&d->qdev, TYPE_VIRTIO_BUS)) {
+         object_unparent(OBJECT(d));
+     }
+ }
+@@ -191,6 +193,11 @@ static void unplug_disks(PCIBus *b, PCIDevice *d, void *opaque)
+         return;
+     }
+ 
++    /* Ignore virtio devices */
++    if (qdev_get_child_bus(&d->qdev, TYPE_VIRTIO_BUS)) {
++        return;
++    }
++
+     switch (pci_get_word(d->config + PCI_CLASS_DEVICE)) {
+     case PCI_CLASS_STORAGE_IDE:
+         pci_xen_ide_unplug(DEVICE(d), aux);
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen_common-return-error-from-xen_create_ioreq_server.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen_common-return-error-from-xen_create_ioreq_server.patch
new file mode 100644
index 00000000..d4349b1d
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen_common-return-error-from-xen_create_ioreq_server.patch
@@ -0,0 +1,55 @@
+From ef4d512aff004c62d550cdd64329c6c1acd0f217 Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Fri, 1 Jul 2022 18:48:03 -0700
+Subject: [PATCH 01/16] xen_common: return error from xen_create_ioreq_server
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ include/hw/xen/xen_common.h | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
+index 77ce17d8a4..c2d2f36bde 100644
+--- a/include/hw/xen/xen_common.h
++++ b/include/hw/xen/xen_common.h
+@@ -467,8 +467,8 @@ static inline void xen_unmap_pcidev(domid_t dom,
+ {
+ }
+ 
+-static inline void xen_create_ioreq_server(domid_t dom,
+-                                           ioservid_t *ioservid)
++static inline int xen_create_ioreq_server(domid_t dom,
++                                          ioservid_t *ioservid)
+ {
+ }
+ 
+@@ -600,8 +600,8 @@ static inline void xen_unmap_pcidev(domid_t dom,
+                                                   PCI_FUNC(pci_dev->devfn));
+ }
+ 
+-static inline void xen_create_ioreq_server(domid_t dom,
+-                                           ioservid_t *ioservid)
++static inline int xen_create_ioreq_server(domid_t dom,
++                                          ioservid_t *ioservid)
+ {
+     int rc = xendevicemodel_create_ioreq_server(xen_dmod, dom,
+                                                 HVM_IOREQSRV_BUFIOREQ_ATOMIC,
+@@ -609,12 +609,14 @@ static inline void xen_create_ioreq_server(domid_t dom,
+ 
+     if (rc == 0) {
+         trace_xen_ioreq_server_create(*ioservid);
+-        return;
++        return rc;
+     }
+ 
+     *ioservid = 0;
+     use_default_ioreq_server = true;
+     trace_xen_default_ioreq_server();
++
++    return rc;
+ }
+ 
+ static inline void xen_destroy_ioreq_server(domid_t dom,
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-add-pseudo-RAM-region-for-grant-mappings.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-add-pseudo-RAM-region-for-grant-mappings.patch
new file mode 100644
index 00000000..8facb189
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-add-pseudo-RAM-region-for-grant-mappings.patch
@@ -0,0 +1,252 @@
+From e18daac2f6d3f60c8217f44189a91cf8240a591f Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 11:19:58 +0200
+Subject: [PATCH 2/8] xen: add pseudo RAM region for grant mappings
+
+Add a memory region which can be used to automatically map granted
+memory. It is starting at 0x8000000000000000ULL in order to be able to
+distinguish it from normal RAM.
+
+For this reason the xen.ram memory region is expanded, which has no
+further impact as it is used just as a container of the real RAM
+regions and now the grant region.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/i386/xen/xen-hvm.c           |  3 ++
+ hw/xen/xen-hvm-common.c         |  4 +--
+ hw/xen/xen-mapcache.c           | 28 +++++++++++++++
+ include/exec/ram_addr.h         |  1 +
+ include/hw/xen/xen-hvm-common.h |  2 ++
+ include/hw/xen/xen_pvdev.h      |  3 ++
+ include/sysemu/xen-mapcache.h   |  3 ++
+ softmmu/physmem.c               | 61 ++++++++++++++++++++-------------
+ 8 files changed, 80 insertions(+), 25 deletions(-)
+
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index 36d87555a9..2dcc2e1179 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -171,6 +171,9 @@ static void xen_ram_init(PCMachineState *pcms,
+                                  x86ms->above_4g_mem_size);
+         memory_region_add_subregion(sysmem, 0x100000000ULL, &ram_hi);
+     }
++
++    /* Add grant mappings as a pseudo RAM region. */
++    ram_grants = *xen_init_grant_ram();
+ }
+ 
+ static XenPhysmap *get_physmapping(hwaddr start_addr, ram_addr_t size)
+diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
+index 7e7d23397f..abd6e379d3 100644
+--- a/hw/xen/xen-hvm-common.c
++++ b/hw/xen/xen-hvm-common.c
+@@ -10,7 +10,7 @@
+ #include "hw/boards.h"
+ #include "hw/xen/arch_hvm.h"
+ 
+-MemoryRegion ram_memory;
++MemoryRegion ram_memory, ram_grants;
+ 
+ MemoryListener xen_io_listener = {
+     .name = "xen-io",
+@@ -742,7 +742,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
+         return;
+     }
+ 
+-    if (mr == &ram_memory) {
++    if (mr == &ram_memory || mr == &ram_grants) {
+         return;
+     }
+ 
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index a2f93096e7..0b75f1633a 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -14,7 +14,10 @@
+ 
+ #include <sys/resource.h>
+ 
++#include "hw/xen/xen-hvm-common.h"
+ #include "hw/xen/xen-legacy-backend.h"
++#include "hw/xen/xen_pvdev.h"
++
+ #include "qemu/bitmap.h"
+ 
+ #include "sysemu/runstate.h"
+@@ -597,3 +600,28 @@ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+     mapcache_unlock();
+     return p;
+ }
++
++MemoryRegion *xen_init_grant_ram(void)
++{
++    RAMBlock *block;
++
++    memory_region_init(&ram_grants, NULL, "xen.grants",
++                       XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE);
++    block = g_malloc0(sizeof(*block));
++    block->mr = &ram_grants;
++    block->used_length = XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE;
++    block->max_length = XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE;
++    block->fd = -1;
++    block->page_size = XC_PAGE_SIZE;
++    block->host = (void *)XEN_GRANT_ADDR_OFF;
++    block->offset = XEN_GRANT_ADDR_OFF;
++    block->flags = RAM_PREALLOC;
++    ram_grants.ram_block = block;
++    ram_grants.ram = true;
++    ram_grants.terminates = true;
++    ram_block_add_list(block);
++    memory_region_add_subregion(get_system_memory(), XEN_GRANT_ADDR_OFF,
++                                &ram_grants);
++
++    return &ram_grants;
++}
+diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
+index f3e0c78161..e60b055867 100644
+--- a/include/exec/ram_addr.h
++++ b/include/exec/ram_addr.h
+@@ -137,6 +137,7 @@ void qemu_ram_free(RAMBlock *block);
+ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp);
+ 
+ void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length);
++void ram_block_add_list(RAMBlock *new_block);
+ 
+ /* Clear whole block of mem */
+ static inline void qemu_ram_block_writeback(RAMBlock *block)
+diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h
+index 2979f84ee2..6f7cc05d38 100644
+--- a/include/hw/xen/xen-hvm-common.h
++++ b/include/hw/xen/xen-hvm-common.h
+@@ -16,6 +16,8 @@
+ #include <xen/hvm/ioreq.h>
+ 
+ extern MemoryRegion ram_memory;
++
++extern MemoryRegion ram_grants;
+ extern MemoryListener xen_io_listener;
+ extern DeviceListener xen_device_listener;
+ 
+diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h
+index 7cd4bc2b82..36cd3ec1d4 100644
+--- a/include/hw/xen/xen_pvdev.h
++++ b/include/hw/xen/xen_pvdev.h
+@@ -78,4 +78,7 @@ int xen_pv_send_notify(struct XenLegacyDevice *xendev);
+ void xen_pv_printf(struct XenLegacyDevice *xendev, int msg_level,
+                    const char *fmt, ...)  G_GNUC_PRINTF(3, 4);
+ 
++#define XEN_GRANT_ADDR_OFF    0x8000000000000000ULL
++#define XEN_MAX_VIRTIO_GRANTS 65536
++
+ #endif /* QEMU_HW_XEN_PVDEV_H */
+diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h
+index c8e7c2f6cf..f4bedb1c11 100644
+--- a/include/sysemu/xen-mapcache.h
++++ b/include/sysemu/xen-mapcache.h
+@@ -10,6 +10,7 @@
+ #define XEN_MAPCACHE_H
+ 
+ #include "exec/cpu-common.h"
++#include "exec/ram_addr.h"
+ 
+ typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset,
+                                          ram_addr_t size);
+@@ -25,6 +26,8 @@ void xen_invalidate_map_cache(void);
+ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+                                  hwaddr new_phys_addr,
+                                  hwaddr size);
++MemoryRegion *xen_init_grant_ram(void);
++
+ #else
+ 
+ static inline void xen_map_cache_init(phys_offset_to_gaddr_t f,
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index dc3c3e5f2e..63ba5f7495 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -1971,12 +1971,46 @@ static void dirty_memory_extend(ram_addr_t old_ram_size,
+     }
+ }
+ 
++static void ram_block_add_list_locked(RAMBlock *new_block)
++ {
++     RAMBlock *block;
++     RAMBlock *last_block = NULL;
++
++    /* Keep the list sorted from biggest to smallest block.  Unlike QTAILQ,
++     * QLIST (which has an RCU-friendly variant) does not have insertion at
++     * tail, so save the last element in last_block.
++     */
++    RAMBLOCK_FOREACH(block) {
++        last_block = block;
++        if (block->max_length < new_block->max_length) {
++            break;
++        }
++    }
++    if (block) {
++        QLIST_INSERT_BEFORE_RCU(block, new_block, next);
++    } else if (last_block) {
++        QLIST_INSERT_AFTER_RCU(last_block, new_block, next);
++    } else { /* list is empty */
++        QLIST_INSERT_HEAD_RCU(&ram_list.blocks, new_block, next);
++    }
++    ram_list.mru_block = NULL;
++
++    /* Write list before version */
++    smp_wmb();
++    ram_list.version++;
++}
++
++void ram_block_add_list(RAMBlock *new_block)
++{
++    qemu_mutex_lock_ramlist();
++    ram_block_add_list_locked(new_block);
++    qemu_mutex_unlock_ramlist();
++}
++
+ static void ram_block_add(RAMBlock *new_block, Error **errp)
+ {
+     const bool noreserve = qemu_ram_is_noreserve(new_block);
+     const bool shared = qemu_ram_is_shared(new_block);
+-    RAMBlock *block;
+-    RAMBlock *last_block = NULL;
+     ram_addr_t old_ram_size, new_ram_size;
+     Error *err = NULL;
+ 
+@@ -2014,28 +2048,9 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
+     if (new_ram_size > old_ram_size) {
+         dirty_memory_extend(old_ram_size, new_ram_size);
+     }
+-    /* Keep the list sorted from biggest to smallest block.  Unlike QTAILQ,
+-     * QLIST (which has an RCU-friendly variant) does not have insertion at
+-     * tail, so save the last element in last_block.
+-     */
+-    RAMBLOCK_FOREACH(block) {
+-        last_block = block;
+-        if (block->max_length < new_block->max_length) {
+-            break;
+-        }
+-    }
+-    if (block) {
+-        QLIST_INSERT_BEFORE_RCU(block, new_block, next);
+-    } else if (last_block) {
+-        QLIST_INSERT_AFTER_RCU(last_block, new_block, next);
+-    } else { /* list is empty */
+-        QLIST_INSERT_HEAD_RCU(&ram_list.blocks, new_block, next);
+-    }
+-    ram_list.mru_block = NULL;
+ 
+-    /* Write list before version */
+-    smp_wmb();
+-    ram_list.version++;
++    ram_block_add_list_locked(new_block);
++
+     qemu_mutex_unlock_ramlist();
+ 
+     cpu_physical_memory_set_dirty_range(new_block->offset,
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-mapcache-move-xen-mapcache.c-to-hw-xen.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-mapcache-move-xen-mapcache.c-to-hw-xen.patch
new file mode 100644
index 00000000..35ca6df4
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-mapcache-move-xen-mapcache.c-to-hw-xen.patch
@@ -0,0 +1,88 @@
+From 423468bdb3728154e95af18ef755bc75c5d59a3a Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Thu, 30 Jun 2022 18:19:50 -0700
+Subject: [PATCH 02/16] xen-mapcache: move xen-mapcache.c to hw/xen
+
+xen-mapcache.c contains common functions which are useful for Xen on ARM
+IOREQ handling. Moving it out of i386 to hw/xen for commong access.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/i386/meson.build              | 1 +
+ hw/i386/xen/meson.build          | 1 -
+ hw/i386/xen/trace-events         | 5 -----
+ hw/xen/meson.build               | 4 ++++
+ hw/xen/trace-events              | 5 +++++
+ hw/{i386 => }/xen/xen-mapcache.c | 0
+ 6 files changed, 10 insertions(+), 6 deletions(-)
+ rename hw/{i386 => }/xen/xen-mapcache.c (100%)
+
+diff --git a/hw/i386/meson.build b/hw/i386/meson.build
+index 213e2e82b3..cfdbfdcbcb 100644
+--- a/hw/i386/meson.build
++++ b/hw/i386/meson.build
+@@ -33,5 +33,6 @@ subdir('kvm')
+ subdir('xen')
+ 
+ i386_ss.add_all(xenpv_ss)
++i386_ss.add_all(xen_ss)
+ 
+ hw_arch += {'i386': i386_ss}
+diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build
+index be84130300..2fcc46e6ca 100644
+--- a/hw/i386/xen/meson.build
++++ b/hw/i386/xen/meson.build
+@@ -1,6 +1,5 @@
+ i386_ss.add(when: 'CONFIG_XEN', if_true: files(
+   'xen-hvm.c',
+-  'xen-mapcache.c',
+   'xen_apic.c',
+   'xen_platform.c',
+   'xen_pvdevice.c',
+diff --git a/hw/i386/xen/trace-events b/hw/i386/xen/trace-events
+index 5d6be61090..a0c89d91c4 100644
+--- a/hw/i386/xen/trace-events
++++ b/hw/i386/xen/trace-events
+@@ -21,8 +21,3 @@ xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p"
+ cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
+ cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
+ 
+-# xen-mapcache.c
+-xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64
+-xen_remap_bucket(uint64_t index) "index 0x%"PRIx64
+-xen_map_cache_return(void* ptr) "%p"
+-
+diff --git a/hw/xen/meson.build b/hw/xen/meson.build
+index ae0ace3046..19d0637c46 100644
+--- a/hw/xen/meson.build
++++ b/hw/xen/meson.build
+@@ -22,3 +22,7 @@ else
+ endif
+ 
+ specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)
++
++xen_ss = ss.source_set()
++
++xen_ss.add(when: 'CONFIG_XEN', if_true: files('xen-mapcache.c'))
+diff --git a/hw/xen/trace-events b/hw/xen/trace-events
+index 3da3fd8348..2c8f238f42 100644
+--- a/hw/xen/trace-events
++++ b/hw/xen/trace-events
+@@ -41,3 +41,8 @@ xs_node_vprintf(char *path, char *value) "%s %s"
+ xs_node_vscanf(char *path, char *value) "%s %s"
+ xs_node_watch(char *path) "%s"
+ xs_node_unwatch(char *path) "%s"
++
++# xen-mapcache.c
++xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64
++xen_remap_bucket(uint64_t index) "index 0x%"PRIx64
++xen_map_cache_return(void* ptr) "%p"
+diff --git a/hw/i386/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+similarity index 100%
+rename from hw/i386/xen/xen-mapcache.c
+rename to hw/xen/xen-mapcache.c
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-hw-i386-xen-rearrange-xen_hvm_init_pc.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-hw-i386-xen-rearrange-xen_hvm_init_pc.patch
new file mode 100644
index 00000000..1113cf39
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-hw-i386-xen-rearrange-xen_hvm_init_pc.patch
@@ -0,0 +1,106 @@
+From 4472924c800e9dbf46e4c2432565d3e406b35d27 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 1 Jul 2022 16:32:33 -0700
+Subject: [PATCH 03/16] hw/i386/xen: rearrange xen_hvm_init_pc
+
+Move references to:
+- xen_get_vmport_regs_pfn
+- xen_suspend_notifier
+- xen_wakeup_notifier
+- xen_ram_init
+
+towards the end of the function. This is done to keep the the common
+ioreq functions in one place which will be moved to new function in next
+patch in order to make it useful to ARM machines also.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/i386/xen/xen-hvm.c | 49 ++++++++++++++++++++++---------------------
+ 1 file changed, 25 insertions(+), 24 deletions(-)
+
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index e4293d6d66..b27484ad22 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -1416,12 +1416,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+     state->exit.notify = xen_exit_notifier;
+     qemu_add_exit_notifier(&state->exit);
+ 
+-    state->suspend.notify = xen_suspend_notifier;
+-    qemu_register_suspend_notifier(&state->suspend);
+-
+-    state->wakeup.notify = xen_wakeup_notifier;
+-    qemu_register_wakeup_notifier(&state->wakeup);
+-
+     /*
+      * Register wake-up support in QMP query-current-machine API
+      */
+@@ -1432,23 +1426,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+         goto err;
+     }
+ 
+-    rc = xen_get_vmport_regs_pfn(xen_xc, xen_domid, &ioreq_pfn);
+-    if (!rc) {
+-        DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn);
+-        state->shared_vmport_page =
+-            xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE,
+-                                 1, &ioreq_pfn, NULL);
+-        if (state->shared_vmport_page == NULL) {
+-            error_report("map shared vmport IO page returned error %d handle=%p",
+-                         errno, xen_xc);
+-            goto err;
+-        }
+-    } else if (rc != -ENOSYS) {
+-        error_report("get vmport regs pfn returned error %d, rc=%d",
+-                     errno, rc);
+-        goto err;
+-    }
+-
+     /* Note: cpus is empty at this point in init */
+     state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus);
+ 
+@@ -1486,7 +1463,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+ #else
+     xen_map_cache_init(NULL, state);
+ #endif
+-    xen_ram_init(pcms, ms->ram_size, ram_memory);
+ 
+     qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
+ 
+@@ -1513,6 +1489,31 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+     QLIST_INIT(&xen_physmap);
+     xen_read_physmap(state);
+ 
++    state->suspend.notify = xen_suspend_notifier;
++    qemu_register_suspend_notifier(&state->suspend);
++
++    state->wakeup.notify = xen_wakeup_notifier;
++    qemu_register_wakeup_notifier(&state->wakeup);
++
++    rc = xen_get_vmport_regs_pfn(xen_xc, xen_domid, &ioreq_pfn);
++    if (!rc) {
++        DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn);
++        state->shared_vmport_page =
++            xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE,
++                                 1, &ioreq_pfn, NULL);
++        if (state->shared_vmport_page == NULL) {
++            error_report("map shared vmport IO page returned error %d handle=%p",
++                         errno, xen_xc);
++            goto err;
++        }
++    } else if (rc != -ENOSYS) {
++        error_report("get vmport regs pfn returned error %d, rc=%d",
++                     errno, rc);
++        goto err;
++    }
++
++    xen_ram_init(pcms, ms->ram_size, ram_memory);
++
+     /* Disable ACPI build because Xen handles it */
+     pcms->acpi_build_enabled = false;
+ 
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch
new file mode 100644
index 00000000..bff815bc
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch
@@ -0,0 +1,113 @@
+From cb4be1f7185c5974523c764f3f6efe3af6633d71 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 11:54:48 +0200
+Subject: [PATCH 3/8] softmmu: let qemu_map_ram_ptr() use qemu_ram_ptr_length()
+
+qemu_map_ram_ptr() and qemu_ram_ptr_length() share quite some code, so
+modify qemu_ram_ptr_length() a little bit and use it for
+qemu_map_ram_ptr(), too.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ softmmu/physmem.c | 56 ++++++++++++++++++-----------------------------
+ 1 file changed, 21 insertions(+), 35 deletions(-)
+
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index 63ba5f7495..439a53a1be 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -2306,38 +2306,7 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
+ }
+ #endif /* !_WIN32 */
+ 
+-/* Return a host pointer to ram allocated with qemu_ram_alloc.
+- * This should not be used for general purpose DMA.  Use address_space_map
+- * or address_space_rw instead. For local memory (e.g. video ram) that the
+- * device owns, use memory_region_get_ram_ptr.
+- *
+- * Called within RCU critical section.
+- */
+-void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr)
+-{
+-    RAMBlock *block = ram_block;
+-
+-    if (block == NULL) {
+-        block = qemu_get_ram_block(addr);
+-        addr -= block->offset;
+-    }
+-
+-    if (xen_enabled() && block->host == NULL) {
+-        /* We need to check if the requested address is in the RAM
+-         * because we don't want to map the entire memory in QEMU.
+-         * In that case just map until the end of the page.
+-         */
+-        if (block->offset == 0) {
+-            return xen_map_cache(addr, 0, 0, false);
+-        }
+-
+-        block->host = xen_map_cache(block->offset, block->max_length, 1, false);
+-    }
+-    return ramblock_ptr(block, addr);
+-}
+-
+-/* Return a host pointer to guest's ram. Similar to qemu_map_ram_ptr
+- * but takes a size argument.
++/* Return a host pointer to guest's ram.
+  *
+  * Called within RCU critical section.
+  */
+@@ -2345,7 +2314,9 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+                                  hwaddr *size, bool lock)
+ {
+     RAMBlock *block = ram_block;
+-    if (*size == 0) {
++    hwaddr len = 0;
++
++    if (size && *size == 0) {
+         return NULL;
+     }
+ 
+@@ -2353,7 +2324,10 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+         block = qemu_get_ram_block(addr);
+         addr -= block->offset;
+     }
+-    *size = MIN(*size, block->max_length - addr);
++    if (size) {
++        *size = MIN(*size, block->max_length - addr);
++        len = *size;
++    }
+ 
+     if (xen_enabled() && block->host == NULL) {
+         /* We need to check if the requested address is in the RAM
+@@ -2361,7 +2335,7 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+          * In that case just map the requested area.
+          */
+         if (block->offset == 0) {
+-            return xen_map_cache(addr, *size, lock, lock);
++            return xen_map_cache(addr, len, lock, lock);
+         }
+ 
+         block->host = xen_map_cache(block->offset, block->max_length, 1, lock);
+@@ -2370,6 +2344,18 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+     return ramblock_ptr(block, addr);
+ }
+ 
++/* Return a host pointer to ram allocated with qemu_ram_alloc.
++ * This should not be used for general purpose DMA.  Use address_space_map
++ * or address_space_rw instead. For local memory (e.g. video ram) that the
++ * device owns, use memory_region_get_ram_ptr.
++ *
++ * Called within RCU critical section.
++ */
++void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr)
++{
++    return qemu_ram_ptr_length(ram_block, addr, NULL, false);
++}
++
+ /* Return the offset of a hostpointer within a ramblock */
+ ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host)
+ {
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch
new file mode 100644
index 00000000..4337e0c8
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch
@@ -0,0 +1,180 @@
+From 2a01fa06d267f68148d3a6df50675edfe090601a Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Fri, 1 Jul 2022 18:16:52 -0700
+Subject: [PATCH 04/16] xen-hvm: move x86-specific fields out of XenIOState
+
+Move:
+- shared_vmport_page
+- log_for_dirtybit
+- dirty_bitmap
+- suspend
+- wakeup
+
+out of XenIOState as they are only used on x86, especially the ones
+related to dirty logging.
+
+Remove free_phys_offset that was unused.
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/i386/xen/xen-hvm.c | 58 ++++++++++++++++++++-----------------------
+ 1 file changed, 27 insertions(+), 31 deletions(-)
+
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index b27484ad22..225cfdf8b7 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -73,6 +73,7 @@ struct shared_vmport_iopage {
+ };
+ typedef struct shared_vmport_iopage shared_vmport_iopage_t;
+ #endif
++static shared_vmport_iopage_t *shared_vmport_page;
+ 
+ static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
+ {
+@@ -95,6 +96,11 @@ typedef struct XenPhysmap {
+ } XenPhysmap;
+ 
+ static QLIST_HEAD(, XenPhysmap) xen_physmap;
++static const XenPhysmap *log_for_dirtybit = NULL;
++/* Buffer used by xen_sync_dirty_bitmap */
++static unsigned long *dirty_bitmap = NULL;
++static Notifier suspend;
++static Notifier wakeup;
+ 
+ typedef struct XenPciDevice {
+     PCIDevice *pci_dev;
+@@ -105,7 +111,6 @@ typedef struct XenPciDevice {
+ typedef struct XenIOState {
+     ioservid_t ioservid;
+     shared_iopage_t *shared_page;
+-    shared_vmport_iopage_t *shared_vmport_page;
+     buffered_iopage_t *buffered_io_page;
+     xenforeignmemory_resource_handle *fres;
+     QEMUTimer *buffered_io_timer;
+@@ -125,14 +130,8 @@ typedef struct XenIOState {
+     MemoryListener io_listener;
+     QLIST_HEAD(, XenPciDevice) dev_list;
+     DeviceListener device_listener;
+-    hwaddr free_phys_offset;
+-    const XenPhysmap *log_for_dirtybit;
+-    /* Buffer used by xen_sync_dirty_bitmap */
+-    unsigned long *dirty_bitmap;
+ 
+     Notifier exit;
+-    Notifier suspend;
+-    Notifier wakeup;
+ } XenIOState;
+ 
+ /* Xen specific function for piix pci */
+@@ -462,10 +461,10 @@ static int xen_remove_from_physmap(XenIOState *state,
+     }
+ 
+     QLIST_REMOVE(physmap, list);
+-    if (state->log_for_dirtybit == physmap) {
+-        state->log_for_dirtybit = NULL;
+-        g_free(state->dirty_bitmap);
+-        state->dirty_bitmap = NULL;
++    if (log_for_dirtybit == physmap) {
++        log_for_dirtybit = NULL;
++        g_free(dirty_bitmap);
++        dirty_bitmap = NULL;
+     }
+     g_free(physmap);
+ 
+@@ -626,16 +625,16 @@ static void xen_sync_dirty_bitmap(XenIOState *state,
+         return;
+     }
+ 
+-    if (state->log_for_dirtybit == NULL) {
+-        state->log_for_dirtybit = physmap;
+-        state->dirty_bitmap = g_new(unsigned long, bitmap_size);
+-    } else if (state->log_for_dirtybit != physmap) {
++    if (log_for_dirtybit == NULL) {
++        log_for_dirtybit = physmap;
++        dirty_bitmap = g_new(unsigned long, bitmap_size);
++    } else if (log_for_dirtybit != physmap) {
+         /* Only one range for dirty bitmap can be tracked. */
+         return;
+     }
+ 
+     rc = xen_track_dirty_vram(xen_domid, start_addr >> TARGET_PAGE_BITS,
+-                              npages, state->dirty_bitmap);
++                              npages, dirty_bitmap);
+     if (rc < 0) {
+ #ifndef ENODATA
+ #define ENODATA  ENOENT
+@@ -650,7 +649,7 @@ static void xen_sync_dirty_bitmap(XenIOState *state,
+     }
+ 
+     for (i = 0; i < bitmap_size; i++) {
+-        unsigned long map = state->dirty_bitmap[i];
++        unsigned long map = dirty_bitmap[i];
+         while (map != 0) {
+             j = ctzl(map);
+             map &= ~(1ul << j);
+@@ -676,12 +675,10 @@ static void xen_log_start(MemoryListener *listener,
+ static void xen_log_stop(MemoryListener *listener, MemoryRegionSection *section,
+                          int old, int new)
+ {
+-    XenIOState *state = container_of(listener, XenIOState, memory_listener);
+-
+     if (old & ~new & (1 << DIRTY_MEMORY_VGA)) {
+-        state->log_for_dirtybit = NULL;
+-        g_free(state->dirty_bitmap);
+-        state->dirty_bitmap = NULL;
++        log_for_dirtybit = NULL;
++        g_free(dirty_bitmap);
++        dirty_bitmap = NULL;
+         /* Disable dirty bit tracking */
+         xen_track_dirty_vram(xen_domid, 0, 0, NULL);
+     }
+@@ -1021,9 +1018,9 @@ static void handle_vmport_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     vmware_regs_t *vmport_regs;
+ 
+-    assert(state->shared_vmport_page);
++    assert(shared_vmport_page);
+     vmport_regs =
+-        &state->shared_vmport_page->vcpu_vmport_regs[state->send_vcpu];
++        &shared_vmport_page->vcpu_vmport_regs[state->send_vcpu];
+     QEMU_BUILD_BUG_ON(sizeof(*req) < sizeof(*vmport_regs));
+ 
+     current_cpu = state->cpu_by_vcpu_id[state->send_vcpu];
+@@ -1468,7 +1465,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+ 
+     state->memory_listener = xen_memory_listener;
+     memory_listener_register(&state->memory_listener, &address_space_memory);
+-    state->log_for_dirtybit = NULL;
+ 
+     state->io_listener = xen_io_listener;
+     memory_listener_register(&state->io_listener, &address_space_io);
+@@ -1489,19 +1485,19 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+     QLIST_INIT(&xen_physmap);
+     xen_read_physmap(state);
+ 
+-    state->suspend.notify = xen_suspend_notifier;
+-    qemu_register_suspend_notifier(&state->suspend);
++    suspend.notify = xen_suspend_notifier;
++    qemu_register_suspend_notifier(&suspend);
+ 
+-    state->wakeup.notify = xen_wakeup_notifier;
+-    qemu_register_wakeup_notifier(&state->wakeup);
++    wakeup.notify = xen_wakeup_notifier;
++    qemu_register_wakeup_notifier(&wakeup);
+ 
+     rc = xen_get_vmport_regs_pfn(xen_xc, xen_domid, &ioreq_pfn);
+     if (!rc) {
+         DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn);
+-        state->shared_vmport_page =
++        shared_vmport_page =
+             xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE,
+                                  1, &ioreq_pfn, NULL);
+-        if (state->shared_vmport_page == NULL) {
++        if (shared_vmport_page == NULL) {
+             error_report("map shared vmport IO page returned error %d handle=%p",
+                          errno, xen_xc);
+             goto err;
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch
new file mode 100644
index 00000000..25dc0ae0
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch
@@ -0,0 +1,49 @@
+From 7dfa8828bd2e61fc5bf2bf6294aad16b2bf4ff8a Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 13:31:32 +0200
+Subject: [PATCH 4/8] xen: let xen_ram_addr_from_mapcache() return -1 in case
+ of not found entry
+
+Today xen_ram_addr_from_mapcache() will either abort() or return 0 in
+case it can't find a matching entry for a pointer value. Both cases
+are bad, so change that to return an invalid address instead.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/xen/xen-mapcache.c | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index 0b75f1633a..e53e7221f1 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -405,13 +405,8 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
+         }
+     }
+     if (!found) {
+-        fprintf(stderr, "%s, could not find %p\n", __func__, ptr);
+-        QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
+-            DPRINTF("   "TARGET_FMT_plx" -> %p is present\n", reventry->paddr_index,
+-                    reventry->vaddr_req);
+-        }
+-        abort();
+-        return 0;
++        mapcache_unlock();
++        return RAM_ADDR_INVALID;
+     }
+ 
+     entry = &mapcache->entry[paddr_index % mapcache->nr_buckets];
+@@ -419,8 +414,7 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
+         entry = entry->next;
+     }
+     if (!entry) {
+-        DPRINTF("Trying to find address %p that is not in the mapcache!\n", ptr);
+-        raddr = 0;
++        raddr = RAM_ADDR_INVALID;
+     } else {
+         raddr = (reventry->paddr_index << MCACHE_BUCKET_SHIFT) +
+              ((unsigned long) ptr - (unsigned long) entry->vaddr_base);
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-memory-add-MemoryRegion-map-and-unmap-callbacks.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-memory-add-MemoryRegion-map-and-unmap-callbacks.patch
new file mode 100644
index 00000000..db6d8fe5
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-memory-add-MemoryRegion-map-and-unmap-callbacks.patch
@@ -0,0 +1,150 @@
+From bd32a130ca633eae7cf0f4ff0fa856004d413df0 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 27 May 2021 15:27:55 +0200
+Subject: [PATCH 5/8] memory: add MemoryRegion map and unmap callbacks
+
+In order to support mapping and unmapping guest memory dynamically to
+and from qemu during address_space_[un]map() operations add the map()
+and unmap() callbacks to MemoryRegionOps.
+
+Those will be used e.g. for Xen grant mappings when performing guest
+I/Os.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ include/exec/memory.h | 19 +++++++++++++++++
+ softmmu/physmem.c     | 47 +++++++++++++++++++++++++++++++++----------
+ 2 files changed, 55 insertions(+), 11 deletions(-)
+
+diff --git a/include/exec/memory.h b/include/exec/memory.h
+index bfb1de8eea..19e2aac694 100644
+--- a/include/exec/memory.h
++++ b/include/exec/memory.h
+@@ -245,6 +245,25 @@ struct MemoryRegionOps {
+                                     unsigned size,
+                                     MemTxAttrs attrs);
+ 
++    /* Dynamically create mapping. @addr is the guest address to map; @plen
++     * is the pointer to the usable length of the buffer.
++     * @mr contents can be changed in case a new memory region is created for
++     * the mapping.
++     * Returns the buffer address for accessing the data. */
++    void *(*map)(MemoryRegion **mr,
++                 hwaddr addr,
++                 hwaddr *plen,
++                 bool is_write,
++                 MemTxAttrs attrs);
++
++    /* Unmap an area obtained via map() before. */
++    void (*unmap)(MemoryRegion *mr,
++                  void *buffer,
++                  ram_addr_t addr,
++                  hwaddr len,
++                  bool is_write,
++                  hwaddr access_len);
++
+     enum device_endian endianness;
+     /* Guest-visible constraints: */
+     struct {
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index 439a53a1be..2038240311 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -3237,7 +3237,7 @@ void *address_space_map(AddressSpace *as,
+     hwaddr len = *plen;
+     hwaddr l, xlat;
+     MemoryRegion *mr;
+-    void *ptr;
++    void *ptr = NULL;
+     FlatView *fv;
+ 
+     if (len == 0) {
+@@ -3273,10 +3273,17 @@ void *address_space_map(AddressSpace *as,
+ 
+ 
+     memory_region_ref(mr);
++
++    if (mr->ops && mr->ops->map) {
++        ptr = mr->ops->map(&mr, addr, plen, is_write, attrs);
++    }
++
+     *plen = flatview_extend_translation(fv, addr, len, mr, xlat,
+                                         l, is_write, attrs);
+     fuzz_dma_read_cb(addr, *plen, mr);
+-    ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true);
++    if (ptr == NULL) {
++        ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true);
++    }
+ 
+     return ptr;
+ }
+@@ -3294,11 +3301,16 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,
+ 
+         mr = memory_region_from_host(buffer, &addr1);
+         assert(mr != NULL);
+-        if (is_write) {
+-            invalidate_and_set_dirty(mr, addr1, access_len);
+-        }
+-        if (xen_enabled()) {
+-            xen_invalidate_map_cache_entry(buffer);
++
++        if (mr->ops && mr->ops->unmap) {
++            mr->ops->unmap(mr, buffer, addr1, len, is_write, access_len);
++        } else {
++            if (is_write) {
++                invalidate_and_set_dirty(mr, addr1, access_len);
++            }
++            if (xen_enabled()) {
++                xen_invalidate_map_cache_entry(buffer);
++            }
+         }
+         memory_region_unref(mr);
+         return;
+@@ -3370,10 +3382,17 @@ int64_t address_space_cache_init(MemoryRegionCache *cache,
+          * doing this if we found actual RAM, which behaves the same
+          * regardless of attributes; so UNSPECIFIED is fine.
+          */
++        if (mr->ops && mr->ops->map) {
++            cache->ptr = mr->ops->map(&mr, addr, &l, is_write,
++                                      MEMTXATTRS_UNSPECIFIED);
++        }
++
+         l = flatview_extend_translation(cache->fv, addr, len, mr,
+                                         cache->xlat, l, is_write,
+                                         MEMTXATTRS_UNSPECIFIED);
+-        cache->ptr = qemu_ram_ptr_length(mr->ram_block, cache->xlat, &l, true);
++        if (!cache->ptr) {
++            cache->ptr = qemu_ram_ptr_length(mr->ram_block, cache->xlat, &l, true);
++        }
+     } else {
+         cache->ptr = NULL;
+     }
+@@ -3395,14 +3414,20 @@ void address_space_cache_invalidate(MemoryRegionCache *cache,
+ 
+ void address_space_cache_destroy(MemoryRegionCache *cache)
+ {
+-    if (!cache->mrs.mr) {
++    MemoryRegion *mr = cache->mrs.mr;
++
++    if (!mr) {
+         return;
+     }
+ 
+-    if (xen_enabled()) {
++    if (mr->ops && mr->ops->unmap) {
++            mr->ops->unmap(mr, cache->ptr, cache->xlat, cache->len,
++                           cache->is_write, cache->len);
++    } else if (xen_enabled()) {
+         xen_invalidate_map_cache_entry(cache->ptr);
+     }
+-    memory_region_unref(cache->mrs.mr);
++
++    memory_region_unref(mr);
+     flatview_unref(cache->fv);
+     cache->mrs.mr = NULL;
+     cache->fv = NULL;
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-xen-hvm-create-arch_handle_ioreq-and-arch_xen_set_me.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-xen-hvm-create-arch_handle_ioreq-and-arch_xen_set_me.patch
new file mode 100644
index 00000000..6b56a39e
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-xen-hvm-create-arch_handle_ioreq-and-arch_xen_set_me.patch
@@ -0,0 +1,192 @@
+From c38436434fc888ba8844d99eab451f9b734e5e5b Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Fri, 1 Jul 2022 19:34:39 -0700
+Subject: [PATCH 05/16] xen-hvm: create arch_handle_ioreq and
+ arch_xen_set_memory
+
+In preparation to moving most of xen-hvm code to an arch-neutral
+location, move the x86-specific portion of xen_set_memory to
+arch_xen_set_memory.
+
+Also move handle_vmport_ioreq to arch_handle_ioreq.
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/i386/xen/xen-hvm.c          | 98 ++++++++++++++++++++--------------
+ include/hw/i386/xen_arch_hvm.h | 10 ++++
+ include/hw/xen/arch_hvm.h      |  3 ++
+ 3 files changed, 71 insertions(+), 40 deletions(-)
+ create mode 100644 include/hw/i386/xen_arch_hvm.h
+ create mode 100644 include/hw/xen/arch_hvm.h
+
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index 225cfdf8b7..178f0c68fc 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -134,6 +134,8 @@ typedef struct XenIOState {
+     Notifier exit;
+ } XenIOState;
+ 
++#include "hw/xen/arch_hvm.h"
++
+ /* Xen specific function for piix pci */
+ 
+ int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
+@@ -476,10 +478,6 @@ static void xen_set_memory(struct MemoryListener *listener,
+                            bool add)
+ {
+     XenIOState *state = container_of(listener, XenIOState, memory_listener);
+-    hwaddr start_addr = section->offset_within_address_space;
+-    ram_addr_t size = int128_get64(section->size);
+-    bool log_dirty = memory_region_is_logging(section->mr, DIRTY_MEMORY_VGA);
+-    hvmmem_type_t mem_type;
+ 
+     if (section->mr == &ram_memory) {
+         return;
+@@ -492,38 +490,7 @@ static void xen_set_memory(struct MemoryListener *listener,
+                                      section);
+         }
+     }
+-
+-    if (!memory_region_is_ram(section->mr)) {
+-        return;
+-    }
+-
+-    if (log_dirty != add) {
+-        return;
+-    }
+-
+-    trace_xen_client_set_memory(start_addr, size, log_dirty);
+-
+-    start_addr &= TARGET_PAGE_MASK;
+-    size = TARGET_PAGE_ALIGN(size);
+-
+-    if (add) {
+-        if (!memory_region_is_rom(section->mr)) {
+-            xen_add_to_physmap(state, start_addr, size,
+-                               section->mr, section->offset_within_region);
+-        } else {
+-            mem_type = HVMMEM_ram_ro;
+-            if (xen_set_mem_type(xen_domid, mem_type,
+-                                 start_addr >> TARGET_PAGE_BITS,
+-                                 size >> TARGET_PAGE_BITS)) {
+-                DPRINTF("xen_set_mem_type error, addr: "TARGET_FMT_plx"\n",
+-                        start_addr);
+-            }
+-        }
+-    } else {
+-        if (xen_remove_from_physmap(state, start_addr, size) < 0) {
+-            DPRINTF("physmapping does not exist at "TARGET_FMT_plx"\n", start_addr);
+-        }
+-    }
++    arch_xen_set_memory(state, section, add);
+ }
+ 
+ static void xen_region_add(MemoryListener *listener,
+@@ -1051,9 +1018,6 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req)
+         case IOREQ_TYPE_COPY:
+             cpu_ioreq_move(req);
+             break;
+-        case IOREQ_TYPE_VMWARE_PORT:
+-            handle_vmport_ioreq(state, req);
+-            break;
+         case IOREQ_TYPE_TIMEOFFSET:
+             break;
+         case IOREQ_TYPE_INVALIDATE:
+@@ -1063,7 +1027,7 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req)
+             cpu_ioreq_config(state, req);
+             break;
+         default:
+-            hw_error("Invalid ioreq type 0x%x\n", req->type);
++            arch_handle_ioreq(state, req);
+     }
+     if (req->dir == IOREQ_READ) {
+         trace_handle_ioreq_read(req, req->type, req->df, req->data_is_ptr,
+@@ -1604,3 +1568,57 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
+         memory_global_dirty_log_stop(GLOBAL_DIRTY_MIGRATION);
+     }
+ }
++
++void arch_xen_set_memory(XenIOState *state,MemoryRegionSection *section,
++                                bool add)
++{
++    hwaddr start_addr = section->offset_within_address_space;
++    ram_addr_t size = int128_get64(section->size);
++    bool log_dirty = memory_region_is_logging(section->mr, DIRTY_MEMORY_VGA);
++    hvmmem_type_t mem_type;
++
++    if (!memory_region_is_ram(section->mr)) {
++        return;
++    }
++
++    if (log_dirty != add) {
++        return;
++    }
++
++    trace_xen_client_set_memory(start_addr, size, log_dirty);
++
++    start_addr &= TARGET_PAGE_MASK;
++    size = TARGET_PAGE_ALIGN(size);
++
++    if (add) {
++        if (!memory_region_is_rom(section->mr)) {
++            xen_add_to_physmap(state, start_addr, size,
++                               section->mr, section->offset_within_region);
++        } else {
++            mem_type = HVMMEM_ram_ro;
++            if (xen_set_mem_type(xen_domid, mem_type,
++                                 start_addr >> TARGET_PAGE_BITS,
++                                 size >> TARGET_PAGE_BITS)) {
++                DPRINTF("xen_set_mem_type error, addr: "TARGET_FMT_plx"\n",
++                        start_addr);
++            }
++        }
++    } else {
++        if (xen_remove_from_physmap(state, start_addr, size) < 0) {
++            DPRINTF("physmapping does not exist at "TARGET_FMT_plx"\n", start_addr);
++        }
++    }
++}
++
++void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
++{
++    switch (req->type) {
++        case IOREQ_TYPE_VMWARE_PORT:
++            handle_vmport_ioreq(state, req);
++            break;
++        default:
++            hw_error("Invalid ioreq type 0x%x\n", req->type);
++    }
++
++    return;
++}
+diff --git a/include/hw/i386/xen_arch_hvm.h b/include/hw/i386/xen_arch_hvm.h
+new file mode 100644
+index 0000000000..1b2c71ba4f
+--- /dev/null
++++ b/include/hw/i386/xen_arch_hvm.h
+@@ -0,0 +1,10 @@
++#ifndef HW_XEN_ARCH_I386_HVM_H
++#define HW_XEN_ARCH_I386_HVM_H
++
++#include <xen/hvm/ioreq.h>
++
++void arch_handle_ioreq(XenIOState *state, ioreq_t *req);
++void arch_xen_set_memory(XenIOState *state,
++                         MemoryRegionSection *section,
++                         bool add);
++#endif
+diff --git a/include/hw/xen/arch_hvm.h b/include/hw/xen/arch_hvm.h
+new file mode 100644
+index 0000000000..26674648d8
+--- /dev/null
++++ b/include/hw/xen/arch_hvm.h
+@@ -0,0 +1,3 @@
++#if defined(TARGET_I386) || defined(TARGET_X86_64)
++#include "hw/i386/xen_arch_hvm.h"
++#endif
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-add-map-and-unmap-callbacks-for-grant-region.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-add-map-and-unmap-callbacks-for-grant-region.patch
new file mode 100644
index 00000000..87bbc3c6
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-add-map-and-unmap-callbacks-for-grant-region.patch
@@ -0,0 +1,255 @@
+From ef94d70d4a22c5282d6955a7ed066ef502e99829 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Fri, 26 Aug 2022 13:57:06 +0200
+Subject: [PATCH 6/8] xen: add map and unmap callbacks for grant region
+
+Add the callbacks for mapping/unmapping guest memory via grants to the
+special grant memory region.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/xen/xen-mapcache.c | 167 +++++++++++++++++++++++++++++++++++++++++-
+ softmmu/physmem.c     |  11 ++-
+ 2 files changed, 173 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index e53e7221f1..f81b75d216 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -9,6 +9,8 @@
+  */
+ 
+ #include "qemu/osdep.h"
++#include "qemu/queue.h"
++#include "qemu/thread.h"
+ #include "qemu/units.h"
+ #include "qemu/error-report.h"
+ 
+@@ -24,6 +26,8 @@
+ #include "sysemu/xen-mapcache.h"
+ #include "trace.h"
+ 
++#include <xenevtchn.h>
++#include <xengnttab.h>
+ 
+ //#define MAPCACHE_DEBUG
+ 
+@@ -386,7 +390,7 @@ uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size,
+     return p;
+ }
+ 
+-ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
++static ram_addr_t xen_ram_addr_from_mapcache_try(void *ptr)
+ {
+     MapCacheEntry *entry = NULL;
+     MapCacheRev *reventry;
+@@ -595,10 +599,170 @@ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+     return p;
+ }
+ 
++struct XENMappedGrantRegion {
++    void *addr;
++    unsigned int pages;
++    unsigned int refs;
++    unsigned int prot;
++    uint32_t idx;
++    QLIST_ENTRY(XENMappedGrantRegion) list;
++};
++
++static xengnttab_handle *xen_region_gnttabdev;
++static QLIST_HEAD(GrantRegionList, XENMappedGrantRegion) xen_grant_mappings =
++    QLIST_HEAD_INITIALIZER(xen_grant_mappings);
++static QemuMutex xen_map_mutex;
++
++static void *xen_map_grant_dyn(MemoryRegion **mr, hwaddr addr, hwaddr *plen,
++                               bool is_write, MemTxAttrs attrs)
++{
++    unsigned int page_off = addr & (XC_PAGE_SIZE - 1);
++    unsigned int i;
++    unsigned int nrefs = (page_off + *plen + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
++    uint32_t ref = (addr - XEN_GRANT_ADDR_OFF) >> XC_PAGE_SHIFT;
++    uint32_t *refs;
++    unsigned int prot = PROT_READ;
++    struct XENMappedGrantRegion *mgr = NULL;
++
++    if (is_write) {
++        prot |= PROT_WRITE;
++    }
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->idx == ref &&
++            mgr->pages == nrefs &&
++            (mgr->prot & prot) == prot) {
++            break;
++        }
++    }
++    if (!mgr) {
++        mgr = g_new(struct XENMappedGrantRegion, 1);
++
++        if (nrefs == 1) {
++            refs = &ref;
++        } else {
++            refs = g_new(uint32_t, nrefs);
++            for (i = 0; i < nrefs; i++) {
++                refs[i] = ref + i;
++            }
++        }
++        mgr->addr = xengnttab_map_domain_grant_refs(xen_region_gnttabdev, nrefs,
++                                                    xen_domid, refs, prot);
++        if (mgr->addr) {
++            mgr->pages = nrefs;
++            mgr->refs = 1;
++            mgr->prot = prot;
++            mgr->idx = ref;
++
++            QLIST_INSERT_HEAD(&xen_grant_mappings, mgr, list);
++        } else {
++            g_free(mgr);
++            mgr = NULL;
++        }
++    } else {
++        mgr->refs++;
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++
++    if (nrefs > 1) {
++        g_free(refs);
++    }
++
++    return mgr ? mgr->addr + page_off : NULL;
++}
++
++static void xen_unmap_grant_dyn(MemoryRegion *mr, void *buffer, ram_addr_t addr,
++                                hwaddr len, bool is_write, hwaddr access_len)
++{
++    unsigned int page_off = (unsigned long)buffer & (XC_PAGE_SIZE - 1);
++    unsigned int nrefs = (page_off + len + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
++    unsigned int prot = PROT_READ;
++    struct XENMappedGrantRegion *mgr = NULL;
++
++    if (is_write) {
++        prot |= PROT_WRITE;
++    }
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->addr == buffer - page_off &&
++            mgr->pages == nrefs &&
++            (mgr->prot & prot) == prot) {
++            break;
++        }
++    }
++    if (mgr) {
++        mgr->refs--;
++        if (!mgr->refs) {
++            xengnttab_unmap(xen_region_gnttabdev, mgr->addr, nrefs);
++
++            QLIST_REMOVE(mgr, list);
++            g_free(mgr);
++        }
++    } else {
++        error_report("xen_unmap_grant_dyn() trying to unmap unknown buffer");
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++}
++
++static ram_addr_t xen_ram_addr_from_grant_cache(void *ptr)
++{
++    unsigned int page_off = (unsigned long)ptr & (XC_PAGE_SIZE - 1);
++    struct XENMappedGrantRegion *mgr = NULL;
++    ram_addr_t raddr = RAM_ADDR_INVALID;
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->addr == ptr - page_off) {
++            break;
++        }
++    }
++
++    if (mgr) {
++        raddr = (mgr->idx << XC_PAGE_SHIFT) + page_off + XEN_GRANT_ADDR_OFF;
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++
++    return raddr;
++}
++
++ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
++{
++    ram_addr_t raddr;
++
++    raddr = xen_ram_addr_from_mapcache_try(ptr);
++    if (raddr == RAM_ADDR_INVALID) {
++        raddr = xen_ram_addr_from_grant_cache(ptr);
++    }
++
++    return raddr;
++}
++
++static const struct MemoryRegionOps xen_grant_mr_ops = {
++    .map = xen_map_grant_dyn,
++    .unmap = xen_unmap_grant_dyn,
++    .endianness = DEVICE_LITTLE_ENDIAN,
++};
++
+ MemoryRegion *xen_init_grant_ram(void)
+ {
+     RAMBlock *block;
+ 
++    qemu_mutex_init(&xen_map_mutex);
++
++    xen_region_gnttabdev = xengnttab_open(NULL, 0);
++    if (xen_region_gnttabdev == NULL) {
++        fprintf(stderr, "can't open gnttab device\n");
++        return NULL;
++    }
++
+     memory_region_init(&ram_grants, NULL, "xen.grants",
+                        XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE);
+     block = g_malloc0(sizeof(*block));
+@@ -613,6 +777,7 @@ MemoryRegion *xen_init_grant_ram(void)
+     ram_grants.ram_block = block;
+     ram_grants.ram = true;
+     ram_grants.terminates = true;
++    ram_grants.ops = &xen_grant_mr_ops;
+     ram_block_add_list(block);
+     memory_region_add_subregion(get_system_memory(), XEN_GRANT_ADDR_OFF,
+                                 &ram_grants);
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index 2038240311..6b2a02fc87 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -2391,13 +2391,16 @@ RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset,
+ 
+     if (xen_enabled()) {
+         ram_addr_t ram_addr;
++
+         RCU_READ_LOCK_GUARD();
+         ram_addr = xen_ram_addr_from_mapcache(ptr);
+-        block = qemu_get_ram_block(ram_addr);
+-        if (block) {
+-            *offset = ram_addr - block->offset;
++        if (ram_addr != RAM_ADDR_INVALID) {
++            block = qemu_get_ram_block(ram_addr);
++            if (block) {
++                *offset = ram_addr - block->offset;
++            }
++            return block;
+         }
+-        return block;
+     }
+ 
+     RCU_READ_LOCK_GUARD();
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-hvm-move-common-functions-to-hw-xen-xen-hvm-comm.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-hvm-move-common-functions-to-hw-xen-xen-hvm-comm.patch
new file mode 100644
index 00000000..7df302a2
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-hvm-move-common-functions-to-hw-xen-xen-hvm-comm.patch
@@ -0,0 +1,2094 @@
+From 87d362e72e65b604da7554657204344a6540d88c Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 1 Jul 2022 15:59:47 -0700
+Subject: [PATCH 06/16] xen-hvm: move common functions to
+ hw/xen/xen-hvm-common.c
+
+Extract common functionalities from xen-hvm.c and move them to
+hw/xen/xen-hvm-common.c. These common functions are useful for creating
+an IOREQ server.
+
+Moved the common usable IOREQ creation part to a new function
+xen_register_ioreq() which can be used by both x86 and ARM machines.
+
+NOTE: This patch will break the build as the patch only involves moving
+of functions. Build fixes will be in the next patch.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/i386/xen/trace-events        |  14 -
+ hw/i386/xen/xen-hvm.c           | 927 +-------------------------------
+ hw/xen/meson.build              |   5 +-
+ hw/xen/trace-events             |  14 +
+ hw/xen/xen-hvm-common.c         | 861 +++++++++++++++++++++++++++++
+ include/hw/i386/xen_arch_hvm.h  |   1 +
+ include/hw/xen/xen-hvm-common.h |  98 ++++
+ 7 files changed, 986 insertions(+), 934 deletions(-)
+ create mode 100644 hw/xen/xen-hvm-common.c
+ create mode 100644 include/hw/xen/xen-hvm-common.h
+
+diff --git a/hw/i386/xen/trace-events b/hw/i386/xen/trace-events
+index a0c89d91c4..5d0a8d6dcf 100644
+--- a/hw/i386/xen/trace-events
++++ b/hw/i386/xen/trace-events
+@@ -7,17 +7,3 @@ xen_platform_log(char *s) "xen platform: %s"
+ xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO space (address 0x%"PRIx64")"
+ xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space (address 0x%"PRIx64")"
+ 
+-# xen-hvm.c
+-xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: 0x%lx, size 0x%lx"
+-xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "0x%"PRIx64" size 0x%lx, log_dirty %i"
+-handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p type=%d dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
+-handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p read type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
+-handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p write type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
+-cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p pio dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
+-cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio read reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d"
+-cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio write reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d"
+-cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p copy dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
+-xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p"
+-cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
+-cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
+-
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index 178f0c68fc..36d87555a9 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -10,43 +10,21 @@
+ 
+ #include "qemu/osdep.h"
+ #include "qemu/units.h"
++#include "qapi/error.h"
++#include "qapi/qapi-commands-migration.h"
++#include "trace.h"
+ 
+-#include "cpu.h"
+-#include "hw/pci/pci.h"
+-#include "hw/pci/pci_host.h"
+ #include "hw/i386/pc.h"
+ #include "hw/irq.h"
+-#include "hw/hw.h"
+ #include "hw/i386/apic-msidef.h"
+-#include "hw/xen/xen_common.h"
+-#include "hw/xen/xen-legacy-backend.h"
+-#include "hw/xen/xen-bus.h"
+ #include "hw/xen/xen-x86.h"
+-#include "qapi/error.h"
+-#include "qapi/qapi-commands-migration.h"
+-#include "qemu/error-report.h"
+-#include "qemu/main-loop.h"
+ #include "qemu/range.h"
+-#include "sysemu/runstate.h"
+-#include "sysemu/sysemu.h"
+-#include "sysemu/xen.h"
+-#include "sysemu/xen-mapcache.h"
+-#include "trace.h"
+ 
+-#include <xen/hvm/ioreq.h>
++#include "hw/xen/xen-hvm-common.h"
++#include "hw/xen/arch_hvm.h"
+ #include <xen/hvm/e820.h>
+ 
+-//#define DEBUG_XEN_HVM
+-
+-#ifdef DEBUG_XEN_HVM
+-#define DPRINTF(fmt, ...) \
+-    do { fprintf(stderr, "xen: " fmt, ## __VA_ARGS__); } while (0)
+-#else
+-#define DPRINTF(fmt, ...) \
+-    do { } while (0)
+-#endif
+-
+-static MemoryRegion ram_memory, ram_640k, ram_lo, ram_hi;
++static MemoryRegion ram_640k, ram_lo, ram_hi;
+ static MemoryRegion *framebuffer;
+ static bool xen_in_migration;
+ 
+@@ -75,25 +53,6 @@ typedef struct shared_vmport_iopage shared_vmport_iopage_t;
+ #endif
+ static shared_vmport_iopage_t *shared_vmport_page;
+ 
+-static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
+-{
+-    return shared_page->vcpu_ioreq[i].vp_eport;
+-}
+-static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
+-{
+-    return &shared_page->vcpu_ioreq[vcpu];
+-}
+-
+-#define BUFFER_IO_MAX_DELAY  100
+-
+-typedef struct XenPhysmap {
+-    hwaddr start_addr;
+-    ram_addr_t size;
+-    const char *name;
+-    hwaddr phys_offset;
+-
+-    QLIST_ENTRY(XenPhysmap) list;
+-} XenPhysmap;
+ 
+ static QLIST_HEAD(, XenPhysmap) xen_physmap;
+ static const XenPhysmap *log_for_dirtybit = NULL;
+@@ -102,40 +61,6 @@ static unsigned long *dirty_bitmap = NULL;
+ static Notifier suspend;
+ static Notifier wakeup;
+ 
+-typedef struct XenPciDevice {
+-    PCIDevice *pci_dev;
+-    uint32_t sbdf;
+-    QLIST_ENTRY(XenPciDevice) entry;
+-} XenPciDevice;
+-
+-typedef struct XenIOState {
+-    ioservid_t ioservid;
+-    shared_iopage_t *shared_page;
+-    buffered_iopage_t *buffered_io_page;
+-    xenforeignmemory_resource_handle *fres;
+-    QEMUTimer *buffered_io_timer;
+-    CPUState **cpu_by_vcpu_id;
+-    /* the evtchn port for polling the notification, */
+-    evtchn_port_t *ioreq_local_port;
+-    /* evtchn remote and local ports for buffered io */
+-    evtchn_port_t bufioreq_remote_port;
+-    evtchn_port_t bufioreq_local_port;
+-    /* the evtchn fd for polling */
+-    xenevtchn_handle *xce_handle;
+-    /* which vcpu we are serving */
+-    int send_vcpu;
+-
+-    struct xs_handle *xenstore;
+-    MemoryListener memory_listener;
+-    MemoryListener io_listener;
+-    QLIST_HEAD(, XenPciDevice) dev_list;
+-    DeviceListener device_listener;
+-
+-    Notifier exit;
+-} XenIOState;
+-
+-#include "hw/xen/arch_hvm.h"
+-
+ /* Xen specific function for piix pci */
+ 
+ int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
+@@ -248,42 +173,6 @@ static void xen_ram_init(PCMachineState *pcms,
+     }
+ }
+ 
+-void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
+-                   Error **errp)
+-{
+-    unsigned long nr_pfn;
+-    xen_pfn_t *pfn_list;
+-    int i;
+-
+-    if (runstate_check(RUN_STATE_INMIGRATE)) {
+-        /* RAM already populated in Xen */
+-        fprintf(stderr, "%s: do not alloc "RAM_ADDR_FMT
+-                " bytes of ram at "RAM_ADDR_FMT" when runstate is INMIGRATE\n",
+-                __func__, size, ram_addr);
+-        return;
+-    }
+-
+-    if (mr == &ram_memory) {
+-        return;
+-    }
+-
+-    trace_xen_ram_alloc(ram_addr, size);
+-
+-    nr_pfn = size >> TARGET_PAGE_BITS;
+-    pfn_list = g_malloc(sizeof (*pfn_list) * nr_pfn);
+-
+-    for (i = 0; i < nr_pfn; i++) {
+-        pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i;
+-    }
+-
+-    if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) {
+-        error_setg(errp, "xen: failed to populate ram at " RAM_ADDR_FMT,
+-                   ram_addr);
+-    }
+-
+-    g_free(pfn_list);
+-}
+-
+ static XenPhysmap *get_physmapping(hwaddr start_addr, ram_addr_t size)
+ {
+     XenPhysmap *physmap = NULL;
+@@ -473,109 +362,6 @@ static int xen_remove_from_physmap(XenIOState *state,
+     return 0;
+ }
+ 
+-static void xen_set_memory(struct MemoryListener *listener,
+-                           MemoryRegionSection *section,
+-                           bool add)
+-{
+-    XenIOState *state = container_of(listener, XenIOState, memory_listener);
+-
+-    if (section->mr == &ram_memory) {
+-        return;
+-    } else {
+-        if (add) {
+-            xen_map_memory_section(xen_domid, state->ioservid,
+-                                   section);
+-        } else {
+-            xen_unmap_memory_section(xen_domid, state->ioservid,
+-                                     section);
+-        }
+-    }
+-    arch_xen_set_memory(state, section, add);
+-}
+-
+-static void xen_region_add(MemoryListener *listener,
+-                           MemoryRegionSection *section)
+-{
+-    memory_region_ref(section->mr);
+-    xen_set_memory(listener, section, true);
+-}
+-
+-static void xen_region_del(MemoryListener *listener,
+-                           MemoryRegionSection *section)
+-{
+-    xen_set_memory(listener, section, false);
+-    memory_region_unref(section->mr);
+-}
+-
+-static void xen_io_add(MemoryListener *listener,
+-                       MemoryRegionSection *section)
+-{
+-    XenIOState *state = container_of(listener, XenIOState, io_listener);
+-    MemoryRegion *mr = section->mr;
+-
+-    if (mr->ops == &unassigned_io_ops) {
+-        return;
+-    }
+-
+-    memory_region_ref(mr);
+-
+-    xen_map_io_section(xen_domid, state->ioservid, section);
+-}
+-
+-static void xen_io_del(MemoryListener *listener,
+-                       MemoryRegionSection *section)
+-{
+-    XenIOState *state = container_of(listener, XenIOState, io_listener);
+-    MemoryRegion *mr = section->mr;
+-
+-    if (mr->ops == &unassigned_io_ops) {
+-        return;
+-    }
+-
+-    xen_unmap_io_section(xen_domid, state->ioservid, section);
+-
+-    memory_region_unref(mr);
+-}
+-
+-static void xen_device_realize(DeviceListener *listener,
+-                               DeviceState *dev)
+-{
+-    XenIOState *state = container_of(listener, XenIOState, device_listener);
+-
+-    if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
+-        PCIDevice *pci_dev = PCI_DEVICE(dev);
+-        XenPciDevice *xendev = g_new(XenPciDevice, 1);
+-
+-        xendev->pci_dev = pci_dev;
+-        xendev->sbdf = PCI_BUILD_BDF(pci_dev_bus_num(pci_dev),
+-                                     pci_dev->devfn);
+-        QLIST_INSERT_HEAD(&state->dev_list, xendev, entry);
+-
+-        xen_map_pcidev(xen_domid, state->ioservid, pci_dev);
+-    }
+-}
+-
+-static void xen_device_unrealize(DeviceListener *listener,
+-                                 DeviceState *dev)
+-{
+-    XenIOState *state = container_of(listener, XenIOState, device_listener);
+-
+-    if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
+-        PCIDevice *pci_dev = PCI_DEVICE(dev);
+-        XenPciDevice *xendev, *next;
+-
+-        xen_unmap_pcidev(xen_domid, state->ioservid, pci_dev);
+-
+-        QLIST_FOREACH_SAFE(xendev, &state->dev_list, entry, next) {
+-            if (xendev->pci_dev == pci_dev) {
+-                QLIST_REMOVE(xendev, entry);
+-                g_free(xendev);
+-                break;
+-            }
+-        }
+-    }
+-}
+-
+ static void xen_sync_dirty_bitmap(XenIOState *state,
+                                   hwaddr start_addr,
+                                   ram_addr_t size)
+@@ -683,277 +469,6 @@ static MemoryListener xen_memory_listener = {
+     .priority = 10,
+ };
+ 
+-static MemoryListener xen_io_listener = {
+-    .name = "xen-io",
+-    .region_add = xen_io_add,
+-    .region_del = xen_io_del,
+-    .priority = 10,
+-};
+-
+-static DeviceListener xen_device_listener = {
+-    .realize = xen_device_realize,
+-    .unrealize = xen_device_unrealize,
+-};
+-
+-/* get the ioreq packets from share mem */
+-static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
+-{
+-    ioreq_t *req = xen_vcpu_ioreq(state->shared_page, vcpu);
+-
+-    if (req->state != STATE_IOREQ_READY) {
+-        DPRINTF("I/O request not ready: "
+-                "%x, ptr: %x, port: %"PRIx64", "
+-                "data: %"PRIx64", count: %u, size: %u\n",
+-                req->state, req->data_is_ptr, req->addr,
+-                req->data, req->count, req->size);
+-        return NULL;
+-    }
+-
+-    xen_rmb(); /* see IOREQ_READY /then/ read contents of ioreq */
+-
+-    req->state = STATE_IOREQ_INPROCESS;
+-    return req;
+-}
+-
+-/* use poll to get the port notification */
+-/* ioreq_vec--out,the */
+-/* retval--the number of ioreq packet */
+-static ioreq_t *cpu_get_ioreq(XenIOState *state)
+-{
+-    MachineState *ms = MACHINE(qdev_get_machine());
+-    unsigned int max_cpus = ms->smp.max_cpus;
+-    int i;
+-    evtchn_port_t port;
+-
+-    port = xenevtchn_pending(state->xce_handle);
+-    if (port == state->bufioreq_local_port) {
+-        timer_mod(state->buffered_io_timer,
+-                BUFFER_IO_MAX_DELAY + qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
+-        return NULL;
+-    }
+-
+-    if (port != -1) {
+-        for (i = 0; i < max_cpus; i++) {
+-            if (state->ioreq_local_port[i] == port) {
+-                break;
+-            }
+-        }
+-
+-        if (i == max_cpus) {
+-            hw_error("Fatal error while trying to get io event!\n");
+-        }
+-
+-        /* unmask the wanted port again */
+-        xenevtchn_unmask(state->xce_handle, port);
+-
+-        /* get the io packet from shared memory */
+-        state->send_vcpu = i;
+-        return cpu_get_ioreq_from_shared_memory(state, i);
+-    }
+-
+-    /* read error or read nothing */
+-    return NULL;
+-}
+-
+-static uint32_t do_inp(uint32_t addr, unsigned long size)
+-{
+-    switch (size) {
+-        case 1:
+-            return cpu_inb(addr);
+-        case 2:
+-            return cpu_inw(addr);
+-        case 4:
+-            return cpu_inl(addr);
+-        default:
+-            hw_error("inp: bad size: %04x %lx", addr, size);
+-    }
+-}
+-
+-static void do_outp(uint32_t addr,
+-        unsigned long size, uint32_t val)
+-{
+-    switch (size) {
+-        case 1:
+-            return cpu_outb(addr, val);
+-        case 2:
+-            return cpu_outw(addr, val);
+-        case 4:
+-            return cpu_outl(addr, val);
+-        default:
+-            hw_error("outp: bad size: %04x %lx", addr, size);
+-    }
+-}
+-
+-/*
+- * Helper functions which read/write an object from/to physical guest
+- * memory, as part of the implementation of an ioreq.
+- *
+- * Equivalent to
+- *   cpu_physical_memory_rw(addr + (req->df ? -1 : +1) * req->size * i,
+- *                          val, req->size, 0/1)
+- * except without the integer overflow problems.
+- */
+-static void rw_phys_req_item(hwaddr addr,
+-                             ioreq_t *req, uint32_t i, void *val, int rw)
+-{
+-    /* Do everything unsigned so overflow just results in a truncated result
+-     * and accesses to undesired parts of guest memory, which is up
+-     * to the guest */
+-    hwaddr offset = (hwaddr)req->size * i;
+-    if (req->df) {
+-        addr -= offset;
+-    } else {
+-        addr += offset;
+-    }
+-    cpu_physical_memory_rw(addr, val, req->size, rw);
+-}
+-
+-static inline void read_phys_req_item(hwaddr addr,
+-                                      ioreq_t *req, uint32_t i, void *val)
+-{
+-    rw_phys_req_item(addr, req, i, val, 0);
+-}
+-static inline void write_phys_req_item(hwaddr addr,
+-                                       ioreq_t *req, uint32_t i, void *val)
+-{
+-    rw_phys_req_item(addr, req, i, val, 1);
+-}
+-
+-
+-static void cpu_ioreq_pio(ioreq_t *req)
+-{
+-    uint32_t i;
+-
+-    trace_cpu_ioreq_pio(req, req->dir, req->df, req->data_is_ptr, req->addr,
+-                         req->data, req->count, req->size);
+-
+-    if (req->size > sizeof(uint32_t)) {
+-        hw_error("PIO: bad size (%u)", req->size);
+-    }
+-
+-    if (req->dir == IOREQ_READ) {
+-        if (!req->data_is_ptr) {
+-            req->data = do_inp(req->addr, req->size);
+-            trace_cpu_ioreq_pio_read_reg(req, req->data, req->addr,
+-                                         req->size);
+-        } else {
+-            uint32_t tmp;
+-
+-            for (i = 0; i < req->count; i++) {
+-                tmp = do_inp(req->addr, req->size);
+-                write_phys_req_item(req->data, req, i, &tmp);
+-            }
+-        }
+-    } else if (req->dir == IOREQ_WRITE) {
+-        if (!req->data_is_ptr) {
+-            trace_cpu_ioreq_pio_write_reg(req, req->data, req->addr,
+-                                          req->size);
+-            do_outp(req->addr, req->size, req->data);
+-        } else {
+-            for (i = 0; i < req->count; i++) {
+-                uint32_t tmp = 0;
+-
+-                read_phys_req_item(req->data, req, i, &tmp);
+-                do_outp(req->addr, req->size, tmp);
+-            }
+-        }
+-    }
+-}
+-
+-static void cpu_ioreq_move(ioreq_t *req)
+-{
+-    uint32_t i;
+-
+-    trace_cpu_ioreq_move(req, req->dir, req->df, req->data_is_ptr, req->addr,
+-                         req->data, req->count, req->size);
+-
+-    if (req->size > sizeof(req->data)) {
+-        hw_error("MMIO: bad size (%u)", req->size);
+-    }
+-
+-    if (!req->data_is_ptr) {
+-        if (req->dir == IOREQ_READ) {
+-            for (i = 0; i < req->count; i++) {
+-                read_phys_req_item(req->addr, req, i, &req->data);
+-            }
+-        } else if (req->dir == IOREQ_WRITE) {
+-            for (i = 0; i < req->count; i++) {
+-                write_phys_req_item(req->addr, req, i, &req->data);
+-            }
+-        }
+-    } else {
+-        uint64_t tmp;
+-
+-        if (req->dir == IOREQ_READ) {
+-            for (i = 0; i < req->count; i++) {
+-                read_phys_req_item(req->addr, req, i, &tmp);
+-                write_phys_req_item(req->data, req, i, &tmp);
+-            }
+-        } else if (req->dir == IOREQ_WRITE) {
+-            for (i = 0; i < req->count; i++) {
+-                read_phys_req_item(req->data, req, i, &tmp);
+-                write_phys_req_item(req->addr, req, i, &tmp);
+-            }
+-        }
+-    }
+-}
+-
+-static void cpu_ioreq_config(XenIOState *state, ioreq_t *req)
+-{
+-    uint32_t sbdf = req->addr >> 32;
+-    uint32_t reg = req->addr;
+-    XenPciDevice *xendev;
+-
+-    if (req->size != sizeof(uint8_t) && req->size != sizeof(uint16_t) &&
+-        req->size != sizeof(uint32_t)) {
+-        hw_error("PCI config access: bad size (%u)", req->size);
+-    }
+-
+-    if (req->count != 1) {
+-        hw_error("PCI config access: bad count (%u)", req->count);
+-    }
+-
+-    QLIST_FOREACH(xendev, &state->dev_list, entry) {
+-        if (xendev->sbdf != sbdf) {
+-            continue;
+-        }
+-
+-        if (!req->data_is_ptr) {
+-            if (req->dir == IOREQ_READ) {
+-                req->data = pci_host_config_read_common(
+-                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
+-                    req->size);
+-                trace_cpu_ioreq_config_read(req, xendev->sbdf, reg,
+-                                            req->size, req->data);
+-            } else if (req->dir == IOREQ_WRITE) {
+-                trace_cpu_ioreq_config_write(req, xendev->sbdf, reg,
+-                                             req->size, req->data);
+-                pci_host_config_write_common(
+-                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
+-                    req->data, req->size);
+-            }
+-        } else {
+-            uint32_t tmp;
+-
+-            if (req->dir == IOREQ_READ) {
+-                tmp = pci_host_config_read_common(
+-                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
+-                    req->size);
+-                trace_cpu_ioreq_config_read(req, xendev->sbdf, reg,
+-                                            req->size, tmp);
+-                write_phys_req_item(req->data, req, 0, &tmp);
+-            } else if (req->dir == IOREQ_WRITE) {
+-                read_phys_req_item(req->data, req, 0, &tmp);
+-                trace_cpu_ioreq_config_write(req, xendev->sbdf, reg,
+-                                             req->size, tmp);
+-                pci_host_config_write_common(
+-                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
+-                    tmp, req->size);
+-            }
+-        }
+-    }
+-}
+-
+ static void regs_to_cpu(vmware_regs_t *vmport_regs, ioreq_t *req)
+ {
+     X86CPU *cpu;
+@@ -997,223 +512,6 @@ static void handle_vmport_ioreq(XenIOState *state, ioreq_t *req)
+     current_cpu = NULL;
+ }
+ 
+-static void handle_ioreq(XenIOState *state, ioreq_t *req)
+-{
+-    trace_handle_ioreq(req, req->type, req->dir, req->df, req->data_is_ptr,
+-                       req->addr, req->data, req->count, req->size);
+-
+-    if (!req->data_is_ptr && (req->dir == IOREQ_WRITE) &&
+-            (req->size < sizeof (target_ulong))) {
+-        req->data &= ((target_ulong) 1 << (8 * req->size)) - 1;
+-    }
+-
+-    if (req->dir == IOREQ_WRITE)
+-        trace_handle_ioreq_write(req, req->type, req->df, req->data_is_ptr,
+-                                 req->addr, req->data, req->count, req->size);
+-
+-    switch (req->type) {
+-        case IOREQ_TYPE_PIO:
+-            cpu_ioreq_pio(req);
+-            break;
+-        case IOREQ_TYPE_COPY:
+-            cpu_ioreq_move(req);
+-            break;
+-        case IOREQ_TYPE_TIMEOFFSET:
+-            break;
+-        case IOREQ_TYPE_INVALIDATE:
+-            xen_invalidate_map_cache();
+-            break;
+-        case IOREQ_TYPE_PCI_CONFIG:
+-            cpu_ioreq_config(state, req);
+-            break;
+-        default:
+-            arch_handle_ioreq(state, req);
+-    }
+-    if (req->dir == IOREQ_READ) {
+-        trace_handle_ioreq_read(req, req->type, req->df, req->data_is_ptr,
+-                                req->addr, req->data, req->count, req->size);
+-    }
+-}
+-
+-static bool handle_buffered_iopage(XenIOState *state)
+-{
+-    buffered_iopage_t *buf_page = state->buffered_io_page;
+-    buf_ioreq_t *buf_req = NULL;
+-    bool handled_ioreq = false;
+-    ioreq_t req;
+-    int qw;
+-
+-    if (!buf_page) {
+-        return 0;
+-    }
+-
+-    memset(&req, 0x00, sizeof(req));
+-    req.state = STATE_IOREQ_READY;
+-    req.count = 1;
+-    req.dir = IOREQ_WRITE;
+-
+-    for (;;) {
+-        uint32_t rdptr = buf_page->read_pointer, wrptr;
+-
+-        xen_rmb();
+-        wrptr = buf_page->write_pointer;
+-        xen_rmb();
+-        if (rdptr != buf_page->read_pointer) {
+-            continue;
+-        }
+-        if (rdptr == wrptr) {
+-            break;
+-        }
+-        buf_req = &buf_page->buf_ioreq[rdptr % IOREQ_BUFFER_SLOT_NUM];
+-        req.size = 1U << buf_req->size;
+-        req.addr = buf_req->addr;
+-        req.data = buf_req->data;
+-        req.type = buf_req->type;
+-        xen_rmb();
+-        qw = (req.size == 8);
+-        if (qw) {
+-            if (rdptr + 1 == wrptr) {
+-                hw_error("Incomplete quad word buffered ioreq");
+-            }
+-            buf_req = &buf_page->buf_ioreq[(rdptr + 1) %
+-                                           IOREQ_BUFFER_SLOT_NUM];
+-            req.data |= ((uint64_t)buf_req->data) << 32;
+-            xen_rmb();
+-        }
+-
+-        handle_ioreq(state, &req);
+-
+-        /* Only req.data may get updated by handle_ioreq(), albeit even that
+-         * should not happen as such data would never make it to the guest (we
+-         * can only usefully see writes here after all).
+-         */
+-        assert(req.state == STATE_IOREQ_READY);
+-        assert(req.count == 1);
+-        assert(req.dir == IOREQ_WRITE);
+-        assert(!req.data_is_ptr);
+-
+-        qatomic_add(&buf_page->read_pointer, qw + 1);
+-        handled_ioreq = true;
+-    }
+-
+-    return handled_ioreq;
+-}
+-
+-static void handle_buffered_io(void *opaque)
+-{
+-    XenIOState *state = opaque;
+-
+-    if (handle_buffered_iopage(state)) {
+-        timer_mod(state->buffered_io_timer,
+-                BUFFER_IO_MAX_DELAY + qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
+-    } else {
+-        timer_del(state->buffered_io_timer);
+-        xenevtchn_unmask(state->xce_handle, state->bufioreq_local_port);
+-    }
+-}
+-
+-static void cpu_handle_ioreq(void *opaque)
+-{
+-    XenIOState *state = opaque;
+-    ioreq_t *req = cpu_get_ioreq(state);
+-
+-    handle_buffered_iopage(state);
+-    if (req) {
+-        ioreq_t copy = *req;
+-
+-        xen_rmb();
+-        handle_ioreq(state, &copy);
+-        req->data = copy.data;
+-
+-        if (req->state != STATE_IOREQ_INPROCESS) {
+-            fprintf(stderr, "Badness in I/O request ... not in service?!: "
+-                    "%x, ptr: %x, port: %"PRIx64", "
+-                    "data: %"PRIx64", count: %u, size: %u, type: %u\n",
+-                    req->state, req->data_is_ptr, req->addr,
+-                    req->data, req->count, req->size, req->type);
+-            destroy_hvm_domain(false);
+-            return;
+-        }
+-
+-        xen_wmb(); /* Update ioreq contents /then/ update state. */
+-
+-        /*
+-         * We do this before we send the response so that the tools
+-         * have the opportunity to pick up on the reset before the
+-         * guest resumes and does a hlt with interrupts disabled which
+-         * causes Xen to powerdown the domain.
+-         */
+-        if (runstate_is_running()) {
+-            ShutdownCause request;
+-
+-            if (qemu_shutdown_requested_get()) {
+-                destroy_hvm_domain(false);
+-            }
+-            request = qemu_reset_requested_get();
+-            if (request) {
+-                qemu_system_reset(request);
+-                destroy_hvm_domain(true);
+-            }
+-        }
+-
+-        req->state = STATE_IORESP_READY;
+-        xenevtchn_notify(state->xce_handle,
+-                         state->ioreq_local_port[state->send_vcpu]);
+-    }
+-}
+-
+-static void xen_main_loop_prepare(XenIOState *state)
+-{
+-    int evtchn_fd = -1;
+-
+-    if (state->xce_handle != NULL) {
+-        evtchn_fd = xenevtchn_fd(state->xce_handle);
+-    }
+-
+-    state->buffered_io_timer = timer_new_ms(QEMU_CLOCK_REALTIME, handle_buffered_io,
+-                                                 state);
+-
+-    if (evtchn_fd != -1) {
+-        CPUState *cpu_state;
+-
+-        DPRINTF("%s: Init cpu_by_vcpu_id\n", __func__);
+-        CPU_FOREACH(cpu_state) {
+-            DPRINTF("%s: cpu_by_vcpu_id[%d]=%p\n",
+-                    __func__, cpu_state->cpu_index, cpu_state);
+-            state->cpu_by_vcpu_id[cpu_state->cpu_index] = cpu_state;
+-        }
+-        qemu_set_fd_handler(evtchn_fd, cpu_handle_ioreq, NULL, state);
+-    }
+-}
+-
+-
+-static void xen_hvm_change_state_handler(void *opaque, bool running,
+-                                         RunState rstate)
+-{
+-    XenIOState *state = opaque;
+-
+-    if (running) {
+-        xen_main_loop_prepare(state);
+-    }
+-
+-    xen_set_ioreq_server_state(xen_domid,
+-                               state->ioservid,
+-                               (rstate == RUN_STATE_RUNNING));
+-}
+-
+-static void xen_exit_notifier(Notifier *n, void *data)
+-{
+-    XenIOState *state = container_of(n, XenIOState, exit);
+-
+-    xen_destroy_ioreq_server(xen_domid, state->ioservid);
+-    if (state->fres != NULL) {
+-        xenforeignmemory_unmap_resource(xen_fmem, state->fres);
+-    }
+-
+-    xenevtchn_close(state->xce_handle);
+-    xs_daemon_close(state->xenstore);
+-}
+-
+ #ifdef XEN_COMPAT_PHYSMAP
+ static void xen_read_physmap(XenIOState *state)
+ {
+@@ -1273,178 +571,17 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data)
+     xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0);
+ }
+ 
+-static int xen_map_ioreq_server(XenIOState *state)
+-{
+-    void *addr = NULL;
+-    xen_pfn_t ioreq_pfn;
+-    xen_pfn_t bufioreq_pfn;
+-    evtchn_port_t bufioreq_evtchn;
+-    int rc;
+-
+-    /*
+-     * Attempt to map using the resource API and fall back to normal
+-     * foreign mapping if this is not supported.
+-     */
+-    QEMU_BUILD_BUG_ON(XENMEM_resource_ioreq_server_frame_bufioreq != 0);
+-    QEMU_BUILD_BUG_ON(XENMEM_resource_ioreq_server_frame_ioreq(0) != 1);
+-    state->fres = xenforeignmemory_map_resource(xen_fmem, xen_domid,
+-                                         XENMEM_resource_ioreq_server,
+-                                         state->ioservid, 0, 2,
+-                                         &addr,
+-                                         PROT_READ | PROT_WRITE, 0);
+-    if (state->fres != NULL) {
+-        trace_xen_map_resource_ioreq(state->ioservid, addr);
+-        state->buffered_io_page = addr;
+-        state->shared_page = addr + TARGET_PAGE_SIZE;
+-    } else if (errno != EOPNOTSUPP) {
+-        error_report("failed to map ioreq server resources: error %d handle=%p",
+-                     errno, xen_xc);
+-        return -1;
+-    }
+-
+-    rc = xen_get_ioreq_server_info(xen_domid, state->ioservid,
+-                                   (state->shared_page == NULL) ?
+-                                   &ioreq_pfn : NULL,
+-                                   (state->buffered_io_page == NULL) ?
+-                                   &bufioreq_pfn : NULL,
+-                                   &bufioreq_evtchn);
+-    if (rc < 0) {
+-        error_report("failed to get ioreq server info: error %d handle=%p",
+-                     errno, xen_xc);
+-        return rc;
+-    }
+-
+-    if (state->shared_page == NULL) {
+-        DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
+-
+-        state->shared_page = xenforeignmemory_map(xen_fmem, xen_domid,
+-                                                  PROT_READ | PROT_WRITE,
+-                                                  1, &ioreq_pfn, NULL);
+-        if (state->shared_page == NULL) {
+-            error_report("map shared IO page returned error %d handle=%p",
+-                         errno, xen_xc);
+-        }
+-    }
+-
+-    if (state->buffered_io_page == NULL) {
+-        DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
+-
+-        state->buffered_io_page = xenforeignmemory_map(xen_fmem, xen_domid,
+-                                                       PROT_READ | PROT_WRITE,
+-                                                       1, &bufioreq_pfn,
+-                                                       NULL);
+-        if (state->buffered_io_page == NULL) {
+-            error_report("map buffered IO page returned error %d", errno);
+-            return -1;
+-        }
+-    }
+-
+-    if (state->shared_page == NULL || state->buffered_io_page == NULL) {
+-        return -1;
+-    }
+-
+-    DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
+-
+-    state->bufioreq_remote_port = bufioreq_evtchn;
+-
+-    return 0;
+-}
+-
+ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+ {
+     MachineState *ms = MACHINE(pcms);
+     unsigned int max_cpus = ms->smp.max_cpus;
+-    int i, rc;
++    int rc;
+     xen_pfn_t ioreq_pfn;
+     XenIOState *state;
+ 
+     state = g_new0(XenIOState, 1);
+ 
+-    state->xce_handle = xenevtchn_open(NULL, 0);
+-    if (state->xce_handle == NULL) {
+-        perror("xen: event channel open");
+-        goto err;
+-    }
+-
+-    state->xenstore = xs_daemon_open();
+-    if (state->xenstore == NULL) {
+-        perror("xen: xenstore open");
+-        goto err;
+-    }
+-
+-    xen_create_ioreq_server(xen_domid, &state->ioservid);
+-
+-    state->exit.notify = xen_exit_notifier;
+-    qemu_add_exit_notifier(&state->exit);
+-
+-    /*
+-     * Register wake-up support in QMP query-current-machine API
+-     */
+-    qemu_register_wakeup_support();
+-
+-    rc = xen_map_ioreq_server(state);
+-    if (rc < 0) {
+-        goto err;
+-    }
+-
+-    /* Note: cpus is empty at this point in init */
+-    state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus);
+-
+-    rc = xen_set_ioreq_server_state(xen_domid, state->ioservid, true);
+-    if (rc < 0) {
+-        error_report("failed to enable ioreq server info: error %d handle=%p",
+-                     errno, xen_xc);
+-        goto err;
+-    }
+-
+-    state->ioreq_local_port = g_new0(evtchn_port_t, max_cpus);
+-
+-    /* FIXME: how about if we overflow the page here? */
+-    for (i = 0; i < max_cpus; i++) {
+-        rc = xenevtchn_bind_interdomain(state->xce_handle, xen_domid,
+-                                        xen_vcpu_eport(state->shared_page, i));
+-        if (rc == -1) {
+-            error_report("shared evtchn %d bind error %d", i, errno);
+-            goto err;
+-        }
+-        state->ioreq_local_port[i] = rc;
+-    }
+-
+-    rc = xenevtchn_bind_interdomain(state->xce_handle, xen_domid,
+-                                    state->bufioreq_remote_port);
+-    if (rc == -1) {
+-        error_report("buffered evtchn bind error %d", errno);
+-        goto err;
+-    }
+-    state->bufioreq_local_port = rc;
+-
+-    /* Init RAM management */
+-#ifdef XEN_COMPAT_PHYSMAP
+-    xen_map_cache_init(xen_phys_offset_to_gaddr, state);
+-#else
+-    xen_map_cache_init(NULL, state);
+-#endif
+-
+-    qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
+-
+-    state->memory_listener = xen_memory_listener;
+-    memory_listener_register(&state->memory_listener, &address_space_memory);
+-
+-    state->io_listener = xen_io_listener;
+-    memory_listener_register(&state->io_listener, &address_space_io);
+-
+-    state->device_listener = xen_device_listener;
+-    QLIST_INIT(&state->dev_list);
+-    device_listener_register(&state->device_listener);
+-
+-    xen_bus_init();
+-
+-    /* Initialize backend core & drivers */
+-    if (xen_be_init() != 0) {
+-        error_report("xen backend core setup failed");
+-        goto err;
+-    }
+-    xen_be_register_common();
++    xen_register_ioreq(state, max_cpus, xen_memory_listener);
+ 
+     QLIST_INIT(&xen_physmap);
+     xen_read_physmap(state);
+@@ -1484,59 +621,11 @@ err:
+     exit(1);
+ }
+ 
+-void destroy_hvm_domain(bool reboot)
+-{
+-    xc_interface *xc_handle;
+-    int sts;
+-    int rc;
+-
+-    unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff;
+-
+-    if (xen_dmod) {
+-        rc = xendevicemodel_shutdown(xen_dmod, xen_domid, reason);
+-        if (!rc) {
+-            return;
+-        }
+-        if (errno != ENOTTY /* old Xen */) {
+-            perror("xendevicemodel_shutdown failed");
+-        }
+-        /* well, try the old thing then */
+-    }
+-
+-    xc_handle = xc_interface_open(0, 0, 0);
+-    if (xc_handle == NULL) {
+-        fprintf(stderr, "Cannot acquire xenctrl handle\n");
+-    } else {
+-        sts = xc_domain_shutdown(xc_handle, xen_domid, reason);
+-        if (sts != 0) {
+-            fprintf(stderr, "xc_domain_shutdown failed to issue %s, "
+-                    "sts %d, %s\n", reboot ? "reboot" : "poweroff",
+-                    sts, strerror(errno));
+-        } else {
+-            fprintf(stderr, "Issued domain %d %s\n", xen_domid,
+-                    reboot ? "reboot" : "poweroff");
+-        }
+-        xc_interface_close(xc_handle);
+-    }
+-}
+-
+ void xen_register_framebuffer(MemoryRegion *mr)
+ {
+     framebuffer = mr;
+ }
+ 
+-void xen_shutdown_fatal_error(const char *fmt, ...)
+-{
+-    va_list ap;
+-
+-    va_start(ap, fmt);
+-    vfprintf(stderr, fmt, ap);
+-    va_end(ap);
+-    fprintf(stderr, "Will destroy the domain.\n");
+-    /* destroy the domain */
+-    qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR);
+-}
+-
+ void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length)
+ {
+     if (unlikely(xen_in_migration)) {
+diff --git a/hw/xen/meson.build b/hw/xen/meson.build
+index 19d0637c46..008e036d63 100644
+--- a/hw/xen/meson.build
++++ b/hw/xen/meson.build
+@@ -25,4 +25,7 @@ specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)
+ 
+ xen_ss = ss.source_set()
+ 
+-xen_ss.add(when: 'CONFIG_XEN', if_true: files('xen-mapcache.c'))
++xen_ss.add(when: 'CONFIG_XEN', if_true: files(
++  'xen-mapcache.c',
++  'xen-hvm-common.c',
++))
+diff --git a/hw/xen/trace-events b/hw/xen/trace-events
+index 2c8f238f42..02ca1183da 100644
+--- a/hw/xen/trace-events
++++ b/hw/xen/trace-events
+@@ -42,6 +42,20 @@ xs_node_vscanf(char *path, char *value) "%s %s"
+ xs_node_watch(char *path) "%s"
+ xs_node_unwatch(char *path) "%s"
+ 
++# xen-hvm.c
++xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: 0x%lx, size 0x%lx"
++xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "0x%"PRIx64" size 0x%lx, log_dirty %i"
++handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p type=%d dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
++handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p read type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
++handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p write type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
++cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p pio dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
++cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio read reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d"
++cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio write reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d"
++cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p copy dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
++xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p"
++cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
++cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
++
+ # xen-mapcache.c
+ xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64
+ xen_remap_bucket(uint64_t index) "index 0x%"PRIx64
+diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
+new file mode 100644
+index 0000000000..67f76f6010
+--- /dev/null
++++ b/hw/xen/xen-hvm-common.c
+@@ -0,0 +1,861 @@
++#include "qemu/osdep.h"
++#include "qemu/units.h"
++#include "qapi/error.h"
++#include "trace.h"
++
++#include "hw/pci/pci_host.h"
++#include "hw/xen/xen-hvm-common.h"
++#include "hw/xen/xen-legacy-backend.h"
++#include "hw/xen/xen-bus.h"
++#include "hw/boards.h"
++#include "hw/xen/arch_hvm.h"
++
++MemoryRegion ram_memory;
++
++MemoryListener xen_io_listener = {
++    .name = "xen-io",
++    .region_add = xen_io_add,
++    .region_del = xen_io_del,
++    .priority = 10,
++};
++
++DeviceListener xen_device_listener = {
++    .realize = xen_device_realize,
++    .unrealize = xen_device_unrealize,
++};
++
++static void xen_set_memory(struct MemoryListener *listener,
++                           MemoryRegionSection *section,
++                           bool add)
++{
++    XenIOState *state = container_of(listener, XenIOState, memory_listener);
++
++    if (section->mr == &ram_memory) {
++        return;
++    } else {
++        if (add) {
++            xen_map_memory_section(xen_domid, state->ioservid,
++                                   section);
++        } else {
++            xen_unmap_memory_section(xen_domid, state->ioservid,
++                                     section);
++        }
++    }
++    arch_xen_set_memory(state, section, add);
++}
++
++void xen_region_add(MemoryListener *listener,
++                           MemoryRegionSection *section)
++{
++    memory_region_ref(section->mr);
++    xen_set_memory(listener, section, true);
++}
++
++void xen_region_del(MemoryListener *listener,
++                           MemoryRegionSection *section)
++{
++    xen_set_memory(listener, section, false);
++    memory_region_unref(section->mr);
++}
++
++void xen_io_add(MemoryListener *listener,
++                       MemoryRegionSection *section)
++{
++    XenIOState *state = container_of(listener, XenIOState, io_listener);
++    MemoryRegion *mr = section->mr;
++
++    if (mr->ops == &unassigned_io_ops) {
++        return;
++    }
++
++    memory_region_ref(mr);
++
++    xen_map_io_section(xen_domid, state->ioservid, section);
++}
++
++void xen_io_del(MemoryListener *listener,
++                       MemoryRegionSection *section)
++{
++    XenIOState *state = container_of(listener, XenIOState, io_listener);
++    MemoryRegion *mr = section->mr;
++
++    if (mr->ops == &unassigned_io_ops) {
++        return;
++    }
++
++    xen_unmap_io_section(xen_domid, state->ioservid, section);
++
++    memory_region_unref(mr);
++}
++
++void xen_device_realize(DeviceListener *listener,
++                               DeviceState *dev)
++{
++    XenIOState *state = container_of(listener, XenIOState, device_listener);
++
++    if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
++        PCIDevice *pci_dev = PCI_DEVICE(dev);
++        XenPciDevice *xendev = g_new(XenPciDevice, 1);
++
++        xendev->pci_dev = pci_dev;
++        xendev->sbdf = PCI_BUILD_BDF(pci_dev_bus_num(pci_dev),
++                                     pci_dev->devfn);
++        QLIST_INSERT_HEAD(&state->dev_list, xendev, entry);
++
++        xen_map_pcidev(xen_domid, state->ioservid, pci_dev);
++    }
++}
++
++void xen_device_unrealize(DeviceListener *listener,
++                                 DeviceState *dev)
++{
++    XenIOState *state = container_of(listener, XenIOState, device_listener);
++
++    if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
++        PCIDevice *pci_dev = PCI_DEVICE(dev);
++        XenPciDevice *xendev, *next;
++
++        xen_unmap_pcidev(xen_domid, state->ioservid, pci_dev);
++
++        QLIST_FOREACH_SAFE(xendev, &state->dev_list, entry, next) {
++            if (xendev->pci_dev == pci_dev) {
++                QLIST_REMOVE(xendev, entry);
++                g_free(xendev);
++                break;
++            }
++        }
++    }
++}
++
++/* get the ioreq packets from share mem */
++static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
++{
++    ioreq_t *req = xen_vcpu_ioreq(state->shared_page, vcpu);
++
++    if (req->state != STATE_IOREQ_READY) {
++        DPRINTF("I/O request not ready: "
++                "%x, ptr: %x, port: %"PRIx64", "
++                "data: %"PRIx64", count: %u, size: %u\n",
++                req->state, req->data_is_ptr, req->addr,
++                req->data, req->count, req->size);
++        return NULL;
++    }
++
++    xen_rmb(); /* see IOREQ_READY /then/ read contents of ioreq */
++
++    req->state = STATE_IOREQ_INPROCESS;
++    return req;
++}
++
++/* use poll to get the port notification */
++/* ioreq_vec--out,the */
++/* retval--the number of ioreq packet */
++static ioreq_t *cpu_get_ioreq(XenIOState *state)
++{
++    MachineState *ms = MACHINE(qdev_get_machine());
++    unsigned int max_cpus = ms->smp.max_cpus;
++    int i;
++    evtchn_port_t port;
++
++    port = xenevtchn_pending(state->xce_handle);
++    if (port == state->bufioreq_local_port) {
++        timer_mod(state->buffered_io_timer,
++                BUFFER_IO_MAX_DELAY + qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
++        return NULL;
++    }
++
++    if (port != -1) {
++        for (i = 0; i < max_cpus; i++) {
++            if (state->ioreq_local_port[i] == port) {
++                break;
++            }
++        }
++
++        if (i == max_cpus) {
++            hw_error("Fatal error while trying to get io event!\n");
++        }
++
++        /* unmask the wanted port again */
++        xenevtchn_unmask(state->xce_handle, port);
++
++        /* get the io packet from shared memory */
++        state->send_vcpu = i;
++        return cpu_get_ioreq_from_shared_memory(state, i);
++    }
++
++    /* read error or read nothing */
++    return NULL;
++}
++
++static uint32_t do_inp(uint32_t addr, unsigned long size)
++{
++    switch (size) {
++        case 1:
++            return cpu_inb(addr);
++        case 2:
++            return cpu_inw(addr);
++        case 4:
++            return cpu_inl(addr);
++        default:
++            hw_error("inp: bad size: %04x %lx", addr, size);
++    }
++}
++
++static void do_outp(uint32_t addr,
++        unsigned long size, uint32_t val)
++{
++    switch (size) {
++        case 1:
++            return cpu_outb(addr, val);
++        case 2:
++            return cpu_outw(addr, val);
++        case 4:
++            return cpu_outl(addr, val);
++        default:
++            hw_error("outp: bad size: %04x %lx", addr, size);
++    }
++}
++
++/*
++ * Helper functions which read/write an object from/to physical guest
++ * memory, as part of the implementation of an ioreq.
++ *
++ * Equivalent to
++ *   cpu_physical_memory_rw(addr + (req->df ? -1 : +1) * req->size * i,
++ *                          val, req->size, 0/1)
++ * except without the integer overflow problems.
++ */
++static void rw_phys_req_item(hwaddr addr,
++                             ioreq_t *req, uint32_t i, void *val, int rw)
++{
++    /* Do everything unsigned so overflow just results in a truncated result
++     * and accesses to undesired parts of guest memory, which is up
++     * to the guest */
++    hwaddr offset = (hwaddr)req->size * i;
++    if (req->df) {
++        addr -= offset;
++    } else {
++        addr += offset;
++    }
++    cpu_physical_memory_rw(addr, val, req->size, rw);
++}
++
++static inline void read_phys_req_item(hwaddr addr,
++                                      ioreq_t *req, uint32_t i, void *val)
++{
++    rw_phys_req_item(addr, req, i, val, 0);
++}
++static inline void write_phys_req_item(hwaddr addr,
++                                       ioreq_t *req, uint32_t i, void *val)
++{
++    rw_phys_req_item(addr, req, i, val, 1);
++}
++
++
++void cpu_ioreq_pio(ioreq_t *req)
++{
++    uint32_t i;
++
++    trace_cpu_ioreq_pio(req, req->dir, req->df, req->data_is_ptr, req->addr,
++                         req->data, req->count, req->size);
++
++    if (req->size > sizeof(uint32_t)) {
++        hw_error("PIO: bad size (%u)", req->size);
++    }
++
++    if (req->dir == IOREQ_READ) {
++        if (!req->data_is_ptr) {
++            req->data = do_inp(req->addr, req->size);
++            trace_cpu_ioreq_pio_read_reg(req, req->data, req->addr,
++                                         req->size);
++        } else {
++            uint32_t tmp;
++
++            for (i = 0; i < req->count; i++) {
++                tmp = do_inp(req->addr, req->size);
++                write_phys_req_item(req->data, req, i, &tmp);
++            }
++        }
++    } else if (req->dir == IOREQ_WRITE) {
++        if (!req->data_is_ptr) {
++            trace_cpu_ioreq_pio_write_reg(req, req->data, req->addr,
++                                          req->size);
++            do_outp(req->addr, req->size, req->data);
++        } else {
++            for (i = 0; i < req->count; i++) {
++                uint32_t tmp = 0;
++
++                read_phys_req_item(req->data, req, i, &tmp);
++                do_outp(req->addr, req->size, tmp);
++            }
++        }
++    }
++}
++
++static void cpu_ioreq_move(ioreq_t *req)
++{
++    uint32_t i;
++
++    trace_cpu_ioreq_move(req, req->dir, req->df, req->data_is_ptr, req->addr,
++                         req->data, req->count, req->size);
++
++    if (req->size > sizeof(req->data)) {
++        hw_error("MMIO: bad size (%u)", req->size);
++    }
++
++    if (!req->data_is_ptr) {
++        if (req->dir == IOREQ_READ) {
++            for (i = 0; i < req->count; i++) {
++                read_phys_req_item(req->addr, req, i, &req->data);
++            }
++        } else if (req->dir == IOREQ_WRITE) {
++            for (i = 0; i < req->count; i++) {
++                write_phys_req_item(req->addr, req, i, &req->data);
++            }
++        }
++    } else {
++        uint64_t tmp;
++
++        if (req->dir == IOREQ_READ) {
++            for (i = 0; i < req->count; i++) {
++                read_phys_req_item(req->addr, req, i, &tmp);
++                write_phys_req_item(req->data, req, i, &tmp);
++            }
++        } else if (req->dir == IOREQ_WRITE) {
++            for (i = 0; i < req->count; i++) {
++                read_phys_req_item(req->data, req, i, &tmp);
++                write_phys_req_item(req->addr, req, i, &tmp);
++            }
++        }
++    }
++}
++
++static void cpu_ioreq_config(XenIOState *state, ioreq_t *req)
++{
++    uint32_t sbdf = req->addr >> 32;
++    uint32_t reg = req->addr;
++    XenPciDevice *xendev;
++
++    if (req->size != sizeof(uint8_t) && req->size != sizeof(uint16_t) &&
++        req->size != sizeof(uint32_t)) {
++        hw_error("PCI config access: bad size (%u)", req->size);
++    }
++
++    if (req->count != 1) {
++        hw_error("PCI config access: bad count (%u)", req->count);
++    }
++
++    QLIST_FOREACH(xendev, &state->dev_list, entry) {
++        if (xendev->sbdf != sbdf) {
++            continue;
++        }
++
++        if (!req->data_is_ptr) {
++            if (req->dir == IOREQ_READ) {
++                req->data = pci_host_config_read_common(
++                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
++                    req->size);
++                trace_cpu_ioreq_config_read(req, xendev->sbdf, reg,
++                                            req->size, req->data);
++            } else if (req->dir == IOREQ_WRITE) {
++                trace_cpu_ioreq_config_write(req, xendev->sbdf, reg,
++                                             req->size, req->data);
++                pci_host_config_write_common(
++                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
++                    req->data, req->size);
++            }
++        } else {
++            uint32_t tmp;
++
++            if (req->dir == IOREQ_READ) {
++                tmp = pci_host_config_read_common(
++                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
++                    req->size);
++                trace_cpu_ioreq_config_read(req, xendev->sbdf, reg,
++                                            req->size, tmp);
++                write_phys_req_item(req->data, req, 0, &tmp);
++            } else if (req->dir == IOREQ_WRITE) {
++                read_phys_req_item(req->data, req, 0, &tmp);
++                trace_cpu_ioreq_config_write(req, xendev->sbdf, reg,
++                                             req->size, tmp);
++                pci_host_config_write_common(
++                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
++                    tmp, req->size);
++            }
++        }
++    }
++}
++
++static void handle_ioreq(XenIOState *state, ioreq_t *req)
++{
++    trace_handle_ioreq(req, req->type, req->dir, req->df, req->data_is_ptr,
++                       req->addr, req->data, req->count, req->size);
++
++    if (!req->data_is_ptr && (req->dir == IOREQ_WRITE) &&
++            (req->size < sizeof (target_ulong))) {
++        req->data &= ((target_ulong) 1 << (8 * req->size)) - 1;
++    }
++
++    if (req->dir == IOREQ_WRITE)
++        trace_handle_ioreq_write(req, req->type, req->df, req->data_is_ptr,
++                                 req->addr, req->data, req->count, req->size);
++
++    switch (req->type) {
++        case IOREQ_TYPE_PIO:
++            cpu_ioreq_pio(req);
++            break;
++        case IOREQ_TYPE_COPY:
++            cpu_ioreq_move(req);
++            break;
++        case IOREQ_TYPE_TIMEOFFSET:
++            break;
++        case IOREQ_TYPE_INVALIDATE:
++            xen_invalidate_map_cache();
++            break;
++        case IOREQ_TYPE_PCI_CONFIG:
++            cpu_ioreq_config(state, req);
++            break;
++        default:
++            arch_handle_ioreq(state, req);
++    }
++    if (req->dir == IOREQ_READ) {
++        trace_handle_ioreq_read(req, req->type, req->df, req->data_is_ptr,
++                                req->addr, req->data, req->count, req->size);
++    }
++}
++
++static bool handle_buffered_iopage(XenIOState *state)
++{
++    buffered_iopage_t *buf_page = state->buffered_io_page;
++    buf_ioreq_t *buf_req = NULL;
++    bool handled_ioreq = false;
++    ioreq_t req;
++    int qw;
++
++    if (!buf_page) {
++        return 0;
++    }
++
++    memset(&req, 0x00, sizeof(req));
++    req.state = STATE_IOREQ_READY;
++    req.count = 1;
++    req.dir = IOREQ_WRITE;
++
++    for (;;) {
++        uint32_t rdptr = buf_page->read_pointer, wrptr;
++
++        xen_rmb();
++        wrptr = buf_page->write_pointer;
++        xen_rmb();
++        if (rdptr != buf_page->read_pointer) {
++            continue;
++        }
++        if (rdptr == wrptr) {
++            break;
++        }
++        buf_req = &buf_page->buf_ioreq[rdptr % IOREQ_BUFFER_SLOT_NUM];
++        req.size = 1U << buf_req->size;
++        req.addr = buf_req->addr;
++        req.data = buf_req->data;
++        req.type = buf_req->type;
++        xen_rmb();
++        qw = (req.size == 8);
++        if (qw) {
++            if (rdptr + 1 == wrptr) {
++                hw_error("Incomplete quad word buffered ioreq");
++            }
++            buf_req = &buf_page->buf_ioreq[(rdptr + 1) %
++                                           IOREQ_BUFFER_SLOT_NUM];
++            req.data |= ((uint64_t)buf_req->data) << 32;
++            xen_rmb();
++        }
++
++        handle_ioreq(state, &req);
++
++        /* Only req.data may get updated by handle_ioreq(), albeit even that
++         * should not happen as such data would never make it to the guest (we
++         * can only usefully see writes here after all).
++         */
++        assert(req.state == STATE_IOREQ_READY);
++        assert(req.count == 1);
++        assert(req.dir == IOREQ_WRITE);
++        assert(!req.data_is_ptr);
++
++        qatomic_add(&buf_page->read_pointer, qw + 1);
++    }
++
++    return handled_ioreq;
++}
++
++static void handle_buffered_io(void *opaque)
++{
++    XenIOState *state = opaque;
++
++    if (handle_buffered_iopage(state)) {
++        timer_mod(state->buffered_io_timer,
++                BUFFER_IO_MAX_DELAY + qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
++    } else {
++        timer_del(state->buffered_io_timer);
++        xenevtchn_unmask(state->xce_handle, state->bufioreq_local_port);
++    }
++}
++
++static void cpu_handle_ioreq(void *opaque)
++{
++    XenIOState *state = opaque;
++    ioreq_t *req = cpu_get_ioreq(state);
++
++    handle_buffered_iopage(state);
++    if (req) {
++        ioreq_t copy = *req;
++
++        xen_rmb();
++        handle_ioreq(state, &copy);
++        req->data = copy.data;
++
++        if (req->state != STATE_IOREQ_INPROCESS) {
++            fprintf(stderr, "Badness in I/O request ... not in service?!: "
++                    "%x, ptr: %x, port: %"PRIx64", "
++                    "data: %"PRIx64", count: %u, size: %u, type: %u\n",
++                    req->state, req->data_is_ptr, req->addr,
++                    req->data, req->count, req->size, req->type);
++            destroy_hvm_domain(false);
++            return;
++        }
++
++        xen_wmb(); /* Update ioreq contents /then/ update state. */
++
++        /*
++         * We do this before we send the response so that the tools
++         * have the opportunity to pick up on the reset before the
++         * guest resumes and does a hlt with interrupts disabled which
++         * causes Xen to powerdown the domain.
++         */
++        if (runstate_is_running()) {
++            ShutdownCause request;
++
++            if (qemu_shutdown_requested_get()) {
++                destroy_hvm_domain(false);
++            }
++            request = qemu_reset_requested_get();
++            if (request) {
++                qemu_system_reset(request);
++                destroy_hvm_domain(true);
++            }
++        }
++
++        req->state = STATE_IORESP_READY;
++        xenevtchn_notify(state->xce_handle,
++                         state->ioreq_local_port[state->send_vcpu]);
++    }
++}
++
++static void xen_main_loop_prepare(XenIOState *state)
++{
++    int evtchn_fd = -1;
++
++    if (state->xce_handle != NULL) {
++        evtchn_fd = xenevtchn_fd(state->xce_handle);
++    }
++
++    state->buffered_io_timer = timer_new_ms(QEMU_CLOCK_REALTIME, handle_buffered_io,
++                                                 state);
++
++    if (evtchn_fd != -1) {
++        CPUState *cpu_state;
++
++        DPRINTF("%s: Init cpu_by_vcpu_id\n", __func__);
++        CPU_FOREACH(cpu_state) {
++            DPRINTF("%s: cpu_by_vcpu_id[%d]=%p\n",
++                    __func__, cpu_state->cpu_index, cpu_state);
++            state->cpu_by_vcpu_id[cpu_state->cpu_index] = cpu_state;
++        }
++        qemu_set_fd_handler(evtchn_fd, cpu_handle_ioreq, NULL, state);
++    }
++}
++
++
++void xen_hvm_change_state_handler(void *opaque, bool running,
++                                         RunState rstate)
++{
++    XenIOState *state = opaque;
++
++    if (running) {
++        xen_main_loop_prepare(state);
++    }
++
++    xen_set_ioreq_server_state(xen_domid,
++                               state->ioservid,
++                               (rstate == RUN_STATE_RUNNING));
++}
++
++void xen_exit_notifier(Notifier *n, void *data)
++{
++    XenIOState *state = container_of(n, XenIOState, exit);
++
++    xen_destroy_ioreq_server(xen_domid, state->ioservid);
++    if (state->fres != NULL) {
++        xenforeignmemory_unmap_resource(xen_fmem, state->fres);
++    }
++
++    xenevtchn_close(state->xce_handle);
++    xs_daemon_close(state->xenstore);
++}
++
++static int xen_map_ioreq_server(XenIOState *state)
++{
++    void *addr = NULL;
++    xen_pfn_t ioreq_pfn;
++    xen_pfn_t bufioreq_pfn;
++    evtchn_port_t bufioreq_evtchn;
++    int rc;
++
++    /*
++     * Attempt to map using the resource API and fall back to normal
++     * foreign mapping if this is not supported.
++     */
++    QEMU_BUILD_BUG_ON(XENMEM_resource_ioreq_server_frame_bufioreq != 0);
++    QEMU_BUILD_BUG_ON(XENMEM_resource_ioreq_server_frame_ioreq(0) != 1);
++    state->fres = xenforeignmemory_map_resource(xen_fmem, xen_domid,
++                                         XENMEM_resource_ioreq_server,
++                                         state->ioservid, 0, 2,
++                                         &addr,
++                                         PROT_READ | PROT_WRITE, 0);
++    if (state->fres != NULL) {
++        trace_xen_map_resource_ioreq(state->ioservid, addr);
++        state->buffered_io_page = addr;
++        state->shared_page = addr + TARGET_PAGE_SIZE;
++    } else if (errno != EOPNOTSUPP) {
++        error_report("failed to map ioreq server resources: error %d handle=%p",
++                     errno, xen_xc);
++        return -1;
++    }
++
++    rc = xen_get_ioreq_server_info(xen_domid, state->ioservid,
++                                   (state->shared_page == NULL) ?
++                                   &ioreq_pfn : NULL,
++                                   (state->buffered_io_page == NULL) ?
++                                   &bufioreq_pfn : NULL,
++                                   &bufioreq_evtchn);
++    if (rc < 0) {
++        error_report("failed to get ioreq server info: error %d handle=%p",
++                     errno, xen_xc);
++        return rc;
++    }
++
++    if (state->shared_page == NULL) {
++        DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
++
++        state->shared_page = xenforeignmemory_map(xen_fmem, xen_domid,
++                                                  PROT_READ | PROT_WRITE,
++                                                  1, &ioreq_pfn, NULL);
++        if (state->shared_page == NULL) {
++            error_report("map shared IO page returned error %d handle=%p",
++                         errno, xen_xc);
++        }
++    }
++
++    if (state->buffered_io_page == NULL) {
++        DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
++
++        state->buffered_io_page = xenforeignmemory_map(xen_fmem, xen_domid,
++                                                       PROT_READ | PROT_WRITE,
++                                                       1, &bufioreq_pfn,
++                                                       NULL);
++        if (state->buffered_io_page == NULL) {
++            error_report("map buffered IO page returned error %d", errno);
++            return -1;
++        }
++    }
++
++    if (state->shared_page == NULL || state->buffered_io_page == NULL) {
++        return -1;
++    }
++
++    DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
++
++    state->bufioreq_remote_port = bufioreq_evtchn;
++
++    return 0;
++}
++
++void xen_shutdown_fatal_error(const char *fmt, ...)
++{
++    va_list ap;
++
++    va_start(ap, fmt);
++    vfprintf(stderr, fmt, ap);
++    va_end(ap);
++    fprintf(stderr, "Will destroy the domain.\n");
++    /* destroy the domain */
++    qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR);
++}
++
++void destroy_hvm_domain(bool reboot)
++{
++    xc_interface *xc_handle;
++    int sts;
++    int rc;
++
++    unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff;
++
++    if (xen_dmod) {
++        rc = xendevicemodel_shutdown(xen_dmod, xen_domid, reason);
++        if (!rc) {
++            return;
++        }
++        if (errno != ENOTTY /* old Xen */) {
++            perror("xendevicemodel_shutdown failed");
++        }
++        /* well, try the old thing then */
++    }
++
++    xc_handle = xc_interface_open(0, 0, 0);
++    if (xc_handle == NULL) {
++        fprintf(stderr, "Cannot acquire xenctrl handle\n");
++    } else {
++        sts = xc_domain_shutdown(xc_handle, xen_domid, reason);
++        if (sts != 0) {
++            fprintf(stderr, "xc_domain_shutdown failed to issue %s, "
++                    "sts %d, %s\n", reboot ? "reboot" : "poweroff",
++                    sts, strerror(errno));
++        } else {
++            fprintf(stderr, "Issued domain %d %s\n", xen_domid,
++                    reboot ? "reboot" : "poweroff");
++        }
++        xc_interface_close(xc_handle);
++    }
++}
++
++void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
++                   Error **errp)
++{
++    unsigned long nr_pfn;
++    xen_pfn_t *pfn_list;
++    int i;
++
++    if (runstate_check(RUN_STATE_INMIGRATE)) {
++        /* RAM already populated in Xen */
++        fprintf(stderr, "%s: do not alloc "RAM_ADDR_FMT
++                " bytes of ram at "RAM_ADDR_FMT" when runstate is INMIGRATE\n",
++                __func__, size, ram_addr);
++        return;
++    }
++
++    if (mr == &ram_memory) {
++        return;
++    }
++
++    trace_xen_ram_alloc(ram_addr, size);
++
++    nr_pfn = size >> TARGET_PAGE_BITS;
++    pfn_list = g_malloc(sizeof (*pfn_list) * nr_pfn);
++
++    for (i = 0; i < nr_pfn; i++) {
++        pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i;
++    }
++
++    if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) {
++        error_setg(errp, "xen: failed to populate ram at " RAM_ADDR_FMT,
++                   ram_addr);
++    }
++
++    g_free(pfn_list);
++}
++
++void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
++                        MemoryListener xen_memory_listener)
++{
++    int i, rc;
++
++    state->xce_handle = xenevtchn_open(NULL, 0);
++    if (state->xce_handle == NULL) {
++        perror("xen: event channel open");
++        goto err;
++    }
++
++    state->xenstore = xs_daemon_open();
++    if (state->xenstore == NULL) {
++        perror("xen: xenstore open");
++        goto err;
++    }
++
++    xen_create_ioreq_server(xen_domid, &state->ioservid);
++
++    state->exit.notify = xen_exit_notifier;
++    qemu_add_exit_notifier(&state->exit);
++
++    /*
++     * Register wake-up support in QMP query-current-machine API
++     */
++    qemu_register_wakeup_support();
++
++    rc = xen_map_ioreq_server(state);
++    if (rc < 0) {
++        goto err;
++    }
++
++    /* Note: cpus is empty at this point in init */
++    state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus);
++
++    rc = xen_set_ioreq_server_state(xen_domid, state->ioservid, true);
++    if (rc < 0) {
++        error_report("failed to enable ioreq server info: error %d handle=%p",
++                     errno, xen_xc);
++        goto err;
++    }
++
++    state->ioreq_local_port = g_new0(evtchn_port_t, max_cpus);
++
++    /* FIXME: how about if we overflow the page here? */
++    for (i = 0; i < max_cpus; i++) {
++        rc = xenevtchn_bind_interdomain(state->xce_handle, xen_domid,
++                                        xen_vcpu_eport(state->shared_page, i));
++        if (rc == -1) {
++            error_report("shared evtchn %d bind error %d", i, errno);
++            goto err;
++        }
++        state->ioreq_local_port[i] = rc;
++    }
++
++    rc = xenevtchn_bind_interdomain(state->xce_handle, xen_domid,
++                                    state->bufioreq_remote_port);
++    if (rc == -1) {
++        error_report("buffered evtchn bind error %d", errno);
++        goto err;
++    }
++    state->bufioreq_local_port = rc;
++
++    /* Init RAM management */
++#ifdef XEN_COMPAT_PHYSMAP
++    xen_map_cache_init(xen_phys_offset_to_gaddr, state);
++#else
++    xen_map_cache_init(NULL, state);
++#endif
++
++    qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
++
++    state->memory_listener = xen_memory_listener;
++    memory_listener_register(&state->memory_listener, &address_space_memory);
++
++    state->io_listener = xen_io_listener;
++    memory_listener_register(&state->io_listener, &address_space_io);
++
++    state->device_listener = xen_device_listener;
++    QLIST_INIT(&state->dev_list);
++    device_listener_register(&state->device_listener);
++
++    xen_bus_init();
++
++    /* Initialize backend core & drivers */
++    if (xen_be_init() != 0) {
++        error_report("xen backend core setup failed");
++        goto err;
++    }
++    xen_be_register_common();
++
++    return;
++err:
++    error_report("xen hardware virtual machine initialisation failed");
++    exit(1);
++}
+diff --git a/include/hw/i386/xen_arch_hvm.h b/include/hw/i386/xen_arch_hvm.h
+index 1b2c71ba4f..1000f8f543 100644
+--- a/include/hw/i386/xen_arch_hvm.h
++++ b/include/hw/i386/xen_arch_hvm.h
+@@ -2,6 +2,7 @@
+ #define HW_XEN_ARCH_I386_HVM_H
+ 
+ #include <xen/hvm/ioreq.h>
++#include "hw/xen/xen-hvm-common.h"
+ 
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req);
+ void arch_xen_set_memory(XenIOState *state,
+diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h
+new file mode 100644
+index 0000000000..2979f84ee2
+--- /dev/null
++++ b/include/hw/xen/xen-hvm-common.h
+@@ -0,0 +1,98 @@
++#ifndef HW_XEN_HVM_COMMON_H
++#define HW_XEN_HVM_COMMON_H
++
++#include "qemu/osdep.h"
++#include "qemu/units.h"
++
++#include "cpu.h"
++#include "hw/pci/pci.h"
++#include "hw/hw.h"
++#include "hw/xen/xen_common.h"
++#include "sysemu/runstate.h"
++#include "sysemu/sysemu.h"
++#include "sysemu/xen.h"
++#include "sysemu/xen-mapcache.h"
++
++#include <xen/hvm/ioreq.h>
++
++extern MemoryRegion ram_memory;
++extern MemoryListener xen_io_listener;
++extern DeviceListener xen_device_listener;
++
++//#define DEBUG_XEN_HVM
++
++#ifdef DEBUG_XEN_HVM
++#define DPRINTF(fmt, ...) \
++    do { fprintf(stderr, "xen: " fmt, ## __VA_ARGS__); } while (0)
++#else
++#define DPRINTF(fmt, ...) \
++    do { } while (0)
++#endif
++
++static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
++{
++    return shared_page->vcpu_ioreq[i].vp_eport;
++}
++static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
++{
++    return &shared_page->vcpu_ioreq[vcpu];
++}
++
++#define BUFFER_IO_MAX_DELAY  100
++
++typedef struct XenPhysmap {
++    hwaddr start_addr;
++    ram_addr_t size;
++    const char *name;
++    hwaddr phys_offset;
++
++    QLIST_ENTRY(XenPhysmap) list;
++} XenPhysmap;
++
++typedef struct XenPciDevice {
++    PCIDevice *pci_dev;
++    uint32_t sbdf;
++    QLIST_ENTRY(XenPciDevice) entry;
++} XenPciDevice;
++
++typedef struct XenIOState {
++    ioservid_t ioservid;
++    shared_iopage_t *shared_page;
++    buffered_iopage_t *buffered_io_page;
++    xenforeignmemory_resource_handle *fres;
++    QEMUTimer *buffered_io_timer;
++    CPUState **cpu_by_vcpu_id;
++    /* the evtchn port for polling the notification, */
++    evtchn_port_t *ioreq_local_port;
++    /* evtchn remote and local ports for buffered io */
++    evtchn_port_t bufioreq_remote_port;
++    evtchn_port_t bufioreq_local_port;
++    /* the evtchn fd for polling */
++    xenevtchn_handle *xce_handle;
++    /* which vcpu we are serving */
++    int send_vcpu;
++
++    struct xs_handle *xenstore;
++    MemoryListener memory_listener;
++    MemoryListener io_listener;
++    QLIST_HEAD(, XenPciDevice) dev_list;
++    DeviceListener device_listener;
++
++    Notifier exit;
++} XenIOState;
++
++void xen_exit_notifier(Notifier *n, void *data);
++
++void xen_region_add(MemoryListener *listener, MemoryRegionSection *section);
++void xen_region_del(MemoryListener *listener, MemoryRegionSection *section);
++void xen_io_add(MemoryListener *listener, MemoryRegionSection *section);
++void xen_io_del(MemoryListener *listener, MemoryRegionSection *section);
++void xen_device_realize(DeviceListener *listener, DeviceState *dev);
++void xen_device_unrealize(DeviceListener *listener, DeviceState *dev);
++
++void xen_hvm_change_state_handler(void *opaque, bool running, RunState rstate);
++void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
++                        MemoryListener xen_memory_listener);
++
++void cpu_ioreq_pio(ioreq_t *req);
++#endif /* HW_XEN_HVM_COMMON_H */
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-mapcache-Fix-build-on-Arm.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-mapcache-Fix-build-on-Arm.patch
new file mode 100644
index 00000000..7ff202ff
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-mapcache-Fix-build-on-Arm.patch
@@ -0,0 +1,37 @@
+From 2aca3ff63a5d5897cd32e0030569623f0c454f2c Mon Sep 17 00:00:00 2001
+From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Date: Mon, 19 Sep 2022 21:59:55 +0300
+Subject: [PATCH 7/8] xen-mapcache: Fix build on Arm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+../hw/xen/xen-mapcache.c: In function ‘xen_map_grant_dyn’:
+../hw/xen/xen-mapcache.c:668:9: error: ‘refs’ may be used uninitialized
+   in this function [-Werror=maybe-uninitialized]
+  668 |         g_free(refs);
+      |         ^~~~~~~~~~~~
+cc1: all warnings being treated as errors
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/xen/xen-mapcache.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index f81b75d216..6544e331e0 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -620,7 +620,7 @@ static void *xen_map_grant_dyn(MemoryRegion **mr, hwaddr addr, hwaddr *plen,
+     unsigned int i;
+     unsigned int nrefs = (page_off + *plen + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
+     uint32_t ref = (addr - XEN_GRANT_ADDR_OFF) >> XC_PAGE_SHIFT;
+-    uint32_t *refs;
++    uint32_t *refs = NULL;
+     unsigned int prot = PROT_READ;
+     struct XENMappedGrantRegion *mgr = NULL;
+ 
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-skip-ioreq-creation-on-ioreq-registration-failur.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-skip-ioreq-creation-on-ioreq-registration-failur.patch
new file mode 100644
index 00000000..83a18c08
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-skip-ioreq-creation-on-ioreq-registration-failur.patch
@@ -0,0 +1,42 @@
+From fa475ec44fc78ff246e6536c8b9d408abadbb4a4 Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Fri, 1 Jul 2022 18:50:59 -0700
+Subject: [PATCH 07/16] xen: skip ioreq creation on ioreq registration failure
+
+On ARM it is possible to have a functioning xenpv machine with only the
+PV backends and no IOREQ server. If the IOREQ server creation fails
+continue to the PV backends initialization.
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/xen/xen-hvm-common.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
+index 67f76f6010..7e7d23397f 100644
+--- a/hw/xen/xen-hvm-common.c
++++ b/hw/xen/xen-hvm-common.c
+@@ -780,7 +780,11 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
+         goto err;
+     }
+ 
+-    xen_create_ioreq_server(xen_domid, &state->ioservid);
++    rc = xen_create_ioreq_server(xen_domid, &state->ioservid);
++    if (rc) {
++        DPRINTF("xen: failed to create ioreq server\n");
++        goto no_ioreq;
++    }
+ 
+     state->exit.notify = xen_exit_notifier;
+     qemu_add_exit_notifier(&state->exit);
+@@ -845,6 +849,7 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
+     QLIST_INIT(&state->dev_list);
+     device_listener_register(&state->device_listener);
+ 
++no_ioreq:
+     xen_bus_init();
+ 
+     /* Initialize backend core & drivers */
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-accel-xen-xen-all-export-xenstore_record_dm_state.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-accel-xen-xen-all-export-xenstore_record_dm_state.patch
new file mode 100644
index 00000000..881076fb
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-accel-xen-xen-all-export-xenstore_record_dm_state.patch
@@ -0,0 +1,48 @@
+From 13443fe86bb100849c55b41873f48e0b121c7bc0 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 1 Jul 2022 17:28:14 -0700
+Subject: [PATCH 08/16] accel/xen/xen-all: export xenstore_record_dm_state
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ accel/xen/xen-all.c  | 2 +-
+ include/hw/xen/xen.h | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c
+index 69aa7d018b..276625b78b 100644
+--- a/accel/xen/xen-all.c
++++ b/accel/xen/xen-all.c
+@@ -100,7 +100,7 @@ void xenstore_store_pv_console_info(int i, Chardev *chr)
+ }
+ 
+ 
+-static void xenstore_record_dm_state(struct xs_handle *xs, const char *state)
++void xenstore_record_dm_state(struct xs_handle *xs, const char *state)
+ {
+     char path[50];
+ 
+diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
+index afdf9c436a..31e9538a5c 100644
+--- a/include/hw/xen/xen.h
++++ b/include/hw/xen/xen.h
+@@ -9,6 +9,7 @@
+  */
+ 
+ #include "exec/cpu-common.h"
++#include <xenstore.h>
+ 
+ /* xen-machine.c */
+ enum xen_mode {
+@@ -31,5 +32,6 @@ qemu_irq *xen_interrupt_controller_init(void);
+ void xenstore_store_pv_console_info(int i, Chardev *chr);
+ 
+ void xen_register_framebuffer(struct MemoryRegion *mr);
++void xenstore_record_dm_state(struct xs_handle *xs, const char *state);
+ 
+ #endif /* QEMU_HW_XEN_H */
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-hw-arm-Add-grant-mapping.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-hw-arm-Add-grant-mapping.patch
new file mode 100644
index 00000000..3b83d229
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-hw-arm-Add-grant-mapping.patch
@@ -0,0 +1,39 @@
+From b5e5f60de37bb6f71bc34ecb989c31ef5c834272 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Tue, 31 Jan 2023 21:46:43 +0000
+Subject: [PATCH 8/8] hw: arm: Add grant mapping.
+
+Add support for grant mapping and change qemu machine name to xenpvh.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 4ac425a3c5..392bed7367 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -35,7 +35,7 @@
+ #include "sysemu/tpm.h"
+ #include "hw/xen/arch_hvm.h"
+ 
+-#define TYPE_XEN_ARM  MACHINE_TYPE_NAME("xenpv")
++#define TYPE_XEN_ARM  MACHINE_TYPE_NAME("xenpvh")
+ OBJECT_DECLARE_SIMPLE_TYPE(XenArmState, XEN_ARM)
+ 
+ static MemoryListener xen_memory_listener = {
+@@ -115,6 +115,9 @@ static void xen_init_ram(MachineState *machine)
+         DPRINTF("Initialized region xen.ram.hi: base 0x%llx size 0x%lx\n",
+                 GUEST_RAM1_BASE, ram_size[1]);
+     }
++
++    DPRINTF("init grant ram mapping for XEN\n");
++    ram_grants = *xen_init_grant_ram();
+ }
+ 
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0009-xen-hvm-enable-xen-hvm-common-build-for-ARM.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0009-xen-hvm-enable-xen-hvm-common-build-for-ARM.patch
new file mode 100644
index 00000000..1b1aea76
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0009-xen-hvm-enable-xen-hvm-common-build-for-ARM.patch
@@ -0,0 +1,43 @@
+From 2e6a9f464fd1f247c41ce3666ff3e3f66920d0b7 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 1 Jul 2022 17:28:15 -0700
+Subject: [PATCH 09/16] xen-hvm: enable xen-hvm-common build for ARM
+
+Add CONFIG_XEN for aarch64 device and change xen-hvm-common.c to
+support build for ARM targets.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/arm/meson.build | 1 +
+ meson.build        | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hw/arm/meson.build b/hw/arm/meson.build
+index 92f9f6e000..3aac913bfd 100644
+--- a/hw/arm/meson.build
++++ b/hw/arm/meson.build
+@@ -62,5 +62,6 @@ arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre.
+ arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smmuv3.c'))
+ arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c'))
+ arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c'))
++arm_ss.add_all(xen_ss)
+ 
+ hw_arch += {'arm': arm_ss}
+diff --git a/meson.build b/meson.build
+index 5c6b5a1c75..b94f0cd76e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -125,7 +125,7 @@ endif
+ if cpu in ['x86', 'x86_64', 'arm', 'aarch64']
+   # i386 emulator provides xenpv machine type for multiple architectures
+   accelerator_targets += {
+-    'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'],
++    'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'],
+   }
+ endif
+ if cpu in ['x86', 'x86_64']
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0010-hw-arm-introduce-xenpv-machine.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0010-hw-arm-introduce-xenpv-machine.patch
new file mode 100644
index 00000000..fc979b52
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0010-hw-arm-introduce-xenpv-machine.patch
@@ -0,0 +1,230 @@
+From 5618a18b1f12d567a8ef85240d55b841e18ef472 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 1 Jul 2022 17:28:16 -0700
+Subject: [PATCH 10/16] hw/arm: introduce xenpv machine
+
+Create a new machine xenpv which creates a IOREQ server to connect
+with Xen. It also creates a tpm-tis-device which connects to swtpm to
+support TPM functionalities.
+
+Xen IOREQ connection expect the TARGET_PAGE_SIZE to 4096, and the xenpv
+machine on ARM will have no CPU definitions. We need to define
+TARGET_PAGE_SIZE appropriately ourselves.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/arm/meson.build            |   1 +
+ hw/arm/xen_arm.c              | 156 ++++++++++++++++++++++++++++++++++
+ include/hw/arm/xen_arch_hvm.h |  12 +++
+ include/hw/xen/arch_hvm.h     |   2 +
+ 4 files changed, 171 insertions(+)
+ create mode 100644 hw/arm/xen_arm.c
+ create mode 100644 include/hw/arm/xen_arch_hvm.h
+
+diff --git a/hw/arm/meson.build b/hw/arm/meson.build
+index 3aac913bfd..0cae024374 100644
+--- a/hw/arm/meson.build
++++ b/hw/arm/meson.build
+@@ -62,6 +62,7 @@ arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre.
+ arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smmuv3.c'))
+ arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c'))
+ arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c'))
++arm_ss.add(when: 'CONFIG_XEN', if_true: files('xen_arm.c'))
+ arm_ss.add_all(xen_ss)
+ 
+ hw_arch += {'arm': arm_ss}
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+new file mode 100644
+index 0000000000..0922e3db84
+--- /dev/null
++++ b/hw/arm/xen_arm.c
+@@ -0,0 +1,156 @@
++/*
++ * QEMU ARM Xen PV Machine
++ *
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ */
++
++#include "qemu/osdep.h"
++#include "qemu/error-report.h"
++#include "qapi/qapi-commands-migration.h"
++#include "hw/boards.h"
++#include "hw/sysbus.h"
++#include "sysemu/block-backend.h"
++#include "sysemu/tpm_backend.h"
++#include "sysemu/sysemu.h"
++#include "hw/xen/xen-legacy-backend.h"
++#include "hw/xen/xen-hvm-common.h"
++#include "sysemu/tpm.h"
++#include "hw/xen/arch_hvm.h"
++
++#define TYPE_XEN_ARM  MACHINE_TYPE_NAME("xenpv")
++OBJECT_DECLARE_SIMPLE_TYPE(XenArmState, XEN_ARM)
++
++static MemoryListener xen_memory_listener = {
++    .region_add = xen_region_add,
++    .region_del = xen_region_del,
++    .log_start = NULL,
++    .log_stop = NULL,
++    .log_sync = NULL,
++    .log_global_start = NULL,
++    .log_global_stop = NULL,
++    .priority = 10,
++};
++
++struct XenArmState {
++    /*< private >*/
++    MachineState parent;
++
++    XenIOState *state;
++};
++
++void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
++{
++    hw_error("Invalid ioreq type 0x%x\n", req->type);
++
++    return;
++}
++
++void arch_xen_set_memory(XenIOState *state,MemoryRegionSection *section,
++                         bool add)
++{
++}
++
++void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length)
++{
++}
++
++void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
++{
++}
++
++static int xen_init_ioreq(XenIOState *state, unsigned int max_cpus)
++{
++    xen_dmod = xendevicemodel_open(0, 0);
++    xen_xc = xc_interface_open(0, 0, 0);
++
++    if (xen_xc == NULL) {
++        perror("xen: can't open xen interface\n");
++        return -1;
++    }
++
++    xen_fmem = xenforeignmemory_open(0, 0);
++    if (xen_fmem == NULL) {
++        perror("xen: can't open xen fmem interface\n");
++        xc_interface_close(xen_xc);
++        return -1;
++    }
++
++    xen_register_ioreq(state, max_cpus, xen_memory_listener);
++
++    xenstore_record_dm_state(xenstore, "running");
++
++    return 0;
++}
++
++
++static void xen_arm_init(MachineState *machine)
++{
++    DeviceState *dev;
++    SysBusDevice *busdev;
++    Error *errp = NULL;
++    XenArmState *xam = XEN_ARM(machine);
++
++    xam->state =  g_new0(XenIOState, 1);
++
++    if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
++        return;
++    }
++
++    TPMBackend *be = qemu_find_tpm_be("tpm0");
++    if (be == NULL) {
++        DPRINTF("Couldn't fine the backend for tpm0\n");
++        return;
++    }
++
++    dev = qdev_new(TYPE_TPM_TIS_SYSBUS);
++    object_property_set_link(OBJECT(dev), "tpmdev", OBJECT(be), &errp);
++    object_property_set_str(OBJECT(dev), "tpmdev", be->id, &errp);
++    busdev = SYS_BUS_DEVICE(dev);
++    sysbus_realize_and_unref(busdev, &error_fatal);
++    sysbus_mmio_map(busdev, 0, GUEST_TPM_BASE);
++
++    DPRINTF("Connected tpmdev at address 0x%lx\n", GUEST_TPM_BASE);
++
++    return;
++}
++
++static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
++{
++
++    MachineClass *mc = MACHINE_CLASS(oc);
++    mc->desc = "Xen Para-virtualized PC";
++    mc->init = xen_arm_init;
++    mc->max_cpus = 1;
++    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
++}
++
++static const TypeInfo xen_arm_machine_type = {
++    .name = TYPE_XEN_ARM,
++    .parent = TYPE_MACHINE,
++    .class_init = xen_arm_machine_class_init,
++    .instance_size = sizeof(XenArmState),
++};
++
++static void xen_arm_machine_register_types(void)
++{
++    type_register_static(&xen_arm_machine_type);
++}
++
++type_init(xen_arm_machine_register_types)
+diff --git a/include/hw/arm/xen_arch_hvm.h b/include/hw/arm/xen_arch_hvm.h
+new file mode 100644
+index 0000000000..f645dfec28
+--- /dev/null
++++ b/include/hw/arm/xen_arch_hvm.h
+@@ -0,0 +1,12 @@
++#ifndef HW_XEN_ARCH_ARM_HVM_H
++#define HW_XEN_ARCH_ARM_HVM_H
++
++#include <xen/hvm/ioreq.h>
++void arch_handle_ioreq(XenIOState *state, ioreq_t *req);
++void arch_xen_set_memory(XenIOState *state,
++                         MemoryRegionSection *section,
++                         bool add);
++
++#undef TARGET_PAGE_SIZE
++#define TARGET_PAGE_SIZE 4096
++#endif
+diff --git a/include/hw/xen/arch_hvm.h b/include/hw/xen/arch_hvm.h
+index 26674648d8..c7c515220d 100644
+--- a/include/hw/xen/arch_hvm.h
++++ b/include/hw/xen/arch_hvm.h
+@@ -1,3 +1,5 @@
+ #if defined(TARGET_I386) || defined(TARGET_X86_64)
+ #include "hw/i386/xen_arch_hvm.h"
++#elif defined(TARGET_ARM) || defined(TARGET_ARM_64)
++#include "hw/arm/xen_arch_hvm.h"
+ #endif
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0011-meson.build-do-not-set-have_xen_pci_passthrough-for-.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0011-meson.build-do-not-set-have_xen_pci_passthrough-for-.patch
new file mode 100644
index 00000000..dad3029f
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0011-meson.build-do-not-set-have_xen_pci_passthrough-for-.patch
@@ -0,0 +1,33 @@
+From f4ff3490639dea08fb70ec69d60fe73ef479073b Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Thu, 7 Jul 2022 14:03:41 -0700
+Subject: [PATCH 11/16] meson.build: do not set have_xen_pci_passthrough for
+ aarch64 targets
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+have_xen_pci_passthrough is only used for Xen x86 VMs.
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
+Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+---
+ meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index b94f0cd76e..a4965251ab 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1469,6 +1469,8 @@ have_xen_pci_passthrough = get_option('xen_pci_passthrough') \
+            error_message: 'Xen PCI passthrough requested but Xen not enabled') \
+   .require(targetos == 'linux',
+            error_message: 'Xen PCI passthrough not available on this platform') \
++  .require(cpu == 'x86'  or cpu == 'x86_64',
++           error_message: 'Xen PCI passthrough not available on this platform') \
+   .allowed()
+ 
+ 
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0012-xen-arm-call-qemu_find_tpm_be-if-CONFIG_TPM.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0012-xen-arm-call-qemu_find_tpm_be-if-CONFIG_TPM.patch
new file mode 100644
index 00000000..f80a0873
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0012-xen-arm-call-qemu_find_tpm_be-if-CONFIG_TPM.patch
@@ -0,0 +1,72 @@
+From a26982a55fa5f47116b344ca5d411f00c3a2b422 Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Thu, 7 Jul 2022 14:35:33 -0700
+Subject: [PATCH 12/16] xen-arm: call qemu_find_tpm_be if CONFIG_TPM
+
+qemu_find_tpm_be is only availablen when CONFIG_TPM is enabled.
+So #ifdef the call to make sure the code builds correctly even when
+CONFIG_TPM is not enabled.
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/arm/xen_arm.c | 28 +++++++++++++++++-----------
+ 1 file changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 0922e3db84..f248b5744a 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -99,26 +99,18 @@ static int xen_init_ioreq(XenIOState *state, unsigned int max_cpus)
+     return 0;
+ }
+ 
+-
+-static void xen_arm_init(MachineState *machine)
++static void xen_enable_tpm(void)
+ {
++#ifdef CONFIG_TPM
++    Error *errp = NULL;
+     DeviceState *dev;
+     SysBusDevice *busdev;
+-    Error *errp = NULL;
+-    XenArmState *xam = XEN_ARM(machine);
+-
+-    xam->state =  g_new0(XenIOState, 1);
+-
+-    if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
+-        return;
+-    }
+ 
+     TPMBackend *be = qemu_find_tpm_be("tpm0");
+     if (be == NULL) {
+         DPRINTF("Couldn't fine the backend for tpm0\n");
+         return;
+     }
+-
+     dev = qdev_new(TYPE_TPM_TIS_SYSBUS);
+     object_property_set_link(OBJECT(dev), "tpmdev", OBJECT(be), &errp);
+     object_property_set_str(OBJECT(dev), "tpmdev", be->id, &errp);
+@@ -127,6 +119,20 @@ static void xen_arm_init(MachineState *machine)
+     sysbus_mmio_map(busdev, 0, GUEST_TPM_BASE);
+ 
+     DPRINTF("Connected tpmdev at address 0x%lx\n", GUEST_TPM_BASE);
++#endif
++}
++
++static void xen_arm_init(MachineState *machine)
++{
++    XenArmState *xam = XEN_ARM(machine);
++
++    xam->state =  g_new0(XenIOState, 1);
++
++    if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
++        return;
++    }
++
++    xen_enable_tpm();
+ 
+     return;
+ }
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0013-arm-xenpv-fix-TPM-address-print-warning.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0013-arm-xenpv-fix-TPM-address-print-warning.patch
new file mode 100644
index 00000000..1aa09efb
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0013-arm-xenpv-fix-TPM-address-print-warning.patch
@@ -0,0 +1,27 @@
+From c5b128668d9cd1e1cb4da80d5bc8aaebc6ff2e19 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 23 Dec 2022 00:06:29 +0000
+Subject: [PATCH 13/16] arm: xenpv: fix TPM address print warning
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index f248b5744a..153cedfeb4 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -118,7 +118,7 @@ static void xen_enable_tpm(void)
+     sysbus_realize_and_unref(busdev, &error_fatal);
+     sysbus_mmio_map(busdev, 0, GUEST_TPM_BASE);
+ 
+-    DPRINTF("Connected tpmdev at address 0x%lx\n", GUEST_TPM_BASE);
++    DPRINTF("Connected tpmdev at address 0x%llx\n", GUEST_TPM_BASE);
+ #endif
+ }
+ 
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0014-xen_arm-Create-virtio-mmio-devices-during-initializa.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0014-xen_arm-Create-virtio-mmio-devices-during-initializa.patch
new file mode 100644
index 00000000..a6925acf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0014-xen_arm-Create-virtio-mmio-devices-during-initializa.patch
@@ -0,0 +1,83 @@
+From 3dc39d71c3652bea37dc955d5dbf8cd391d2aed0 Mon Sep 17 00:00:00 2001
+From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Date: Sat, 30 Jul 2022 17:51:19 +0300
+Subject: [PATCH 14/16] xen_arm: Create virtio-mmio devices during
+ initialization
+
+In order to use virtio backends we need to allocate virtio-mmio
+parameters (irq and base) and register corresponding buses.
+
+Use the constants defined in public header arch-arm.h to be
+aligned with the toolstack. So the number of current supported
+virtio-mmio devices is 10.
+
+For the interrupts triggering use already existing on Arm
+device-model hypercall.
+
+The toolstack should then insert the same amount of device nodes
+into guest device-tree.
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 153cedfeb4..2012ee7aff 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -25,6 +25,7 @@
+ #include "qemu/error-report.h"
+ #include "qapi/qapi-commands-migration.h"
+ #include "hw/boards.h"
++#include "hw/irq.h"
+ #include "hw/sysbus.h"
+ #include "sysemu/block-backend.h"
+ #include "sysemu/tpm_backend.h"
+@@ -55,6 +56,32 @@ struct XenArmState {
+     XenIOState *state;
+ };
+ 
++#define VIRTIO_MMIO_DEV_SIZE   0x200
++
++#define NR_VIRTIO_MMIO_DEVICES   \
++   (GUEST_VIRTIO_MMIO_SPI_LAST - GUEST_VIRTIO_MMIO_SPI_FIRST)
++
++static void xen_set_irq(void *opaque, int irq, int level)
++{
++    xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level);
++}
++
++static void xen_create_virtio_mmio_devices(XenArmState *xam)
++{
++    int i;
++
++    for (i = 0; i < NR_VIRTIO_MMIO_DEVICES; i++) {
++        hwaddr base = GUEST_VIRTIO_MMIO_BASE + i * VIRTIO_MMIO_DEV_SIZE;
++        qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL,
++                                         GUEST_VIRTIO_MMIO_SPI_FIRST + i);
++
++        sysbus_create_simple("virtio-mmio", base, irq);
++
++        DPRINTF("Created virtio-mmio device %d: irq %d base 0x%lx\n",
++                i, GUEST_VIRTIO_MMIO_SPI_FIRST + i, base);
++    }
++}
++
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     hw_error("Invalid ioreq type 0x%x\n", req->type);
+@@ -132,6 +159,8 @@ static void xen_arm_init(MachineState *machine)
+         return;
+     }
+ 
++    xen_create_virtio_mmio_devices(xam);
++
+     xen_enable_tpm();
+ 
+     return;
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0015-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0015-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch
new file mode 100644
index 00000000..7c2b272d
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0015-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch
@@ -0,0 +1,105 @@
+From a284a53c5374e19ac37b884f2dd50293e7c8070e Mon Sep 17 00:00:00 2001
+From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Date: Sat, 30 Jul 2022 17:18:06 +0300
+Subject: [PATCH 15/16] xen_arm: Initialize RAM and add hi/low memory regions
+
+In order to use virtio backends we need to initialize RAM for the
+xen-mapcache (which is responsible for mapping guest memory using foreign
+mapping) to work. Calculate and add hi/low memory regions based on
+machine->ram_size.
+
+Use the constants defined in public header arch-arm.h to be aligned with the
+toolstack.
+
+The toolstack should then pass real ram_size using "-m" arg.
+If "-m" is not given, create a QEMU machine without IOREQ, TPM and VIRTIO to
+keep it usable for /etc/init.d/xencommons.
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 46 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 2012ee7aff..fde919df29 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -56,6 +56,8 @@ struct XenArmState {
+     XenIOState *state;
+ };
+ 
++static MemoryRegion ram_lo, ram_hi;
++
+ #define VIRTIO_MMIO_DEV_SIZE   0x200
+ 
+ #define NR_VIRTIO_MMIO_DEVICES   \
+@@ -82,6 +84,39 @@ static void xen_create_virtio_mmio_devices(XenArmState *xam)
+     }
+ }
+ 
++static void xen_init_ram(MachineState *machine)
++{
++    MemoryRegion *sysmem = get_system_memory();
++    ram_addr_t block_len, ram_size[GUEST_RAM_BANKS];
++
++    if (machine->ram_size <= GUEST_RAM0_SIZE) {
++        ram_size[0] = machine->ram_size;
++        ram_size[1] = 0;
++        block_len = GUEST_RAM0_BASE + ram_size[0];
++    } else {
++        ram_size[0] = GUEST_RAM0_SIZE;
++        ram_size[1] = machine->ram_size - GUEST_RAM0_SIZE;
++        block_len = GUEST_RAM1_BASE + ram_size[1];
++    }
++
++    memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len,
++                           &error_fatal);
++
++    memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", &ram_memory,
++                             GUEST_RAM0_BASE, ram_size[0]);
++    memory_region_add_subregion(sysmem, GUEST_RAM0_BASE, &ram_lo);
++    DPRINTF("Initialized region xen.ram.lo: base 0x%llx size 0x%lx\n",
++            GUEST_RAM0_BASE, ram_size[0]);
++
++    if (ram_size[1] > 0) {
++        memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", &ram_memory,
++                                 GUEST_RAM1_BASE, ram_size[1]);
++        memory_region_add_subregion(sysmem, GUEST_RAM1_BASE, &ram_hi);
++        DPRINTF("Initialized region xen.ram.hi: base 0x%llx size 0x%lx\n",
++                GUEST_RAM1_BASE, ram_size[1]);
++    }
++}
++
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     hw_error("Invalid ioreq type 0x%x\n", req->type);
+@@ -155,6 +190,14 @@ static void xen_arm_init(MachineState *machine)
+ 
+     xam->state =  g_new0(XenIOState, 1);
+ 
++    if (machine->ram_size == 0) {
++        DPRINTF("ram_size not specified. QEMU machine will be started without"
++                " TPM, IOREQ and Virtio-MMIO backends\n");
++        return;
++    }
++
++    xen_init_ram(machine);
++
+     if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
+         return;
+     }
+@@ -173,6 +216,9 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
+     mc->desc = "Xen Para-virtualized PC";
+     mc->init = xen_arm_init;
+     mc->max_cpus = 1;
++    /* Set explicitly here to make sure that real ram_size is passed */
++    mc->default_ram_size = 0;
++
+     machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
+ }
+ 
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0016-xen_arm-Add-accel-xen-and-drop-extra-interface-openi.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0016-xen_arm-Add-accel-xen-and-drop-extra-interface-openi.patch
new file mode 100644
index 00000000..14f2e240
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0016-xen_arm-Add-accel-xen-and-drop-extra-interface-openi.patch
@@ -0,0 +1,79 @@
+From a730d5ea4a0445a8c694b56583dd06bd000fae74 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Wed, 4 Jan 2023 23:05:25 +0000
+Subject: [PATCH 16/16] xen_arm: Add "accel = xen" and drop extra interface
+ openings
+
+In order to use virtio backends we need to make sure that Xen accelerator
+is enabled (xen_enabled() returns true) as the memory/cache systems
+check for xen_enabled() to perform specific actions. Without that
+the xen-mapcache (which is needed for mapping guest memory) is not in use.
+
+Also drop extra interface opening as this is already done in xen-all.c
+(so drop xen_init_ioreq() completely) and skip virtio/tpm initialization
+if device emulation is not available.
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c | 29 ++---------------------------
+ 1 file changed, 2 insertions(+), 27 deletions(-)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index fde919df29..4ac425a3c5 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -137,30 +137,6 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
+ {
+ }
+ 
+-static int xen_init_ioreq(XenIOState *state, unsigned int max_cpus)
+-{
+-    xen_dmod = xendevicemodel_open(0, 0);
+-    xen_xc = xc_interface_open(0, 0, 0);
+-
+-    if (xen_xc == NULL) {
+-        perror("xen: can't open xen interface\n");
+-        return -1;
+-    }
+-
+-    xen_fmem = xenforeignmemory_open(0, 0);
+-    if (xen_fmem == NULL) {
+-        perror("xen: can't open xen fmem interface\n");
+-        xc_interface_close(xen_xc);
+-        return -1;
+-    }
+-
+-    xen_register_ioreq(state, max_cpus, xen_memory_listener);
+-
+-    xenstore_record_dm_state(xenstore, "running");
+-
+-    return 0;
+-}
+-
+ static void xen_enable_tpm(void)
+ {
+ #ifdef CONFIG_TPM
+@@ -198,9 +174,7 @@ static void xen_arm_init(MachineState *machine)
+ 
+     xen_init_ram(machine);
+ 
+-    if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
+-        return;
+-    }
++    xen_register_ioreq(xam->state, machine->smp.cpus, xen_memory_listener);
+ 
+     xen_create_virtio_mmio_devices(xam);
+ 
+@@ -218,6 +192,7 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
+     mc->max_cpus = 1;
+     /* Set explicitly here to make sure that real ram_size is passed */
+     mc->default_ram_size = 0;
++    mc->default_machine_opts = "accel=xen";
+ 
+     machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
+ }
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-arm-xenpvh-Introduce-virtio-pci-support.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-arm-xenpvh-Introduce-virtio-pci-support.patch
new file mode 100644
index 00000000..6e3b40f7
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-arm-xenpvh-Introduce-virtio-pci-support.patch
@@ -0,0 +1,353 @@
+From 3104d411ee36487ea409ba5a1b474989326f70f2 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Wed, 15 Nov 2023 14:19:31 -0800
+Subject: [PATCH] arm: xenpvh: Introduce virtio-pci support
+
+The bridge is needed for virtio-pci support, as QEMU can emulate the
+whole bridge with any virtio-pci devices connected to it.
+
+NOTE: A few xen-hvm-common.c and xen_native.h changes are cherry-picked from
+EPAM QEMU patches for xen-arm. This was done to keep least diff with upstream.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
+---
+ hw/arm/xen_arm.c            | 271 ++++++++++++++++++++++++++++++++++++
+ include/hw/xen/xen_native.h |   3 +
+ 2 files changed, 274 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 1587e2a43b..a7c5b20777 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -34,6 +34,7 @@
+ #include "hw/xen/xen-hvm-common.h"
+ #include "sysemu/tpm.h"
+ #include "hw/xen/arch_hvm.h"
++#include "hw/pci-host/gpex.h"
+ 
+ #define TYPE_XEN_ARM  MACHINE_TYPE_NAME("xenpvh")
+ OBJECT_DECLARE_SIMPLE_TYPE(XenArmState, XEN_ARM)
+@@ -57,6 +58,9 @@ struct XenArmState {
+ 
+     struct {
+         uint64_t tpm_base_addr;
++        MemMapEntry pcie_mmio;
++        MemMapEntry pcie_ecam;
++        MemMapEntry pcie_mmio_high;
+     } cfg;
+ };
+ 
+@@ -132,6 +136,80 @@ static void xen_init_ram(MachineState *machine)
+     ram_grants = *xen_init_grant_ram();
+ }
+ 
++static bool xen_validate_pcie_config(XenArmState *xam)
++{
++    if (xam->cfg.pcie_ecam.base == 0 &&
++        xam->cfg.pcie_ecam.size == 0 &&
++        xam->cfg.pcie_mmio.base == 0 &&
++        xam->cfg.pcie_mmio.size == 0 &&
++        xam->cfg.pcie_mmio_high.base == 0 &&
++        xam->cfg.pcie_mmio_high.size == 0) {
++        /* It's okay, user just don't want PCIe brige */
++        return false;
++    }
++
++    if (xam->cfg.pcie_ecam.base == 0 ||
++        xam->cfg.pcie_ecam.size == 0 ||
++        xam->cfg.pcie_mmio.base == 0 ||
++        xam->cfg.pcie_mmio.size == 0 ||
++        xam->cfg.pcie_mmio_high.base == 0 ||
++        xam->cfg.pcie_mmio_high.size == 0) {
++        /* User provided some PCIe options, but not all of them */
++        error_printf("Incomplete PCIe bridge configuration\n");
++        exit(1);
++    }
++
++    return true;
++}
++
++static void xen_create_pcie(XenArmState *xam)
++{
++    MemoryRegion *mmio_alias, *mmio_alias_high, *mmio_reg;
++    MemoryRegion *ecam_alias, *ecam_reg;
++    DeviceState *dev;
++    int i;
++
++    dev = qdev_new(TYPE_GPEX_HOST);
++    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
++
++    /* Map ECAM space */
++    ecam_alias = g_new0(MemoryRegion, 1);
++    ecam_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
++    memory_region_init_alias(ecam_alias, OBJECT(dev), "pcie-ecam",
++                             ecam_reg, 0, xam->cfg.pcie_ecam.size);
++    memory_region_add_subregion(get_system_memory(), xam->cfg.pcie_ecam.base,
++                                ecam_alias);
++
++    /* Map the MMIO space */
++    mmio_alias = g_new0(MemoryRegion, 1);
++    mmio_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1);
++    memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio",
++                             mmio_reg,
++                             xam->cfg.pcie_mmio.base,
++                             xam->cfg.pcie_mmio.size);
++    memory_region_add_subregion(get_system_memory(), xam->cfg.pcie_mmio.base,
++                                mmio_alias);
++
++    /* Map the MMIO_HIGH space */
++    mmio_alias_high = g_new0(MemoryRegion, 1);
++    memory_region_init_alias(mmio_alias_high, OBJECT(dev), "pcie-mmio-high",
++                             mmio_reg,
++                             xam->cfg.pcie_mmio_high.base,
++                             xam->cfg.pcie_mmio_high.size);
++    memory_region_add_subregion(get_system_memory(),
++                                xam->cfg.pcie_mmio_high.base,
++                                mmio_alias_high);
++
++    /* Legacy PCI interrupts (#INTA - #INTD) */
++    for (i = 0; i < GPEX_NUM_IRQS; i++) {
++        qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL,
++                                         GUEST_VIRTIO_PCI_SPI_FIRST + i);
++
++        sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, irq);
++        gpex_set_irq_num(GPEX_HOST(dev), i, GUEST_VIRTIO_PCI_SPI_FIRST + i);
++    }
++}
++
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     hw_error("Invalid ioreq type 0x%x\n", req->type);
+@@ -193,6 +271,13 @@ static void xen_arm_init(MachineState *machine)
+ 
+     xen_create_virtio_mmio_devices(xam);
+ 
++    if (xen_validate_pcie_config(xam)) {
++        xen_create_pcie(xam);
++    } else {
++        DPRINTF("PCIe host bridge is not configured,"
++                " only virtio-mmio can be used\n");
++    }
++
+ #ifdef CONFIG_TPM
+     if (xam->cfg.tpm_base_addr) {
+         xen_enable_tpm(xam);
+@@ -228,6 +313,150 @@ static void xen_arm_set_tpm_base_addr(Object *obj, Visitor *v,
+ }
+ #endif
+ 
++static void xen_arm_get_pcie_ecam_base_addr(Object *obj, Visitor *v,
++                                           const char *name, void *opaque,
++                                           Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_ecam.base;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_ecam_base_addr(Object *obj, Visitor *v,
++                                           const char *name, void *opaque,
++                                           Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_ecam.base = value;
++}
++
++static void xen_arm_get_pcie_ecam_size(Object *obj, Visitor *v,
++                                      const char *name, void *opaque,
++                                      Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_ecam.size;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_ecam_size(Object *obj, Visitor *v,
++                                      const char *name, void *opaque,
++                                      Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_ecam.size = value;
++}
++
++static void xen_arm_get_pcie_mmio_base_addr(Object *obj, Visitor *v,
++                                           const char *name, void *opaque,
++                                           Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_mmio.base;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_mmio_base_addr(Object *obj, Visitor *v,
++                                           const char *name, void *opaque,
++                                           Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_mmio.base = value;
++}
++
++static void xen_arm_get_pcie_mmio_size(Object *obj, Visitor *v,
++                                      const char *name, void *opaque,
++                                      Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_mmio.size;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_mmio_size(Object *obj, Visitor *v,
++                                      const char *name, void *opaque,
++                                      Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_mmio.size = value;
++}
++
++static void xen_arm_get_pcie_prefetch_base_addr(Object *obj, Visitor *v,
++                                               const char *name, void *opaque,
++                                               Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_mmio_high.base;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_prefetch_base_addr(Object *obj, Visitor *v,
++                                               const char *name, void *opaque,
++                                               Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_mmio_high.base = value;
++}
++
++static void xen_arm_get_pcie_prefetch_size(Object *obj, Visitor *v,
++                                          const char *name, void *opaque,
++                                          Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_mmio_high.size;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_prefetch_size(Object *obj, Visitor *v,
++                                          const char *name, void *opaque,
++                                          Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_mmio_high.size = value;
++}
++
+ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
+ {
+ 
+@@ -249,6 +478,48 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
+ 
+     machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
+ #endif
++
++    object_class_property_add(oc, "pci-ecam-base-addr", "uint64_t",
++                              xen_arm_get_pcie_ecam_base_addr,
++                              xen_arm_set_pcie_ecam_base_addr,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-ecam-base-addr",
++                                          "Set Base address for PCI ECAM.");
++
++    object_class_property_add(oc, "pci-ecam-size", "uint64_t",
++                              xen_arm_get_pcie_ecam_size,
++                              xen_arm_set_pcie_ecam_size,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-ecam-size",
++                                          "Set Size for PCI ECAM.");
++
++    object_class_property_add(oc, "pci-mmio-base-addr", "uint64_t",
++                              xen_arm_get_pcie_mmio_base_addr,
++                              xen_arm_set_pcie_mmio_base_addr,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-mmio-base-addr",
++                                          "Set Base address for PCI MMIO.");
++
++    object_class_property_add(oc, "pci-mmio-size", "uint64_t",
++                              xen_arm_get_pcie_mmio_size,
++                              xen_arm_set_pcie_mmio_size,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-mmio-size",
++                                          "Set size for PCI MMIO.");
++
++    object_class_property_add(oc, "pci-prefetch-base-addr", "uint64_t",
++                              xen_arm_get_pcie_prefetch_base_addr,
++                              xen_arm_set_pcie_prefetch_base_addr,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-prefetch-base-addr",
++                                          "Set Prefetch Base address for PCI.");
++
++    object_class_property_add(oc, "pci-prefetch-size", "uint64_t",
++                              xen_arm_get_pcie_prefetch_size,
++                              xen_arm_set_pcie_prefetch_size,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-prefetch-size",
++                                          "Set Prefetch size for PCI.");
+ }
+ 
+ static const TypeInfo xen_arm_machine_type = {
+diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h
+index 6f09c48823..1e81189a27 100644
+--- a/include/hw/xen/xen_native.h
++++ b/include/hw/xen/xen_native.h
+@@ -539,6 +539,9 @@ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
+ #define GUEST_VIRTIO_MMIO_SPI_LAST    43
+ #endif
+ 
++#define GUEST_VIRTIO_PCI_SPI_FIRST    44
++#define GUEST_VIRTIO_PCI_SPI_LAST     48
++
+ #if defined(__i386__) || defined(__x86_64__)
+ #define GUEST_RAM_BANKS   2
+ #define GUEST_RAM0_BASE   0x40000000ULL /* 3GB of low RAM @ 1GB */
+-- 
+2.30.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-xen_arm-Create-virtio-mmio-devices-during-initializa.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-xen_arm-Create-virtio-mmio-devices-during-initializa.patch
new file mode 100644
index 00000000..1757e9e2
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-xen_arm-Create-virtio-mmio-devices-during-initializa.patch
@@ -0,0 +1,116 @@
+From b9291457ca2eb4340c71d2eed08fde83916c9fa4 Mon Sep 17 00:00:00 2001
+From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Date: Tue, 29 Aug 2023 21:35:17 -0700
+Subject: [PATCH 01/11] xen_arm: Create virtio-mmio devices during
+ initialization
+
+In order to use virtio backends we need to allocate virtio-mmio
+parameters (irq and base) and register corresponding buses.
+
+Use the constants defined in public header arch-arm.h to be
+aligned with the toolstack. So the number of current supported
+virtio-mmio devices is 10.
+
+For the interrupts triggering use already existing on Arm
+device-model hypercall.
+
+The toolstack should then insert the same amount of device nodes
+into guest device-tree.
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c            | 35 +++++++++++++++++++++++++++++++++++
+ include/hw/xen/xen_native.h | 16 ++++++++++++++++
+ 2 files changed, 51 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 1d3e6d481a..7393b37355 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -26,6 +26,7 @@
+ #include "qapi/qapi-commands-migration.h"
+ #include "qapi/visitor.h"
+ #include "hw/boards.h"
++#include "hw/irq.h"
+ #include "hw/sysbus.h"
+ #include "sysemu/block-backend.h"
+ #include "sysemu/tpm_backend.h"
+@@ -59,6 +60,38 @@ struct XenArmState {
+     } cfg;
+ };
+ 
++/*
++ * VIRTIO_MMIO_DEV_SIZE is imported from tools/libs/light/libxl_arm.c under Xen
++ * repository.
++ *
++ * Origin: git://xenbits.xen.org/xen.git 2128143c114c
++ */
++#define VIRTIO_MMIO_DEV_SIZE   0x200
++
++#define NR_VIRTIO_MMIO_DEVICES   \
++   (GUEST_VIRTIO_MMIO_SPI_LAST - GUEST_VIRTIO_MMIO_SPI_FIRST)
++
++static void xen_set_irq(void *opaque, int irq, int level)
++{
++    xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level);
++}
++
++static void xen_create_virtio_mmio_devices(XenArmState *xam)
++{
++    int i;
++
++    for (i = 0; i < NR_VIRTIO_MMIO_DEVICES; i++) {
++        hwaddr base = GUEST_VIRTIO_MMIO_BASE + i * VIRTIO_MMIO_DEV_SIZE;
++        qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL,
++                                         GUEST_VIRTIO_MMIO_SPI_FIRST + i);
++
++        sysbus_create_simple("virtio-mmio", base, irq);
++
++        DPRINTF("Created virtio-mmio device %d: irq %d base 0x%lx\n",
++                i, GUEST_VIRTIO_MMIO_SPI_FIRST + i, base);
++    }
++}
++
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     hw_error("Invalid ioreq type 0x%x\n", req->type);
+@@ -110,6 +143,8 @@ static void xen_arm_init(MachineState *machine)
+ 
+     xen_register_ioreq(xam->state, machine->smp.cpus, &xen_memory_listener);
+ 
++    xen_create_virtio_mmio_devices(xam);
++
+ #ifdef CONFIG_TPM
+     if (xam->cfg.tpm_base_addr) {
+         xen_enable_tpm(xam);
+diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h
+index 4dce905fde..a4b1aa9e5d 100644
+--- a/include/hw/xen/xen_native.h
++++ b/include/hw/xen/xen_native.h
+@@ -523,4 +523,20 @@ static inline int xen_set_ioreq_server_state(domid_t dom,
+                                                  enable);
+ }
+ 
++#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41500
++static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
++                                               domid_t domid, uint32_t irq,
++                                               unsigned int level)
++{
++    return 0;
++}
++#endif
++
++#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41700
++#define GUEST_VIRTIO_MMIO_BASE   xen_mk_ullong(0x02000000)
++#define GUEST_VIRTIO_MMIO_SIZE   xen_mk_ullong(0x00100000)
++#define GUEST_VIRTIO_MMIO_SPI_FIRST   33
++#define GUEST_VIRTIO_MMIO_SPI_LAST    43
++#endif
++
+ #endif /* QEMU_HW_XEN_NATIVE_H */
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0002-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0002-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch
new file mode 100644
index 00000000..f88db620
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0002-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch
@@ -0,0 +1,124 @@
+From 70a74795c5071bf591e6e557b7c8c492ead0e675 Mon Sep 17 00:00:00 2001
+From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Date: Tue, 29 Aug 2023 21:35:18 -0700
+Subject: [PATCH 02/11] xen_arm: Initialize RAM and add hi/low memory regions
+
+In order to use virtio backends we need to initialize RAM for the
+xen-mapcache (which is responsible for mapping guest memory using foreign
+mapping) to work. Calculate and add hi/low memory regions based on
+machine->ram_size.
+
+Use the constants defined in public header arch-arm.h to be aligned with the xen
+toolstack.
+
+While using this machine, the toolstack should then pass real ram_size using
+"-m" arg. If "-m" is not given, create a QEMU machine without IOREQ and other
+emulated devices like TPM and VIRTIO. This is done to keep this QEMU machine
+usable for /etc/init.d/xencommons.
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c            | 45 +++++++++++++++++++++++++++++++++++++
+ include/hw/xen/xen_native.h |  8 +++++++
+ 2 files changed, 53 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 7393b37355..f83b983ec5 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -60,6 +60,8 @@ struct XenArmState {
+     } cfg;
+ };
+ 
++static MemoryRegion ram_lo, ram_hi;
++
+ /*
+  * VIRTIO_MMIO_DEV_SIZE is imported from tools/libs/light/libxl_arm.c under Xen
+  * repository.
+@@ -92,6 +94,39 @@ static void xen_create_virtio_mmio_devices(XenArmState *xam)
+     }
+ }
+ 
++static void xen_init_ram(MachineState *machine)
++{
++    MemoryRegion *sysmem = get_system_memory();
++    ram_addr_t block_len, ram_size[GUEST_RAM_BANKS];
++
++    if (machine->ram_size <= GUEST_RAM0_SIZE) {
++        ram_size[0] = machine->ram_size;
++        ram_size[1] = 0;
++        block_len = GUEST_RAM0_BASE + ram_size[0];
++    } else {
++        ram_size[0] = GUEST_RAM0_SIZE;
++        ram_size[1] = machine->ram_size - GUEST_RAM0_SIZE;
++        block_len = GUEST_RAM1_BASE + ram_size[1];
++    }
++
++    memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len,
++                           &error_fatal);
++
++    memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", &ram_memory,
++                             GUEST_RAM0_BASE, ram_size[0]);
++    memory_region_add_subregion(sysmem, GUEST_RAM0_BASE, &ram_lo);
++    DPRINTF("Initialized region xen.ram.lo: base 0x%llx size 0x%lx\n",
++            GUEST_RAM0_BASE, ram_size[0]);
++
++    if (ram_size[1] > 0) {
++        memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", &ram_memory,
++                                 GUEST_RAM1_BASE, ram_size[1]);
++        memory_region_add_subregion(sysmem, GUEST_RAM1_BASE, &ram_hi);
++        DPRINTF("Initialized region xen.ram.hi: base 0x%llx size 0x%lx\n",
++                GUEST_RAM1_BASE, ram_size[1]);
++    }
++}
++
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     hw_error("Invalid ioreq type 0x%x\n", req->type);
+@@ -141,6 +176,14 @@ static void xen_arm_init(MachineState *machine)
+ 
+     xam->state =  g_new0(XenIOState, 1);
+ 
++    if (machine->ram_size == 0) {
++        DPRINTF("ram_size not specified. QEMU machine started without IOREQ"
++                "(no emulated devices including Virtio)\n");
++        return;
++    }
++
++    xen_init_ram(machine);
++
+     xen_register_ioreq(xam->state, machine->smp.cpus, &xen_memory_listener);
+ 
+     xen_create_virtio_mmio_devices(xam);
+@@ -188,6 +231,8 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
+     mc->init = xen_arm_init;
+     mc->max_cpus = 1;
+     mc->default_machine_opts = "accel=xen";
++    /* Set explicitly here to make sure that real ram_size is passed */
++    mc->default_ram_size = 0;
+ 
+ #ifdef CONFIG_TPM
+     object_class_property_add(oc, "tpm-base-addr", "uint64_t",
+diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h
+index a4b1aa9e5d..5d2718261f 100644
+--- a/include/hw/xen/xen_native.h
++++ b/include/hw/xen/xen_native.h
+@@ -539,4 +539,12 @@ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
+ #define GUEST_VIRTIO_MMIO_SPI_LAST    43
+ #endif
+ 
++#if defined(__i386__) || defined(__x86_64__)
++#define GUEST_RAM_BANKS   2
++#define GUEST_RAM0_BASE   0x40000000ULL /* 3GB of low RAM @ 1GB */
++#define GUEST_RAM0_SIZE   0xc0000000ULL
++#define GUEST_RAM1_BASE   0x0200000000ULL /* 1016GB of RAM @ 8GB */
++#define GUEST_RAM1_SIZE   0xfe00000000ULL
++#endif
++
+ #endif /* QEMU_HW_XEN_NATIVE_H */
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0003-Xen-Fix-xen_set_irq-and-xendevicemodel_set_irq_level.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0003-Xen-Fix-xen_set_irq-and-xendevicemodel_set_irq_level.patch
new file mode 100644
index 00000000..c6945d54
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0003-Xen-Fix-xen_set_irq-and-xendevicemodel_set_irq_level.patch
@@ -0,0 +1,55 @@
+From 14b9dbd7f0261ae7a36bef251924ba211beef17a Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Wed, 1 Nov 2023 14:07:23 -0700
+Subject: [PATCH 03/11] Xen: Fix xen_set_irq() and
+ xendevicemodel_set_irq_level()
+
+Remove '=' from 'if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41500'.
+Because xendevicemodel_set_irq_level() was introduced in 4.15 version.
+
+Also, update xendevicemodel_set_irq_level() to return -1 for older versions.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ hw/arm/xen_arm.c            | 4 +++-
+ include/hw/xen/xen_native.h | 4 ++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index f83b983ec5..a5631529d0 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -75,7 +75,9 @@ static MemoryRegion ram_lo, ram_hi;
+ 
+ static void xen_set_irq(void *opaque, int irq, int level)
+ {
+-    xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level);
++    if (xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level)) {
++        error_report("xendevicemodel_set_irq_level failed");
++    }
+ }
+ 
+ static void xen_create_virtio_mmio_devices(XenArmState *xam)
+diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h
+index 5d2718261f..6f09c48823 100644
+--- a/include/hw/xen/xen_native.h
++++ b/include/hw/xen/xen_native.h
+@@ -523,12 +523,12 @@ static inline int xen_set_ioreq_server_state(domid_t dom,
+                                                  enable);
+ }
+ 
+-#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41500
++#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41500
+ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
+                                                domid_t domid, uint32_t irq,
+                                                unsigned int level)
+ {
+-    return 0;
++    return -1;
+ }
+ #endif
+ 
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0004-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0004-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch
new file mode 100644
index 00000000..da2f042b
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0004-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch
@@ -0,0 +1,70 @@
+From 02507086b3ad9beb9c669aae54fcb4857cd61ef8 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Tue, 16 Mar 2021 14:00:33 +0100
+Subject: [PATCH 04/11] xen: when unplugging emulated devices skip virtio
+ devices
+
+Virtio devices should never be unplugged at boot time, as they are
+similar to pci passthrough devices.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+---
+ docs/system/i386/xen.rst   |  3 ---
+ hw/i386/xen/xen_platform.c | 10 ++++++++--
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/docs/system/i386/xen.rst b/docs/system/i386/xen.rst
+index f06765e88c..b86d57af6e 100644
+--- a/docs/system/i386/xen.rst
++++ b/docs/system/i386/xen.rst
+@@ -52,9 +52,6 @@ It is necessary to use the pc machine type, as the q35 machine uses AHCI instead
+ of legacy IDE, and AHCI disks are not unplugged through the Xen PV unplug
+ mechanism.
+ 
+-VirtIO devices can also be used; Linux guests may need to be dissuaded from
+-umplugging them by adding 'xen_emul_unplug=never' on their command line.
+-
+ Properties
+ ----------
+ 
+diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
+index 17457ff3de..0187b73eeb 100644
+--- a/hw/i386/xen/xen_platform.c
++++ b/hw/i386/xen/xen_platform.c
+@@ -28,6 +28,7 @@
+ #include "hw/ide/pci.h"
+ #include "hw/pci/pci.h"
+ #include "migration/vmstate.h"
++#include "hw/virtio/virtio-bus.h"
+ #include "net/net.h"
+ #include "trace.h"
+ #include "sysemu/xen.h"
+@@ -129,10 +130,11 @@ static bool pci_device_is_passthrough(PCIDevice *d)
+ 
+ static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)
+ {
+-    /* We have to ignore passthrough devices */
++    /* We have to ignore passthrough devices  and virtio devices. */
+     if (pci_get_word(d->config + PCI_CLASS_DEVICE) ==
+             PCI_CLASS_NETWORK_ETHERNET
+-            && !pci_device_is_passthrough(d)) {
++            && !pci_device_is_passthrough(d)
++            && !qdev_get_child_bus(&d->qdev, TYPE_VIRTIO_BUS)) {
+         object_unparent(OBJECT(d));
+     }
+ }
+@@ -208,6 +210,10 @@ static void unplug_disks(PCIBus *b, PCIDevice *d, void *opaque)
+     /* We have to ignore passthrough devices */
+     if (pci_device_is_passthrough(d))
+         return;
++    /* Ignore virtio devices */
++    if (qdev_get_child_bus(&d->qdev, TYPE_VIRTIO_BUS)) {
++        return;
++    }
+ 
+     switch (pci_get_word(d->config + PCI_CLASS_DEVICE)) {
+     case PCI_CLASS_STORAGE_IDE:
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0005-softmmu-physmem-Split-ram_block_add.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0005-softmmu-physmem-Split-ram_block_add.patch
new file mode 100644
index 00000000..3c39dd19
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0005-softmmu-physmem-Split-ram_block_add.patch
@@ -0,0 +1,117 @@
+From d4774a0e5e1ebed605c5d49e81433fd371d0b680 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Tue, 17 Oct 2023 20:22:26 +0000
+Subject: [PATCH 05/11] softmmu: physmem: Split ram_block_add()
+
+Extract ram block list update to a new function ram_block_add_list(). This is
+done to support grant mappings which adds a memory region for granted memory and
+updates the ram_block list.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ include/exec/ram_addr.h |  1 +
+ softmmu/physmem.c       | 62 ++++++++++++++++++++++++++---------------
+ 2 files changed, 40 insertions(+), 23 deletions(-)
+
+diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
+index 9f2e3893f5..76fa360463 100644
+--- a/include/exec/ram_addr.h
++++ b/include/exec/ram_addr.h
+@@ -139,6 +139,7 @@ void qemu_ram_free(RAMBlock *block);
+ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp);
+ 
+ void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length);
++void ram_block_add_list(RAMBlock *new_block);
+ 
+ /* Clear whole block of mem */
+ static inline void qemu_ram_block_writeback(RAMBlock *block)
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index 3df73542e1..f73629733e 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -1786,12 +1786,47 @@ static void dirty_memory_extend(ram_addr_t old_ram_size,
+     }
+ }
+ 
++static void ram_block_add_list_locked(RAMBlock *new_block)
++ {
++     RAMBlock *block;
++     RAMBlock *last_block = NULL;
++
++    /*
++     * Keep the list sorted from biggest to smallest block.  Unlike QTAILQ,
++     * QLIST (which has an RCU-friendly variant) does not have insertion at
++     * tail, so save the last element in last_block.
++     */
++    RAMBLOCK_FOREACH(block) {
++        last_block = block;
++        if (block->max_length < new_block->max_length) {
++            break;
++        }
++    }
++    if (block) {
++        QLIST_INSERT_BEFORE_RCU(block, new_block, next);
++    } else if (last_block) {
++        QLIST_INSERT_AFTER_RCU(last_block, new_block, next);
++    } else { /* list is empty */
++        QLIST_INSERT_HEAD_RCU(&ram_list.blocks, new_block, next);
++    }
++    ram_list.mru_block = NULL;
++
++    /* Write list before version */
++    smp_wmb();
++    ram_list.version++;
++}
++
++void ram_block_add_list(RAMBlock *new_block)
++{
++    qemu_mutex_lock_ramlist();
++    ram_block_add_list_locked(new_block);
++    qemu_mutex_unlock_ramlist();
++}
++
+ static void ram_block_add(RAMBlock *new_block, Error **errp)
+ {
+     const bool noreserve = qemu_ram_is_noreserve(new_block);
+     const bool shared = qemu_ram_is_shared(new_block);
+-    RAMBlock *block;
+-    RAMBlock *last_block = NULL;
+     ram_addr_t old_ram_size, new_ram_size;
+     Error *err = NULL;
+ 
+@@ -1829,28 +1864,9 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
+     if (new_ram_size > old_ram_size) {
+         dirty_memory_extend(old_ram_size, new_ram_size);
+     }
+-    /* Keep the list sorted from biggest to smallest block.  Unlike QTAILQ,
+-     * QLIST (which has an RCU-friendly variant) does not have insertion at
+-     * tail, so save the last element in last_block.
+-     */
+-    RAMBLOCK_FOREACH(block) {
+-        last_block = block;
+-        if (block->max_length < new_block->max_length) {
+-            break;
+-        }
+-    }
+-    if (block) {
+-        QLIST_INSERT_BEFORE_RCU(block, new_block, next);
+-    } else if (last_block) {
+-        QLIST_INSERT_AFTER_RCU(last_block, new_block, next);
+-    } else { /* list is empty */
+-        QLIST_INSERT_HEAD_RCU(&ram_list.blocks, new_block, next);
+-    }
+-    ram_list.mru_block = NULL;
++ 
++    ram_block_add_list_locked(new_block);
+ 
+-    /* Write list before version */
+-    smp_wmb();
+-    ram_list.version++;
+     qemu_mutex_unlock_ramlist();
+ 
+     cpu_physical_memory_set_dirty_range(new_block->offset,
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0006-xen-add-pseudo-RAM-region-for-grant-mappings.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0006-xen-add-pseudo-RAM-region-for-grant-mappings.patch
new file mode 100644
index 00000000..a43748fe
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0006-xen-add-pseudo-RAM-region-for-grant-mappings.patch
@@ -0,0 +1,153 @@
+From 637d10471fef76a7ab0e8f5631ea3c85ff5ce9db Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 11:19:58 +0200
+Subject: [PATCH 06/11] xen: add pseudo RAM region for grant mappings
+
+Add a memory region which can be used to automatically map granted
+memory. It is starting at 0x8000000000000000ULL in order to be able to
+distinguish it from normal RAM.
+
+For this reason the xen.ram memory region is expanded, which has no
+further impact as it is used just as a container of the real RAM
+regions and now the grant region.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ hw/i386/xen/xen-hvm.c           |  3 +++
+ hw/xen/xen-hvm-common.c         |  4 ++--
+ hw/xen/xen-mapcache.c           | 27 +++++++++++++++++++++++++++
+ include/hw/xen/xen-hvm-common.h |  2 ++
+ include/hw/xen/xen_pvdev.h      |  3 +++
+ include/sysemu/xen-mapcache.h   |  3 +++
+ 6 files changed, 40 insertions(+), 2 deletions(-)
+
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index f42621e674..67a55558a6 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -172,6 +172,9 @@ static void xen_ram_init(PCMachineState *pcms,
+                                  x86ms->above_4g_mem_size);
+         memory_region_add_subregion(sysmem, 0x100000000ULL, &ram_hi);
+     }
++
++    /* Add grant mappings as a pseudo RAM region. */
++    ram_grants = *xen_init_grant_ram();
+ }
+ 
+ static XenPhysmap *get_physmapping(hwaddr start_addr, ram_addr_t size)
+diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
+index 565dc39c8f..b7255977a5 100644
+--- a/hw/xen/xen-hvm-common.c
++++ b/hw/xen/xen-hvm-common.c
+@@ -9,7 +9,7 @@
+ #include "hw/boards.h"
+ #include "hw/xen/arch_hvm.h"
+ 
+-MemoryRegion ram_memory;
++MemoryRegion ram_memory, ram_grants;
+ 
+ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
+                    Error **errp)
+@@ -26,7 +26,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
+         return;
+     }
+ 
+-    if (mr == &ram_memory) {
++    if (mr == &ram_memory || mr == &ram_grants) {
+         return;
+     }
+ 
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index f7d974677d..8115c44c00 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -14,7 +14,9 @@
+ 
+ #include <sys/resource.h>
+ 
++#include "hw/xen/xen-hvm-common.h"
+ #include "hw/xen/xen_native.h"
++#include "hw/xen/xen_pvdev.h"
+ #include "qemu/bitmap.h"
+ 
+ #include "sysemu/runstate.h"
+@@ -597,3 +599,28 @@ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+     mapcache_unlock();
+     return p;
+ }
++
++MemoryRegion *xen_init_grant_ram(void)
++{
++    RAMBlock *block;
++
++    memory_region_init(&ram_grants, NULL, "xen.grants",
++                       XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE);
++    block = g_malloc0(sizeof(*block));
++    block->mr = &ram_grants;
++    block->used_length = XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE;
++    block->max_length = XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE;
++    block->fd = -1;
++    block->page_size = XC_PAGE_SIZE;
++    block->host = (void *)XEN_GRANT_ADDR_OFF;
++    block->offset = XEN_GRANT_ADDR_OFF;
++    block->flags = RAM_PREALLOC;
++    ram_grants.ram_block = block;
++    ram_grants.ram = true;
++    ram_grants.terminates = true;
++    ram_block_add_list(block);
++    memory_region_add_subregion(get_system_memory(), XEN_GRANT_ADDR_OFF,
++                                &ram_grants);
++
++    return &ram_grants;
++}
+diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h
+index 4e9904f1a6..0d300ba898 100644
+--- a/include/hw/xen/xen-hvm-common.h
++++ b/include/hw/xen/xen-hvm-common.h
+@@ -17,6 +17,8 @@
+ #include <xen/hvm/ioreq.h>
+ 
+ extern MemoryRegion ram_memory;
++
++extern MemoryRegion ram_grants;
+ extern MemoryListener xen_io_listener;
+ extern DeviceListener xen_device_listener;
+ 
+diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h
+index ddad4b9f36..0f1b5edfa9 100644
+--- a/include/hw/xen/xen_pvdev.h
++++ b/include/hw/xen/xen_pvdev.h
+@@ -80,4 +80,7 @@ int xen_pv_send_notify(struct XenLegacyDevice *xendev);
+ void xen_pv_printf(struct XenLegacyDevice *xendev, int msg_level,
+                    const char *fmt, ...)  G_GNUC_PRINTF(3, 4);
+ 
++#define XEN_GRANT_ADDR_OFF    0x8000000000000000ULL
++#define XEN_MAX_VIRTIO_GRANTS 65536
++
+ #endif /* QEMU_HW_XEN_PVDEV_H */
+diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h
+index c8e7c2f6cf..f4bedb1c11 100644
+--- a/include/sysemu/xen-mapcache.h
++++ b/include/sysemu/xen-mapcache.h
+@@ -10,6 +10,7 @@
+ #define XEN_MAPCACHE_H
+ 
+ #include "exec/cpu-common.h"
++#include "exec/ram_addr.h"
+ 
+ typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset,
+                                          ram_addr_t size);
+@@ -25,6 +26,8 @@ void xen_invalidate_map_cache(void);
+ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+                                  hwaddr new_phys_addr,
+                                  hwaddr size);
++MemoryRegion *xen_init_grant_ram(void);
++
+ #else
+ 
+ static inline void xen_map_cache_init(phys_offset_to_gaddr_t f,
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0007-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0007-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch
new file mode 100644
index 00000000..ee400e2c
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0007-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch
@@ -0,0 +1,117 @@
+From 82139e7e4bdcf5ca51b2ac90c63e4af699e3eb6f Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 11:54:48 +0200
+Subject: [PATCH 07/11] softmmu: let qemu_map_ram_ptr() use
+ qemu_ram_ptr_length()
+
+qemu_map_ram_ptr() and qemu_ram_ptr_length() share quite some code, so
+modify qemu_ram_ptr_length() a little bit and use it for
+qemu_map_ram_ptr(), too.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ softmmu/physmem.c | 58 +++++++++++++++++++----------------------------
+ 1 file changed, 23 insertions(+), 35 deletions(-)
+
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index f73629733e..a934e44fe7 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -2123,38 +2123,8 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
+ }
+ #endif /* !_WIN32 */
+ 
+-/* Return a host pointer to ram allocated with qemu_ram_alloc.
+- * This should not be used for general purpose DMA.  Use address_space_map
+- * or address_space_rw instead. For local memory (e.g. video ram) that the
+- * device owns, use memory_region_get_ram_ptr.
+- *
+- * Called within RCU critical section.
+- */
+-void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr)
+-{
+-    RAMBlock *block = ram_block;
+-
+-    if (block == NULL) {
+-        block = qemu_get_ram_block(addr);
+-        addr -= block->offset;
+-    }
+-
+-    if (xen_enabled() && block->host == NULL) {
+-        /* We need to check if the requested address is in the RAM
+-         * because we don't want to map the entire memory in QEMU.
+-         * In that case just map until the end of the page.
+-         */
+-        if (block->offset == 0) {
+-            return xen_map_cache(addr, 0, 0, false);
+-        }
+-
+-        block->host = xen_map_cache(block->offset, block->max_length, 1, false);
+-    }
+-    return ramblock_ptr(block, addr);
+-}
+-
+-/* Return a host pointer to guest's ram. Similar to qemu_map_ram_ptr
+- * but takes a size argument.
++/*
++ * Return a host pointer to guest's ram.
+  *
+  * Called within RCU critical section.
+  */
+@@ -2162,7 +2132,9 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+                                  hwaddr *size, bool lock)
+ {
+     RAMBlock *block = ram_block;
+-    if (*size == 0) {
++    hwaddr len = 0;
++
++    if (size && *size == 0) {
+         return NULL;
+     }
+ 
+@@ -2170,7 +2142,10 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+         block = qemu_get_ram_block(addr);
+         addr -= block->offset;
+     }
+-    *size = MIN(*size, block->max_length - addr);
++    if (size) {
++        *size = MIN(*size, block->max_length - addr);
++        len = *size;
++    }
+ 
+     if (xen_enabled() && block->host == NULL) {
+         /* We need to check if the requested address is in the RAM
+@@ -2178,7 +2153,7 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+          * In that case just map the requested area.
+          */
+         if (block->offset == 0) {
+-            return xen_map_cache(addr, *size, lock, lock);
++            return xen_map_cache(addr, len, lock, lock);
+         }
+ 
+         block->host = xen_map_cache(block->offset, block->max_length, 1, lock);
+@@ -2187,6 +2162,19 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+     return ramblock_ptr(block, addr);
+ }
+ 
++/*
++ * Return a host pointer to ram allocated with qemu_ram_alloc.
++ * This should not be used for general purpose DMA.  Use address_space_map
++ * or address_space_rw instead. For local memory (e.g. video ram) that the
++ * device owns, use memory_region_get_ram_ptr.
++ *
++ * Called within RCU critical section.
++ */
++void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr)
++{
++    return qemu_ram_ptr_length(ram_block, addr, NULL, false);
++}
++
+ /* Return the offset of a hostpointer within a ramblock */
+ ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host)
+ {
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0008-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0008-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch
new file mode 100644
index 00000000..c1e9abd9
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0008-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch
@@ -0,0 +1,49 @@
+From 857bcafe8beb5a0cd78c070f432108049661a56d Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 13:31:32 +0200
+Subject: [PATCH 08/11] xen: let xen_ram_addr_from_mapcache() return -1 in case
+ of not found entry
+
+Today xen_ram_addr_from_mapcache() will either abort() or return 0 in
+case it can't find a matching entry for a pointer value. Both cases
+are bad, so change that to return an invalid address instead.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ hw/xen/xen-mapcache.c | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index 8115c44c00..8a61c7dde6 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -404,13 +404,8 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
+         }
+     }
+     if (!found) {
+-        fprintf(stderr, "%s, could not find %p\n", __func__, ptr);
+-        QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
+-            DPRINTF("   "HWADDR_FMT_plx" -> %p is present\n", reventry->paddr_index,
+-                    reventry->vaddr_req);
+-        }
+-        abort();
+-        return 0;
++        mapcache_unlock();
++        return RAM_ADDR_INVALID;
+     }
+ 
+     entry = &mapcache->entry[paddr_index % mapcache->nr_buckets];
+@@ -418,8 +413,7 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
+         entry = entry->next;
+     }
+     if (!entry) {
+-        DPRINTF("Trying to find address %p that is not in the mapcache!\n", ptr);
+-        raddr = 0;
++        raddr = RAM_ADDR_INVALID;
+     } else {
+         raddr = (reventry->paddr_index << MCACHE_BUCKET_SHIFT) +
+              ((unsigned long) ptr - (unsigned long) entry->vaddr_base);
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0009-memory-add-MemoryRegion-map-and-unmap-callbacks.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0009-memory-add-MemoryRegion-map-and-unmap-callbacks.patch
new file mode 100644
index 00000000..fa18ef16
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0009-memory-add-MemoryRegion-map-and-unmap-callbacks.patch
@@ -0,0 +1,155 @@
+From 364a11be6274336ec9b0f06f3272f964d27c9349 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 27 May 2021 15:27:55 +0200
+Subject: [PATCH 09/11] memory: add MemoryRegion map and unmap callbacks
+
+In order to support mapping and unmapping guest memory dynamically to
+and from qemu during address_space_[un]map() operations add the map()
+and unmap() callbacks to MemoryRegionOps.
+
+Those will be used e.g. for Xen grant mappings when performing guest
+I/Os.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+---
+ include/exec/memory.h | 21 ++++++++++++++++++
+ softmmu/physmem.c     | 50 +++++++++++++++++++++++++++++++++----------
+ 2 files changed, 60 insertions(+), 11 deletions(-)
+
+diff --git a/include/exec/memory.h b/include/exec/memory.h
+index 68284428f8..55414417ab 100644
+--- a/include/exec/memory.h
++++ b/include/exec/memory.h
+@@ -274,6 +274,27 @@ struct MemoryRegionOps {
+                                     unsigned size,
+                                     MemTxAttrs attrs);
+ 
++    /*
++     * Dynamically create mapping. @addr is the guest address to map; @plen
++     * is the pointer to the usable length of the buffer.
++     * @mr contents can be changed in case a new memory region is created for
++     * the mapping.
++     * Returns the buffer address for accessing the data.
++     */
++    void *(*map)(MemoryRegion **mr,
++                 hwaddr addr,
++                 hwaddr *plen,
++                 bool is_write,
++                 MemTxAttrs attrs);
++
++    /* Unmap an area obtained via map() before. */
++    void (*unmap)(MemoryRegion *mr,
++                  void *buffer,
++                  ram_addr_t addr,
++                  hwaddr len,
++                  bool is_write,
++                  hwaddr access_len);
++
+     enum device_endian endianness;
+     /* Guest-visible constraints: */
+     struct {
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index a934e44fe7..a1e2030424 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -3070,6 +3070,7 @@ void *address_space_map(AddressSpace *as,
+     hwaddr len = *plen;
+     hwaddr l, xlat;
+     MemoryRegion *mr;
++    void *ptr = NULL;
+     FlatView *fv;
+ 
+     if (len == 0) {
+@@ -3103,12 +3104,20 @@ void *address_space_map(AddressSpace *as,
+         return bounce.buffer;
+     }
+ 
+-
+     memory_region_ref(mr);
++
++    if (mr->ops && mr->ops->map) {
++        ptr = mr->ops->map(&mr, addr, plen, is_write, attrs);
++    }
++
+     *plen = flatview_extend_translation(fv, addr, len, mr, xlat,
+                                         l, is_write, attrs);
+     fuzz_dma_read_cb(addr, *plen, mr);
+-    return qemu_ram_ptr_length(mr->ram_block, xlat, plen, true);
++    if (ptr == NULL) {
++        ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true);
++    }
++
++    return ptr;
+ }
+ 
+ /* Unmaps a memory region previously mapped by address_space_map().
+@@ -3124,11 +3133,16 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,
+ 
+         mr = memory_region_from_host(buffer, &addr1);
+         assert(mr != NULL);
+-        if (is_write) {
+-            invalidate_and_set_dirty(mr, addr1, access_len);
+-        }
+-        if (xen_enabled()) {
+-            xen_invalidate_map_cache_entry(buffer);
++
++        if (mr->ops && mr->ops->unmap) {
++            mr->ops->unmap(mr, buffer, addr1, len, is_write, access_len);
++        } else {
++            if (is_write) {
++                invalidate_and_set_dirty(mr, addr1, access_len);
++            }
++            if (xen_enabled()) {
++                xen_invalidate_map_cache_entry(buffer);
++            }
+         }
+         memory_region_unref(mr);
+         return;
+@@ -3201,10 +3215,18 @@ int64_t address_space_cache_init(MemoryRegionCache *cache,
+          * doing this if we found actual RAM, which behaves the same
+          * regardless of attributes; so UNSPECIFIED is fine.
+          */
++        if (mr->ops && mr->ops->map) {
++            cache->ptr = mr->ops->map(&mr, addr, &l, is_write,
++                                      MEMTXATTRS_UNSPECIFIED);
++        }
++
+         l = flatview_extend_translation(cache->fv, addr, len, mr,
+                                         cache->xlat, l, is_write,
+                                         MEMTXATTRS_UNSPECIFIED);
+-        cache->ptr = qemu_ram_ptr_length(mr->ram_block, cache->xlat, &l, true);
++        if (!cache->ptr) {
++            cache->ptr = qemu_ram_ptr_length(mr->ram_block, cache->xlat, &l,
++                                             true);
++        }
+     } else {
+         cache->ptr = NULL;
+     }
+@@ -3226,14 +3248,20 @@ void address_space_cache_invalidate(MemoryRegionCache *cache,
+ 
+ void address_space_cache_destroy(MemoryRegionCache *cache)
+ {
+-    if (!cache->mrs.mr) {
++    MemoryRegion *mr = cache->mrs.mr;
++
++    if (!mr) {
+         return;
+     }
+ 
+-    if (xen_enabled()) {
++    if (mr->ops && mr->ops->unmap) {
++            mr->ops->unmap(mr, cache->ptr, cache->xlat, cache->len,
++                           cache->is_write, cache->len);
++    } else if (xen_enabled()) {
+         xen_invalidate_map_cache_entry(cache->ptr);
+     }
+-    memory_region_unref(cache->mrs.mr);
++
++    memory_region_unref(mr);
+     flatview_unref(cache->fv);
+     cache->mrs.mr = NULL;
+     cache->fv = NULL;
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0010-xen-add-map-and-unmap-callbacks-for-grant-region.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0010-xen-add-map-and-unmap-callbacks-for-grant-region.patch
new file mode 100644
index 00000000..48dcf7d7
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0010-xen-add-map-and-unmap-callbacks-for-grant-region.patch
@@ -0,0 +1,262 @@
+From 90496d4c71e3b9334aebca118661bf72631ed0f0 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Fri, 26 Aug 2022 13:57:06 +0200
+Subject: [PATCH 10/11] xen: add map and unmap callbacks for grant region
+
+Add the callbacks for mapping/unmapping guest memory via grants to the
+special grant memory region.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+---
+ hw/xen/xen-mapcache.c | 176 +++++++++++++++++++++++++++++++++++++++++-
+ softmmu/physmem.c     |  11 ++-
+ 2 files changed, 182 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index 8a61c7dde6..e071328fc5 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -9,6 +9,8 @@
+  */
+ 
+ #include "qemu/osdep.h"
++#include "qemu/queue.h"
++#include "qemu/thread.h"
+ #include "qemu/units.h"
+ #include "qemu/error-report.h"
+ 
+@@ -23,6 +25,8 @@
+ #include "sysemu/xen-mapcache.h"
+ #include "trace.h"
+ 
++#include <xenevtchn.h>
++#include <xengnttab.h>
+ 
+ //#define MAPCACHE_DEBUG
+ 
+@@ -385,7 +389,7 @@ uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size,
+     return p;
+ }
+ 
+-ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
++static ram_addr_t xen_ram_addr_from_mapcache_try(void *ptr)
+ {
+     MapCacheEntry *entry = NULL;
+     MapCacheRev *reventry;
+@@ -594,10 +598,179 @@ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+     return p;
+ }
+ 
++struct XENMappedGrantRegion {
++    void *addr;
++    unsigned int pages;
++    unsigned int refs;
++    unsigned int prot;
++    uint32_t idx;
++    QLIST_ENTRY(XENMappedGrantRegion) list;
++};
++
++static xengnttab_handle *xen_region_gnttabdev;
++static QLIST_HEAD(GrantRegionList, XENMappedGrantRegion) xen_grant_mappings =
++    QLIST_HEAD_INITIALIZER(xen_grant_mappings);
++static QemuMutex xen_map_mutex;
++
++static void *xen_map_grant_dyn(MemoryRegion **mr, hwaddr addr, hwaddr *plen,
++                               bool is_write, MemTxAttrs attrs)
++{
++    unsigned int page_off = addr & (XC_PAGE_SIZE - 1);
++    unsigned int i;
++    unsigned int total_grants = 0;
++    unsigned int nrefs = (page_off + *plen + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
++    uint32_t ref = (addr - XEN_GRANT_ADDR_OFF) >> XC_PAGE_SHIFT;
++    uint32_t *refs = NULL;
++    unsigned int prot = PROT_READ;
++    struct XENMappedGrantRegion *mgr = NULL;
++
++    if (is_write) {
++        prot |= PROT_WRITE;
++    }
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->idx == ref &&
++            mgr->pages == nrefs &&
++            (mgr->prot & prot) == prot) {
++            break;
++        }
++
++        total_grants += mgr->pages;
++    }
++
++    if (!mgr) {
++        if (nrefs + total_grants >= XEN_MAX_VIRTIO_GRANTS) {
++            qemu_mutex_unlock(&xen_map_mutex);
++            return NULL;
++        }
++
++        mgr = g_new(struct XENMappedGrantRegion, 1);
++
++        if (nrefs == 1) {
++            refs = &ref;
++        } else {
++            refs = g_new(uint32_t, nrefs);
++            for (i = 0; i < nrefs; i++) {
++                refs[i] = ref + i;
++            }
++        }
++        mgr->addr = xengnttab_map_domain_grant_refs(xen_region_gnttabdev, nrefs,
++                                                    xen_domid, refs, prot);
++        if (mgr->addr) {
++            mgr->pages = nrefs;
++            mgr->refs = 1;
++            mgr->prot = prot;
++            mgr->idx = ref;
++
++            QLIST_INSERT_HEAD(&xen_grant_mappings, mgr, list);
++        } else {
++            g_free(mgr);
++            mgr = NULL;
++        }
++    } else {
++        mgr->refs++;
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++
++    if (nrefs > 1) {
++        g_free(refs);
++    }
++
++    return mgr ? mgr->addr + page_off : NULL;
++}
++
++static void xen_unmap_grant_dyn(MemoryRegion *mr, void *buffer, ram_addr_t addr,
++                                hwaddr len, bool is_write, hwaddr access_len)
++{
++    unsigned int page_off = (unsigned long)buffer & (XC_PAGE_SIZE - 1);
++    unsigned int nrefs = (page_off + len + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
++    unsigned int prot = PROT_READ;
++    struct XENMappedGrantRegion *mgr = NULL;
++
++    if (is_write) {
++        prot |= PROT_WRITE;
++    }
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->addr == buffer - page_off &&
++            mgr->pages == nrefs &&
++            (mgr->prot & prot) == prot) {
++            break;
++        }
++    }
++    if (mgr) {
++        mgr->refs--;
++        if (!mgr->refs) {
++            xengnttab_unmap(xen_region_gnttabdev, mgr->addr, nrefs);
++
++            QLIST_REMOVE(mgr, list);
++            g_free(mgr);
++        }
++    } else {
++        error_report("xen_unmap_grant_dyn() trying to unmap unknown buffer");
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++}
++
++static ram_addr_t xen_ram_addr_from_grant_cache(void *ptr)
++{
++    unsigned int page_off = (unsigned long)ptr & (XC_PAGE_SIZE - 1);
++    struct XENMappedGrantRegion *mgr = NULL;
++    ram_addr_t raddr = RAM_ADDR_INVALID;
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->addr == ptr - page_off) {
++            break;
++        }
++    }
++
++    if (mgr) {
++        raddr = (mgr->idx << XC_PAGE_SHIFT) + page_off + XEN_GRANT_ADDR_OFF;
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++
++    return raddr;
++}
++
++ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
++{
++    ram_addr_t raddr;
++
++    raddr = xen_ram_addr_from_mapcache_try(ptr);
++    if (raddr == RAM_ADDR_INVALID) {
++        raddr = xen_ram_addr_from_grant_cache(ptr);
++    }
++
++    return raddr;
++}
++
++static const struct MemoryRegionOps xen_grant_mr_ops = {
++    .map = xen_map_grant_dyn,
++    .unmap = xen_unmap_grant_dyn,
++    .endianness = DEVICE_LITTLE_ENDIAN,
++};
++
+ MemoryRegion *xen_init_grant_ram(void)
+ {
+     RAMBlock *block;
+ 
++    qemu_mutex_init(&xen_map_mutex);
++
++    xen_region_gnttabdev = xengnttab_open(NULL, 0);
++    if (xen_region_gnttabdev == NULL) {
++        fprintf(stderr, "can't open gnttab device\n");
++        return NULL;
++    }
++
+     memory_region_init(&ram_grants, NULL, "xen.grants",
+                        XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE);
+     block = g_malloc0(sizeof(*block));
+@@ -612,6 +785,7 @@ MemoryRegion *xen_init_grant_ram(void)
+     ram_grants.ram_block = block;
+     ram_grants.ram = true;
+     ram_grants.terminates = true;
++    ram_grants.ops = &xen_grant_mr_ops;
+     ram_block_add_list(block);
+     memory_region_add_subregion(get_system_memory(), XEN_GRANT_ADDR_OFF,
+                                 &ram_grants);
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index a1e2030424..e1057304f1 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -2210,13 +2210,16 @@ RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset,
+ 
+     if (xen_enabled()) {
+         ram_addr_t ram_addr;
++
+         RCU_READ_LOCK_GUARD();
+         ram_addr = xen_ram_addr_from_mapcache(ptr);
+-        block = qemu_get_ram_block(ram_addr);
+-        if (block) {
+-            *offset = ram_addr - block->offset;
++        if (ram_addr != RAM_ADDR_INVALID) {
++            block = qemu_get_ram_block(ram_addr);
++            if (block) {
++                *offset = ram_addr - block->offset;
++            }
++            return block;
+         }
+-        return block;
+     }
+ 
+     RCU_READ_LOCK_GUARD();
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0011-hw-arm-Add-grant-mapping.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0011-hw-arm-Add-grant-mapping.patch
new file mode 100644
index 00000000..fb5450e6
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0011-hw-arm-Add-grant-mapping.patch
@@ -0,0 +1,30 @@
+From b1eaba758a9000061fc53a934c348d6ef8dcdf64 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Tue, 31 Jan 2023 21:46:43 +0000
+Subject: [PATCH 11/11] hw: arm: Add grant mapping.
+
+Enable grant ram mapping support for Xenpvh machine on ARM.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ hw/arm/xen_arm.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index a5631529d0..1587e2a43b 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -127,6 +127,9 @@ static void xen_init_ram(MachineState *machine)
+         DPRINTF("Initialized region xen.ram.hi: base 0x%llx size 0x%lx\n",
+                 GUEST_RAM1_BASE, ram_size[1]);
+     }
++
++    DPRINTF("init grant ram mapping for XEN\n");
++    ram_grants = *xen_init_grant_ram();
+ }
+ 
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-native_%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-native_%.bbappend
new file mode 100644
index 00000000..e84844cf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-native_%.bbappend
@@ -0,0 +1 @@
+require qemu-tpm.inc
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend
new file mode 100644
index 00000000..e84844cf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend
@@ -0,0 +1 @@
+require qemu-tpm.inc
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
new file mode 100644
index 00000000..5cb9f0d0
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
@@ -0,0 +1,5 @@
+require qemu-tpm.inc
+require qemu-xen_7.1.inc
+
+# We do not want QEMU, on the target to be configured with OpenGL
+PACKAGECONFIG:remove:class-target = "virglrenderer epoxy gtk+"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend
new file mode 100644
index 00000000..2f8e55aa
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend
@@ -0,0 +1,5 @@
+require qemu-tpm.inc
+require qemu-xen_8.1.inc
+
+# We do not want QEMU, on the target to be configured with OpenGL
+PACKAGECONFIG:remove:class-target:petalinux = "virglrenderer epoxy gtk+"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_7.1%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_7.1%.bbappend
new file mode 100644
index 00000000..5cb9f0d0
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_7.1%.bbappend
@@ -0,0 +1,5 @@
+require qemu-tpm.inc
+require qemu-xen_7.1.inc
+
+# We do not want QEMU, on the target to be configured with OpenGL
+PACKAGECONFIG:remove:class-target = "virglrenderer epoxy gtk+"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_8.1%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_8.1%.bbappend
new file mode 100644
index 00000000..95b1902b
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_8.1%.bbappend
@@ -0,0 +1,5 @@
+require qemu-tpm.inc
+require qemu-xen_8.1.inc
+
+# We do not want QEMU, on the target to be configured with OpenGL
+PACKAGECONFIG:remove:class-target = "virglrenderer epoxy gtk+"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch
new file mode 100644
index 00000000..135860ab
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch
@@ -0,0 +1,57 @@
+From b300c18ab899b3c899e5405c96c20a32e51d77c8 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Mon, 2 Jul 2018 23:10:28 -0400
+Subject: [PATCH] xen: Fix menuconfig and add support for config fragments and
+
+Upstream-Status: Xen: Inappropriate [oe specific, cross compile issue]
+Upstream-Status: Kernel: Pending
+Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
+commit e6972e689a980ab28637e94e48c77eeace6abde5
+
+    xen/kconfig,menuconfig,mconf-cfg: Allow specification of ncurses location
+
+    In some cross build environments such as the Yocto Project build
+    environment it provides an ncurses library that is compiled
+    differently than the host's version.  This causes display corruption
+    problems when the host's curses includes are used instead of the
+    includes from the provided compiler are overridden.  There is a second
+    case where there is no curses libraries at all on the host system and
+    menuconfig will just fail entirely.
+
+    The solution is simply to allow an override variable in
+    check-lxdialog.sh for environments such as the Yocto Project.  Adding
+    a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
+    compiling and linking against the right headers and libraries.
+
+    Change-Id: Ibe8dfafc90655e3be2671dbbb0cb7f5631fc4d44
+    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+    cc: Michal Marek <mmarek@suse.cz>
+    cc: linux-kbuild@vger.kernel.org
+    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+
+---
+ xen/tools/kconfig/mconf-cfg.sh | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ mode change 100755 => 100644 xen/tools/kconfig/mconf-cfg.sh
+
+diff --git a/xen/tools/kconfig/mconf-cfg.sh b/xen/tools/kconfig/mconf-cfg.sh
+old mode 100755
+new mode 100644
+index c812872d7f..56eb4fc79f
+--- a/xen/tools/kconfig/mconf-cfg.sh
++++ b/xen/tools/kconfig/mconf-cfg.sh
+@@ -4,6 +4,14 @@
+ PKG="ncursesw"
+ PKG2="ncurses"
+ 
++if [ "$CROSS_CURSES_LIB" != "" ]; then
++    echo libs=\'$CROSS_CURSES_LIB\'
++    if [ x"$CROSS_CURSES_INC" != x ]; then
++      echo cflags=\'$CROSS_CURSES_INC\'
++    fi
++    exit 0
++fi
++
+ if [ -n "$(command -v pkg-config)" ]; then
+        if pkg-config --exists $PKG; then
+                echo cflags=\"$(pkg-config --cflags $PKG)\"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch
new file mode 100644
index 00000000..35cd9a81
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch
@@ -0,0 +1,73 @@
+From 6db88791d923167f160afbcadeffad84a4cbdbc5 Mon Sep 17 00:00:00 2001
+Message-Id: <6db88791d923167f160afbcadeffad84a4cbdbc5.1612262706.git.bertrand.marquis@arm.com>
+From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
+Date: Fri, 19 Oct 2018 11:01:37 +0200
+Subject: [PATCH] python,pygrub: pass DISTUTILS env vars as setup.py args
+
+Upstream-Status: Xen: Inappropriate [oe specific, python install issues]
+
+Allow to respect the target install dir (PYTHON_SITEPACKAGES_DIR)
+as well as other parameters set by the OpenEmbedded build system.
+This is especially useful when the target libdir is not the default one
+(/usr/lib), but for example /usr/lib64.
+
+Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
+
+Forward-ported to Xen 4.12.0
+Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
+
+Modified to support pygrub installation with python 3
+Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
+
+Forward-ported to Xen 4.14.0
+Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
+
+Forward-ported to Xen 4.15.0
+Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
+
+---
+ tools/pygrub/Makefile | 7 +++++--
+ tools/python/Makefile | 2 +-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
+index 37b2146214..ffb9270065 100644
+--- a/tools/pygrub/Makefile
++++ b/tools/pygrub/Makefile
+@@ -10,7 +10,7 @@ INSTALL_LOG = build/installed_files.txt
+ all: build
+ .PHONY: build
+ build:
+-       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
++       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS)
+ 
+ .PHONY: install
+ install: all
+@@ -18,7 +18,10 @@ install: all
+        CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \
+                LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \
+                --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
+-                --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force
++                --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force \
++                $(DISTUTILS_INSTALL_ARGS)
++       rm -f $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
++       $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
+        set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
+                     "`readlink -f $(DESTDIR)/$(bindir)`" != \
+                     "`readlink -f $(LIBEXEC_BIN)`" ]; then \
+diff --git a/tools/python/Makefile b/tools/python/Makefile
+index cc76423647..5cb11ae453 100644
+--- a/tools/python/Makefile
++++ b/tools/python/Makefile
+@@ -12,7 +12,7 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
+            SHLIB_libxenctrl="$(SHLIB_libxenctrl)" \
+            SHLIB_libxenguest="$(SHLIB_libxenguest)" \
+            SHLIB_libxenstore="$(SHLIB_libxenstore)" \
+-           $(PYTHON) setup.py
++           $(PYTHON) setup.py $(DISTUTILS_BUILD_ARGS)
+ 
+ .PHONY: build
+ build:
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
new file mode 100644
index 00000000..7ac1a399
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
@@ -0,0 +1,43 @@
+Upstream-Status: Pending
+
+diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
+index 4963bc89c6..c1c05eb421 100644
+--- a/tools/pygrub/Makefile
++++ b/tools/pygrub/Makefile
+@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
+ all: build
+ .PHONY: build
+ build:
+-       $(setup.py) build
++       $(setup.py) build $(DISTUTILS_BUILD_ARGS)
+ 
+ .PHONY: install
+ install: all
+        $(INSTALL_DIR) $(DESTDIR)/$(bindir)
+        $(INSTALL_DIR) $(DESTDIR)/$(LIBEXEC_BIN)
+        $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
+-               --root="$(DESTDIR)" --force
++               --root="$(DESTDIR)" --force  $(DISTUTILS_INSTALL_ARGS)
+        $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
+        set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
+                     "`readlink -f $(DESTDIR)/$(bindir)`" != \
+diff --git a/tools/python/Makefile b/tools/python/Makefile
+index 437431c48e..0a99c2067e 100644
+--- a/tools/python/Makefile
++++ b/tools/python/Makefile
+@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
+ 
+ .PHONY: build
+ build:
+-       $(setup.py) build
++       $(setup.py) build $(DISTUTILS_BUILD_ARGS)
+ 
+ .PHONY: install
+ install:
+        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+        $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
+-               --root="$(DESTDIR)" --force
++               --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS)
+        $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
+        $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)
+ 
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/files/xen-flask-race-fix.patch b/meta-xilinx-virtualization/recipes-extended/xen/files/xen-flask-race-fix.patch
new file mode 100644
index 00000000..fa2a82ff
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/files/xen-flask-race-fix.patch
@@ -0,0 +1,54 @@
+From mboxrd@z Thu Jan  1 00:00:00 1970
+From: Anthony PERARD <anthony.perard@citrix.com>
+Subject: [XEN PATCH] build: fix building flask headers before descending in flask/ss/
+Date: Fri, 20 Jan 2023 13:36:26 +0000
+Message-ID: <20230120133626.55680-1-anthony.perard@citrix.com>
+X-Mailer: git-send-email 2.30.2
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain
+
+Unfortunatly, adding prerequisite to "$(obj)/ss/built_in.o" doesn't
+work because we have "$(obj)/%/built_in.o: $(obj)/% ;" in Rules.mk.
+So, make is allow to try to build objects in "xsm/flask/ss/" before
+generating the headers.
+
+Adding a prerequisite on "$(obj)/ss" instead will fix the issue has
+that the target used to run make in this subdirectory.
+
+Unfortunatly, that target is also used when running `make clean`, so
+we need to ignore it in this case. $(MAKECMDGOALS) can't be used in
+this case as it is empty, but we can guess which operation is done by
+looking at the list of loaded makefiles.
+
+Upstream-Status: backport [https://lore.kernel.org/xen-devel/20230120133626.55680-1-anthony.perard@citrix.com/T/#u]
+
+Fixes: 7a3bcd2babcc ("build: build everything from the root dir, use obj=$subdir")
+Reported-by: "Daniel P. Smith" <dpsmith@apertussolutions.com>
+Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
+---
+ xen/xsm/flask/Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile
+index d25312f4fa..2d24346ee3 100644
+--- a/xen/xsm/flask/Makefile
++++ b/xen/xsm/flask/Makefile
+@@ -16,7 +16,11 @@ FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h
+ AV_H_FILES := av_perm_to_string.h av_permissions.h
+ ALL_H_FILES := $(addprefix include/,$(FLASK_H_FILES) $(AV_H_FILES))
+ 
+-$(addprefix $(obj)/,$(obj-y)) $(obj)/ss/built_in.o: $(addprefix $(obj)/,$(ALL_H_FILES))
++# Adding prerequisite to descending into ss/ folder only when not running `make
++# clean`.
++ifeq ($(filter %/Makefile.clean,$(MAKEFILE_LIST)),)
++$(addprefix $(obj)/,$(obj-y)) $(obj)/ss: $(addprefix $(obj)/,$(ALL_H_FILES))
++endif
+ extra-y += $(ALL_H_FILES)
+ 
+ mkflask := $(srcdir)/policy/mkflask.sh
+-- 
+Anthony PERARD
+
+
+
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-arch.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-arch.inc
new file mode 100644
index 00000000..fb0093e3
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-arch.inc
@@ -0,0 +1,18 @@
+
+valid_xen_archs = " \
+        x86_64 x86_32 \
+        arm32 arm64 \
+        "
+
+def map_xen_arch(a, d):
+    import re
+    valid_archs = d.getVar('valid_xen_archs').split()
+
+    if   re.match("i.86", a):        return "x86_32"
+    elif re.match("x86.64", a):      return "x86_64"
+    elif re.match("arm.*", a):       return "arm32"
+    elif re.match("aarch64.*", a):   return "arm64"
+    elif a in valid_archs:           return a
+    else:
+        return "INVALID"
+
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-blktap.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-blktap.inc
new file mode 100644
index 00000000..ad9d5fdb
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-blktap.inc
@@ -0,0 +1,76 @@
+# The Xen block tap components are packaged separately here to support
+# the option to build them in a separate recipe from xen-tools.
+
+BLKTAP_PACKAGES ?= " \
+    ${PN}-blktap \
+    ${PN}-libblktap \
+    ${PN}-libblktapctl \
+    ${PN}-libblktapctl-dev \
+    ${PN}-libblktap-dev \
+    ${PN}-libvhd \
+    ${PN}-libvhd-dev \
+    ${PN}-blktap-staticdev \
+    "
+
+BLKTAP_PROVIDES ?= " \
+    virtual/blktap \
+    virtual/libblktap \
+    virtual/libblktapctl \
+    virtual/libvhd \
+    "
+
+BLKTAP_RRECOMMENDS ?= " \
+    virtual/blktap \
+    virtual/libblktap \
+    virtual/libblktapctl \
+    virtual/libvhd \
+    "
+
+RPROVIDES:${PN}-blktap = "virtual/blktap"
+RPROVIDES:${PN}-libblktap = "virtual/libblktap"
+RPROVIDES:${PN}-libblktapctl = "virtual/libblktapctl"
+RPROVIDES:${PN}-libvhd = "virtual/libvhd"
+
+FILES:${PN}-blktap-staticdev += "\
+    ${libdir}/libblktapctl.a \
+    ${libdir}/libvhd.a \
+    ${libdir}/libblktap.a \
+    "
+
+FILES:${PN}-libblktapctl = "${libdir}/libblktapctl.so.*"
+FILES:${PN}-libblktapctl-dev = " \
+    ${libdir}/libblktapctl.so \
+    ${libdir}/pkgconfig/xenblktapctl.pc \
+    ${datadir}/pkgconfig/xenblktapctl.pc \
+    "
+
+FILES:${PN}-libvhd = "${libdir}/libvhd.so.*"
+FILES:${PN}-libvhd-dev = " \
+    ${libdir}/libvhd.so \
+    ${libdir}/pkgconfig/vhd.pc \
+    ${datadir}/pkgconfig/vhd.pc \
+    "
+
+FILES:${PN}-libblktap = "${libdir}/libblktap.so.*"
+FILES:${PN}-libblktap-dev = " \
+    ${libdir}/libblktap.so \
+    ${libdir}/pkgconfig/blktap.pc \
+    ${datadir}/pkgconfig/blktap.pc \
+    "
+
+FILES:${PN}-blktap = "\
+    ${sbindir}/blktapctrl \
+    ${sbindir}/img2qcow \
+    ${sbindir}/lock-util \
+    ${sbindir}/qcow2raw \
+    ${sbindir}/qcow-create \
+    ${sbindir}/tap-ctl \
+    ${sbindir}/tapdisk \
+    ${sbindir}/tapdisk2 \
+    ${sbindir}/tapdisk-client \
+    ${sbindir}/tapdisk-diff \
+    ${sbindir}/tapdisk-stream \
+    ${sbindir}/td-util \
+    ${sbindir}/vhd-update \
+    ${sbindir}/vhd-util \
+    "
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-hypervisor.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-hypervisor.inc
new file mode 100644
index 00000000..6f3d24d0
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-hypervisor.inc
@@ -0,0 +1,117 @@
+SUMMARY = "Xen hypervisor"
+DESCRIPTION = "The Xen hypervisor"
+
+# This recipe is for just the Xen hypervisor.
+# Separate recipes are used to build Xen and its components:
+# this allows for varying the target architecture or toolchain used
+# to build the different components. eg. 32-bit tools and a 64-bit hypervisor.
+
+# The Xen hypervisor has a narrower compatible platform range than the Xen tools
+COMPATIBLE_HOST = '(x86_64.*).*-linux|aarch64.*-linux|arm-.*-linux-gnueabi'
+
+inherit deploy python3native cml1
+
+PACKAGES = " \
+    ${PN} \
+    ${PN}-dbg \
+    ${PN}-efi \
+    "
+
+FILES:${PN} = " \
+    /boot/xen-* \
+    /boot/xen \
+    /boot/xen-*.gz \
+    /boot/xen.gz \
+    /boot/xen-syms-* \
+    "
+
+FILES:${PN}-dbg += "${libdir}/debug/*"
+
+FILES:${PN}-efi = " \
+    /boot/xen.efi \
+    ${exec_prefix}/lib64/efi/xen* \
+    "
+
+do_configure() {
+    do_configure_common
+
+    # Handle the config fragments
+    cfgs="${@' '.join(find_cfgs(d))}"
+    if [ -n "${cfgs}" ]; then
+        # If .config is not present generate one in order
+        # to use the merge_config.sh
+        if [ ! -f "${S}/xen/.config" ] ; then
+            oe_runmake -C ${S}/xen defconfig
+        fi
+        ${S}/xen/tools/kconfig/merge_config.sh -m -O \
+            ${S}/xen ${S}/xen/.config "${cfgs}"
+    fi
+}
+
+# The hypervisor binary for arm must not be built with the hard floating point
+# ABI. Override CC and CPP when invoking make so that they do not contain
+# TUNE_CCARGS.
+EXTRA_OEMAKE:arm += "CC='${CCACHE}${HOST_PREFIX}gcc ${TOOLCHAIN_OPTIONS} \
+                         ${CC_REPRODUCIBLE_OPTIONS}' \
+                     CPP='${CCACHE}${HOST_PREFIX}gcc -E ${TOOLCHAIN_OPTIONS} \
+                         ${CC_REPRODUCIBLE_OPTIONS}'"
+
+do_compile() {
+    oe_runmake xen PYTHON="${PYTHON}" \
+                   EXTRA_CFLAGS_XEN_CORE="${EXTRA_CFLAGS_XEN_CORE}"
+}
+
+do_install() {
+    oe_runmake DESTDIR="${D}" install-xen
+}
+# The do_install also ships files in /boot and /usr/lib64
+SYSROOT_DIRS += "/boot ${exec_prefix}/lib64"
+
+do_deploy() {
+    install -d ${DEPLOYDIR}
+
+    if [ -f ${B}/xen/xen ]; then
+        install -m 0644 ${B}/xen/xen ${DEPLOYDIR}/xen-${MACHINE}
+    fi
+
+    if [ -f ${B}/xen/xen.gz ]; then
+        install -m 0644 ${B}/xen/xen.gz ${DEPLOYDIR}/xen-${MACHINE}.gz
+    fi
+
+    if [ -f ${B}/xen/xen.efi ]; then
+        install -m 0644 ${B}/xen/xen.efi ${DEPLOYDIR}/xen-${MACHINE}.efi
+    fi
+}
+# Scheduling the do_deploy task:
+# - deploy copies files from ${B} that are written during do_compile so must
+#   at least run afer that task has completed
+# - the hypervisor binaries may be included in the image filesystem, so we
+#   must ensure that the binaries deployed match what is staged in the sysroot:
+#   so do_deploy must run after do_populate_sysroot and after do_compile is
+#   also needed for when having rm_work and bitbake needs to re-run do_deploy,
+#   we ensure that the ${B} is re-generated, otherwise the deploy-xen will be
+#   empty
+# - add the task before do_build to ensure that deployment has completed when
+#   the recipe build done stamp is written
+addtask deploy after do_compile do_populate_sysroot before do_build
+# To ensure that a deployed hypervisor has matching tools, add a dependency to
+# make sure that the tools have built and been staged:
+do_deploy[depends] += "xen-tools:do_populate_sysroot"
+# Also ensure anything that the tools recipe needs to deploy, such as a
+# XSM policy file, has been deployed first:
+do_deploy[depends] += "xen-tools:do_deploy"
+
+# Enable use of menuconfig directly from bitbake and also within the devshell
+do_devshell[depends] += "ncurses-native:do_populate_sysroot"
+
+# Pass the native library path for kconfig build when running the do_menuconfig
+# task
+CROSS_CURSES_LIB += "-L${STAGING_LIBDIR_NATIVE}"
+
+# Specify the root dir of the .config file for do_menuconfig and do_diffconfig
+# tasks
+KCONFIG_CONFIG_ROOTDIR = "${S}/xen"
+
+# Xen is setting all CC flags on its own. Make sure that they are not modified
+# for aarch64, e.g. with architecture-specific optimizations.
+TUNE_CCARGS:aarch64=""
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools-xilinx.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools-xilinx.inc
new file mode 100644
index 00000000..e7bc8d7e
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools-xilinx.inc
@@ -0,0 +1,25 @@
+# Only include the sysvinit scripts if sysvinit is enabled.
+do_install:append () {
+    if [ -e ${D}/usr/lib/xen/bin/pygrub ]; then
+        sed -i -e '1c#!/usr/bin/env python3' ${D}/usr/lib/xen/bin/pygrub
+    fi
+
+    if [ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit', '', d)}" != 'sysvinit' ]; then
+        rm -f ${D}/etc/init.d/xendomains
+        rm -f ${D}/etc/init.d/xencommons
+        rm -f ${D}/etc/init.d/xendriverdomain
+        rm -f ${D}/etc/init.d/xen-watchdog
+    fi
+}
+
+# If we're in a hybrid configuration, we want to stop the system from
+# running any Xen sysvinit scripts
+# This has a side effect of, on a hybrid system, if the init manager is
+# sysvinit, the user will need to manually enable Xen.
+INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '1', '', d)}"
+
+FILES:${PN} += " \
+    ${libdir}/xen/bin/init-dom0less \
+    ${libdir}/xen/bin/get_overlay \
+    ${libdir}/xen/bin/get_overlay.sh \
+    "
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools.inc
new file mode 100644
index 00000000..f770eec2
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools.inc
@@ -0,0 +1,861 @@
+SUMMARY = "Xen hypervisor tools"
+DESCRIPTION = "Tools and utility software for the Xen hypervisor"
+
+COMPATIBLE_HOST = 'i686-.*-linux|(x86_64.*).*-linux|aarch64.*-linux|arm-.*-linux-gnueabi'
+
+inherit setuptools3 update-rc.d systemd deploy
+require xen-blktap.inc
+
+RDEPENDS:${PN} = "\
+    bash perl xz \
+    ${PN}-console \
+    ${PN}-libxenguest \
+    ${PN}-libxenlight \
+    ${PN}-libxenvchan \
+    ${PN}-libxenctrl \
+    ${PN}-libxlutil \
+    ${PN}-libxenstat \
+    ${PN}-libxenstore \
+    ${PN}-libfsimage \
+    ${PN}-fsimage \
+    ${PN}-scripts-block \
+    ${PN}-scripts-network \
+    ${PN}-xen-watchdog \
+    ${PN}-xencommons \
+    ${PN}-xendomains \
+    ${PN}-xenstore \
+    virtual/xenstored \
+    ${PN}-xl \
+    "
+
+RDEPENDS:${PN}-dev = ""
+
+RRECOMMENDS:${PN} = " \
+    qemu \
+    ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', 'seabios ipxe vgabios', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'externalblktap', '', '${BLKTAP_RRECOMMENDS}', d)} \
+    ${PN}-flask \
+    ${PN}-hvmloader \
+    ${PN}-libxenhypfs \
+    ${PN}-shim \
+    ${PN}-ucode \
+    ${PN}-vchan \
+    ${PN}-xenpaging \
+    ${PN}-xenhypfs \
+    "
+
+RDEPENDS:${PN}-devd = " \
+    ${PN}-xl \
+    "
+
+RDEPENDS:${PN}-fsimage = " \
+    libext2fs \
+    "
+
+RDEPENDS:${PN}-misc = " \
+    perl \
+    python3 \
+    ${PN}-xencov \
+    "
+
+RSUGGESTS:${PN}-misc = " \
+    ${PN}-xencons \
+    ${PN}-xenpvnetboot \
+    "
+
+RDEPENDS:${PN}-python = " \
+    python3 \
+    "
+
+RDEPENDS:${PN}-pygrub = " \
+    python3 \
+    ${PN}-python \
+    "
+
+RDEPENDS:${PN}-remus = "bash"
+
+RDEPENDS:${PN}-scripts-block = "\
+    bash \
+    ${PN}-scripts-common \
+    ${PN}-volatiles \
+    "
+
+RDEPENDS:${PN}-scripts-common = "bash"
+
+RDEPENDS:${PN}-scripts-network = "\
+    bash \
+    bridge-utils \
+    ${PN}-scripts-common \
+    ${PN}-volatiles \
+    "
+
+RRECOMMENDS:${PN}-scripts-network = "\
+    ifupdown \
+    "
+
+RSUGGESTS:${PN}-xencov = "${PN}-xencov-split"
+
+RDEPENDS:${PN}-xencommons = "\
+    bash \
+    util-linux-prlimit \
+    ${PN}-console \
+    ${PN}-xenstore \
+    virtual/xenstored \
+    ${PN}-xl \
+    ${PN}-scripts-common \
+    "
+
+RDEPENDS:${PN}-xendomains = "\
+    bash \
+    ${PN}-console \
+    ${PN}-scripts-block \
+    ${PN}-scripts-common \
+    virtual/xenstored \
+    "
+
+RDEPENDS:${PN}-xenhypfs = " \
+    ${PN}-libxenhypfs \
+    "
+
+RDEPENDS:${PN}-xl = "libgcc"
+
+RDEPENDS:${PN}-xenmon = " \
+    python3 \
+    "
+
+RSUGGESTS:${PN}-xentrace = "${PN}-xentrace-format"
+
+RDEPENDS:${PN}-xen-watchdog = "bash"
+
+PACKAGES = " \
+    ${PN} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'externalblktap', '', '${BLKTAP_PACKAGES}', d)} \
+    ${PN}-console \
+    ${PN}-cpuid \
+    ${PN}-dbg \
+    ${PN}-dev \
+    ${PN}-devd \
+    ${PN}-doc \
+    ${PN}-flask \
+    ${PN}-flask-tools \
+    ${PN}-fsimage \
+    ${PN}-gdbsx \
+    ${PN}-hvmloader \
+    ${PN}-init-xenstore-dom \
+    ${PN}-kdd \
+    ${PN}-libfsimage \
+    ${PN}-libfsimage-dev \
+    ${PN}-libxencall \
+    ${PN}-libxencall-dev \
+    ${PN}-libxenctrl \
+    ${PN}-libxenctrl-dev \
+    ${PN}-libxendevicemodel \
+    ${PN}-libxendevicemodel-dev \
+    ${PN}-libxenevtchn \
+    ${PN}-libxenevtchn-dev \
+    ${PN}-libxenforeignmemory \
+    ${PN}-libxenforeignmemory-dev \
+    ${PN}-libxengnttab \
+    ${PN}-libxengnttab-dev \
+    ${PN}-libxenguest \
+    ${PN}-libxenguest-dev \
+    ${PN}-libxenhypfs \
+    ${PN}-libxenhypfs-dev \
+    ${PN}-libxenlight \
+    ${PN}-libxenlight-dev \
+    ${PN}-libxenstat \
+    ${PN}-libxenstat-dev \
+    ${PN}-libxenstore \
+    ${PN}-libxenstore-dev \
+    ${PN}-libxentoolcore \
+    ${PN}-libxentoolcore-dev \
+    ${PN}-libxentoollog \
+    ${PN}-libxentoollog-dev \
+    ${PN}-libxenvchan \
+    ${PN}-libxenvchan-dev \
+    ${PN}-libxlutil \
+    ${PN}-libxlutil-dev \
+    ${PN}-livepatch \
+    ${PN}-misc \
+    ${PN}-pygrub \
+    ${PN}-python \
+    ${PN}-remus \
+    ${PN}-scripts-block \
+    ${PN}-scripts-common \
+    ${PN}-scripts-network \
+    ${PN}-shim \
+    ${PN}-staticdev \
+    ${PN}-ucode \
+    ${PN}-vchan \
+    ${PN}-volatiles \
+    ${PN}-xcutils \
+    ${PN}-xencommons \
+    ${PN}-xencov \
+    ${PN}-xend \
+    ${PN}-xend-examples \
+    ${PN}-xendomains \
+    ${PN}-xenhypfs \
+    ${PN}-xenmon \
+    ${PN}-xenpaging \
+    ${PN}-xenpmd \
+    ${PN}-xenstat \
+    ${PN}-xenstore \
+    ${PN}-xenstored \
+    ${PN}-xentrace \
+    ${PN}-xen-watchdog \
+    ${PN}-xl \
+    ${PN}-xl-examples \
+    ${PN}-xm \
+    ${PN}-xm-examples \
+    ${PN}-xen-access \
+    ${PN}-xen-memshare \
+    ${PN}-test \
+    ${PN}-xen-vmtrace \
+    ${PN}-xen-mceinj \
+    "
+
+PROVIDES =+ " \
+    virtual/xenstored \
+    ${@bb.utils.contains('PACKAGECONFIG', 'externalblktap', '', '${BLKTAP_PROVIDES}', d)} \
+    "
+
+# There are multiple implementations of the XenStore daemon, so we use a
+# virtual package to allow for substitution.
+RPROVIDES:${PN}-xenstored = "virtual/xenstored"
+
+FILES:${PN}-dbg += "\
+    ${libdir}/xen/bin/.debug \
+    ${nonarch_libdir}/${PYTHON_DIR}/site-packages/.debug \
+    ${nonarch_libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \
+    ${libdir}/fs/xfs/.debug \
+    ${libdir}/fs/ufs/.debug \
+    ${libdir}/fs/ext2fs-lib/.debug \
+    ${libdir}/fs/fat/.debug \
+    ${libdir}/fs/zfs/.debug \
+    ${libdir}/fs/reiserfs/.debug \
+    ${libdir}/fs/iso9660/.debug \
+    ${libdir}/fs/**/.debug \
+    ${sbindir}/.debug \
+    ${libdir}exec/.debug \
+    ${libdir}/xen/libexec/.debug \
+    ${bindir}/.debug \
+    ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/.debug \
+    ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \
+    "
+
+FILES:${PN}-dev = "\
+    ${includedir} \
+    "
+
+FILES:${PN}-doc = "\
+    ${sysconfdir}/xen/README \
+    ${sysconfdir}/xen/README.incompatibilities \
+    ${datadir}/doc \
+    ${datadir}/man \
+    "
+
+FILES:${PN}-staticdev += "\
+    ${libdir}/libxenguest.a \
+    ${libdir}/libxenlight.a \
+    ${libdir}/libxenvchan.a \
+    ${libdir}/libxenctrl.a \
+    ${libdir}/libxlutil.a \
+    ${libdir}/libxenstat.a \
+    ${libdir}/libxenstore.a \
+    "
+
+FILES:${PN}-libxencall = "${libdir}/libxencall.so.*"
+FILES:${PN}-libxencall-dev = " \
+    ${libdir}/libxencall.so \
+    ${libdir}/pkgconfig/xencall.pc \
+    ${datadir}/pkgconfig/xencall.pc \
+    "
+
+FILES:${PN}-libxenctrl = "${libdir}/libxenctrl.so.*"
+FILES:${PN}-libxenctrl-dev = " \
+    ${libdir}/libxenctrl.so \
+    ${libdir}/pkgconfig/xencontrol.pc \
+    ${datadir}/pkgconfig/xencontrol.pc \
+    "
+
+FILES:${PN}-libxendevicemodel = "${libdir}/libxendevicemodel.so.*"
+FILES:${PN}-libxendevicemodel-dev = " \
+    ${libdir}/libxendevicemodel.so \
+    ${libdir}/pkgconfig/xendevicemodel.pc \
+    ${datadir}/pkgconfig/xendevicemodel.pc \
+    "
+
+FILES:${PN}-libxenevtchn = "${libdir}/libxenevtchn.so.*"
+FILES:${PN}-libxenevtchn-dev = " \
+    ${libdir}/libxenevtchn.so \
+    ${libdir}/pkgconfig/xenevtchn.pc \
+    ${datadir}/pkgconfig/xenevtchn.pc \
+    "
+
+FILES:${PN}-libxenforeignmemory = "${libdir}/libxenforeignmemory.so.*"
+FILES:${PN}-libxenforeignmemory-dev = " \
+    ${libdir}/libxenforeignmemory.so \
+    ${libdir}/pkgconfig/xenforeignmemory.pc \
+    ${datadir}/pkgconfig/xenforeignmemory.pc \
+    "
+
+FILES:${PN}-libxengnttab = "${libdir}/libxengnttab.so.*"
+FILES:${PN}-libxengnttab-dev = " \
+    ${libdir}/libxengnttab.so \
+    ${libdir}/pkgconfig/xengnttab.pc \
+    ${datadir}/pkgconfig/xengnttab.pc \
+    "
+
+FILES:${PN}-libxenguest = "${libdir}/libxenguest.so.*"
+FILES:${PN}-libxenguest-dev = " \
+    ${libdir}/libxenguest.so \
+    ${libdir}/pkgconfig/xenguest.pc \
+    ${datadir}/pkgconfig/xenguest.pc \
+    "
+
+FILES:${PN}-libxenhypfs = "${libdir}/libxenhypfs.so.*"
+FILES:${PN}-libxenhypfs-dev = " \
+    ${libdir}/libxenhypfs.so \
+    ${libdir}/pkgconfig/xenhypfs.pc \
+    "
+
+FILES:${PN}-libxenlight = "${libdir}/libxenlight.so.*"
+FILES:${PN}-libxenlight-dev = " \
+    ${libdir}/libxenlight.so \
+    ${libdir}/pkgconfig/xenlight.pc \
+    ${datadir}/pkgconfig/xenlight.pc \
+    "
+
+FILES:${PN}-libxenstat = "${libdir}/libxenstat.so.*"
+FILES:${PN}-libxenstat-dev = " \
+    ${libdir}/libxenstat.so \
+    ${libdir}/pkgconfig/xenstat.pc \
+    ${datadir}/pkgconfig/xenstat.pc \
+    "
+
+FILES:${PN}-libxenstore = "${libdir}/libxenstore.so.*"
+FILES:${PN}-libxenstore-dev = " \
+    ${libdir}/libxenstore.so \
+    ${libdir}/pkgconfig/xenstore.pc \
+    ${datadir}/pkgconfig/xenstore.pc \
+    "
+
+FILES:${PN}-libxentoolcore = "${libdir}/libxentoolcore.so.*"
+FILES:${PN}-libxentoolcore-dev = " \
+    ${libdir}/libxentoolcore.so \
+    ${libdir}/pkgconfig/xentoolcore.pc \
+    ${datadir}/pkgconfig/xentoolcore.pc \
+    "
+
+FILES:${PN}-libxentoollog = "${libdir}/libxentoollog.so.*"
+FILES:${PN}-libxentoollog-dev = " \
+    ${libdir}/libxentoollog.so \
+    ${libdir}/pkgconfig/xentoollog.pc \
+    ${datadir}/pkgconfig/xentoollog.pc \
+    "
+
+FILES:${PN}-libxenvchan = "${libdir}/libxenvchan.so.*"
+FILES:${PN}-libxenvchan-dev = " \
+    ${libdir}/libxenvchan.so \
+    ${libdir}/pkgconfig/xenvchan.pc \
+    ${datadir}/pkgconfig/xenvchan.pc \
+    "
+
+FILES:${PN}-libxlutil = "${libdir}/libxlutil.so.*"
+FILES:${PN}-libxlutil-dev = " \
+    ${libdir}/libxlutil.so \
+    ${libdir}/pkgconfig/xlutil.pc \
+    ${datadir}/pkgconfig/xlutil.pc \
+    "
+FILES:${PN}-libvhd = "${libdir}/libvhd.so.*"
+FILES:${PN}-libvhd-dev = " \
+    ${libdir}/libvhd.so \
+    ${libdir}/pkgconfig/vhd.pc \
+    ${datadir}/pkgconfig/vhd.pc \
+    "
+
+FILES:${PN}-libfsimage = " \
+    ${libdir}/libfsimage.so.* \
+    ${libdir}/libxenfsimage.so.* \
+    "
+
+FILES:${PN}-libfsimage-dev = " \
+    ${libdir}/libfsimage.so \
+    ${libdir}/libxenfsimage.so \
+    ${libdir}/pkgconfig/fsimage.pc \
+    ${datadir}/pkgconfig/fsimage.pc \
+    ${libdir}/pkgconfig/xenfsimage.pc \
+    ${datadir}/pkgconfig/xenfsimage.pc \
+    "
+
+FILES:${PN}-fsimage = " \
+    ${libdir}/fs/**/[a-z]*fsimage.so \
+    ${libdir}/xenfsimage/**/fsimage.so \
+    "
+
+FILES:${PN}-init-xenstore-dom = "${libdir}/xen/bin/init-xenstore-domain"
+
+FILES:${PN} = "\
+    ${sysconfdir}/xen/auto \
+    ${sysconfdir}/xen/cpupool \
+    ${localstatedir}/xen/dump \
+    "
+
+FILES:${PN}-console = "\
+    ${libdir}/xen/bin/xenconsole \
+    ${sbindir}/xenconsoled \
+    "
+
+FILES:${PN}-cpuid = "\
+    ${bindir}/xen-cpuid \
+    "
+
+FILES:${PN}-devd = "\
+    ${sysconfdir}/init.d/xendriverdomain \
+    ${systemd_unitdir}/system/xendriverdomain.service \
+    "
+
+FILES:${PN}-flask = "\
+    /boot/xenpolicy-* \
+    "
+
+FILES:${PN}-flask-tools = "\
+    ${sbindir}/flask-get-bool \
+    ${sbindir}/flask-getenforce \
+    ${sbindir}/flask-label-pci \
+    ${sbindir}/flask-loadpolicy \
+    ${sbindir}/flask-set-bool \
+    ${sbindir}/flask-setenforce \
+    "
+
+FILES:${PN}-gdbsx = "\
+    ${sbindir}/gdbsx \
+    "
+
+INSANE_SKIP:${PN}-hvmloader = "arch"
+FILES:${PN}-hvmloader = "\
+    ${libdir}/xen/boot/hvmloader \
+    "
+
+FILES:${PN}-kdd = "\
+    ${sbindir}/kdd \
+    ${sbindir}/xen-kdd \
+    "
+
+FILES:${PN}-livepatch += " \
+    ${sbindir}/xen-livepatch \
+    "
+
+FILES:${PN}-misc = "\
+    ${bindir}/xen-detect \
+    ${libdir}/xen/bin/depriv-fd-checker \
+    ${sbindir}/gtracestat \
+    ${sbindir}/gtraceview \
+    ${sbindir}/xen-bugtool \
+    ${sbindir}/xenperf \
+    ${sbindir}/xenpm \
+    ${sbindir}/xsview \
+    ${sbindir}/xen-diag \
+    ${sbindir}/xen-tmem-list-parse \
+    ${sbindir}/xen-python-path \
+    ${sbindir}/xen-ringwatch \
+    ${sbindir}/xen-hptool \
+    ${sbindir}/xen-hvmcrash \
+    ${sbindir}/xen-hvmctx \
+    ${sbindir}/xenlockprof \
+    ${sbindir}/xen-lowmemd \
+    ${sbindir}/xen-mfndump \
+    ${libdir}/xen/bin/verify-stream-v2 \
+    ${libdir}/xen/bin/convert-legacy-stream \
+    "
+
+FILES:${PN}-pygrub = "\
+    ${bindir}/pygrub \
+    ${libdir}/xen/bin/pygrub \
+    "
+
+# Depending on the version of Xen libdir or nonarch libdir is used
+FILES:${PN}-python = "\
+    ${libdir}/${PYTHON_DIR} \
+    ${nonarch_libdir}/${PYTHON_DIR} \
+    "
+
+FILES:${PN}-remus = "\
+    ${sysconfdir}/xen/scripts/remus-netbuf-setup \
+    "
+
+FILES:${PN}-scripts-network = " \
+    ${sysconfdir}/xen/scripts/colo-proxy-setup \
+    ${sysconfdir}/xen/scripts/network-bridge \
+    ${sysconfdir}/xen/scripts/network-nat \
+    ${sysconfdir}/xen/scripts/network-route \
+    ${sysconfdir}/xen/scripts/qemu-ifup \
+    ${sysconfdir}/xen/scripts/vif2 \
+    ${sysconfdir}/xen/scripts/vif-bridge \
+    ${sysconfdir}/xen/scripts/vif-common.sh \
+    ${sysconfdir}/xen/scripts/vif-nat \
+    ${sysconfdir}/xen/scripts/vif-openvswitch \
+    ${sysconfdir}/xen/scripts/vif-route \
+    ${sysconfdir}/xen/scripts/vif-setup \
+    "
+
+FILES:${PN}-scripts-block = " \
+    ${sysconfdir}/xen/scripts/blktap \
+    ${sysconfdir}/xen/scripts/block \
+    ${sysconfdir}/xen/scripts/block-common.sh \
+    ${sysconfdir}/xen/scripts/block-dummy \
+    ${sysconfdir}/xen/scripts/block-enbd \
+    ${sysconfdir}/xen/scripts/block-iscsi \
+    ${sysconfdir}/xen/scripts/block-nbd \
+    ${sysconfdir}/xen/scripts/block-drbd-probe \
+    ${sysconfdir}/xen/scripts/block-tap \
+    ${sysconfdir}/xen/scripts/vscsi \
+    "
+
+FILES:${PN}-scripts-common = " \
+    ${sysconfdir}/xen/scripts/external-device-migrate \
+    ${sysconfdir}/xen/scripts/hotplugpath.sh \
+    ${sysconfdir}/xen/scripts/locking.sh \
+    ${sysconfdir}/xen/scripts/logging.sh \
+    ${sysconfdir}/xen/scripts/xen-hotplug-cleanup \
+    ${sysconfdir}/xen/scripts/xen-hotplug-common.sh \
+    ${sysconfdir}/xen/scripts/xen-network-common.sh \
+    ${sysconfdir}/xen/scripts/xen-script-common.sh \
+    "
+
+INSANE_SKIP:${PN}-shim = "arch"
+FILES:${PN}-shim = " \
+    ${libdir}/xen/boot/xen-shim \
+    "
+
+FILES:${PN}-ucode = "\
+    ${sbindir}/xen-ucode \
+    "
+
+FILES:${PN}-vchan = "\
+    ${bindir}/vchan-socket-proxy \
+    "
+
+FILES:${PN}-volatiles = "\
+    ${sysconfdir}/default/volatiles/99_xen \
+    ${sysconfdir}/tmpfiles.d/xen.conf \
+    "
+
+FILES:${PN}-xcutils = "\
+    ${libdir}/xen/bin/lsevtchn \
+    ${libdir}/xen/bin/readnotes \
+    ${libdir}/xen/bin/xc_restore \
+    ${libdir}/xen/bin/xc_save \
+    "
+
+FILES:${PN}-xencov = "\
+    ${sbindir}/xencov \
+    "
+
+FILES:${PN}-xend-examples = "\
+    ${sysconfdir}/xen/xend-config.sxp \
+    ${sysconfdir}/xen/xend-pci-permissive.sxp \
+    ${sysconfdir}/xen/xend-pci-quirks.sxp \
+    "
+
+FILES:${PN}-xenhypfs = "\
+    ${sbindir}/xenhypfs \
+    "
+
+FILES:${PN}-xenpaging = "\
+    ${libdir}/xen/bin/xenpaging \
+    ${localstatedir}/lib/xen/xenpaging \
+    "
+
+FILES:${PN}-xenpmd = "\
+    ${sbindir}/xenpmd \
+    "
+
+FILES:${PN}-xenstat = "\
+    ${sbindir}/xentop \
+    "
+
+FILES:${PN}-xenstore = "\
+    ${bindir}/xenstore \
+    ${bindir}/xenstore-chmod \
+    ${bindir}/xenstore-control \
+    ${bindir}/xenstore-exists \
+    ${bindir}/xenstore-list \
+    ${bindir}/xenstore-ls \
+    ${bindir}/xenstore-read \
+    ${bindir}/xenstore-rm \
+    ${bindir}/xenstore-watch \
+    ${bindir}/xenstore-write \
+    "
+
+FILES:${PN}-xenstored = "\
+    ${sbindir}/xenstored \
+    ${localstatedir}/lib/xenstored \
+    "
+
+FILES:${PN}-xentrace = "\
+    ${bindir}/xentrace \
+    ${bindir}/xentrace_setsize \
+    ${libdir}/xen/bin/xenctx \
+    ${bindir}/xenalyze \
+    ${sbindir}/xentrace \
+    ${sbindir}/xentrace_setsize \
+    ${sbindir}/xentrace_setmask \
+    "
+
+FILES:${PN}-xen-watchdog = "\
+    ${sbindir}/xenwatchdogd \
+    ${sysconfdir}/init.d/xen-watchdog \
+    ${systemd_unitdir}/system/xen-watchdog.service \
+    "
+
+FILES:${PN}-xl = "\
+    ${sysconfdir}/bash_completion.d/xl.sh \
+    ${sysconfdir}/bash_completion.d/xl \
+    ${sysconfdir}/xen/xl.conf \
+    ${libdir}/xen/bin/libxl-save-helper \
+    ${sbindir}/xl \
+    ${libdir}/xen/bin/xen-init-dom0 \
+    ${libdir}/xen/bin/init-dom0less \
+    "
+
+FILES:${PN}-xl-examples = "\
+    ${sysconfdir}/xen/xlexample.hvm \
+    ${sysconfdir}/xen/xlexample.pvlinux \
+    ${sysconfdir}/xen/xlexample.pvhlinux \
+    "
+
+FILES:${PN}-xm-examples = "\
+    ${sysconfdir}/xen/xmexample1 \
+    ${sysconfdir}/xen/xmexample2 \
+    ${sysconfdir}/xen/xmexample3 \
+    ${sysconfdir}/xen/xmexample.hvm \
+    ${sysconfdir}/xen/xmexample.hvm-stubdom \
+    ${sysconfdir}/xen/xmexample.nbd \
+    ${sysconfdir}/xen/xmexample.pv-grub \
+    ${sysconfdir}/xen/xmexample.vti \
+    "
+
+FILES:${PN}-xenmon = "\
+    ${sbindir}/xenbaked \
+    ${sbindir}/xenmon.py \
+    ${sbindir}/xenmon \
+    "
+
+FILES:${PN}-xm = "\
+    ${sysconfdir}/xen/xm-config.xml \
+    ${datadir}/xen/create.dtd \
+    ${sbindir}/xm \
+    "
+
+FILES:${PN}-xencommons += "\
+    ${nonarch_libdir}/modules-load.d/xen.conf \
+    ${sysconfdir}/default/xencommons \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '${sysconfdir}/init.d/xencommons', d)} \
+    ${sysconfdir}/xen/scripts/launch-xenstore \
+    ${systemd_unitdir}/system/proc-xen.mount \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xenconsoled.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xen-init-dom0.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xenstored.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/var-lib-xenstored.mount', '', d)} \
+    ${localstatedir} \
+    "
+
+FILES:${PN}-xend += " \
+    ${sysconfdir}/init.d/xend \
+    ${sbindir}/xend \
+    "
+
+FILES:${PN}-xendomains += "\
+    ${libdir}/xen/bin/xendomains \
+    ${sysconfdir}/default/xendomains \
+    ${sysconfdir}/init.d/xendomains \
+    ${sysconfdir}/sysconfig/xendomains \
+    ${systemd_unitdir}/system/xendomains.service \
+    "
+FILES:${PN}-xen-access += "\
+    ${sbindir}/xen-access \
+    "
+
+FILES:${PN}-xen-memshare += "\
+    ${sbindir}/xen-memshare \
+    "
+
+# memshare is only built for x86, so allow empty package for other archs
+ALLOW_EMPTY:${PN}-xen-memshare = "1"
+
+FILES:${PN}-test += "\
+    ${libdir}/xen/bin/test-xenstore \
+    ${libdir}/xen/bin/test-resource \
+    ${libdir}/xen/bin/test-cpu-policy \
+    ${libdir}/xen/bin/test-tsx \
+    ${libdir}/xen/bin/test-paging-mempool \
+    "
+
+# test-xenstore and test-resource currently only exist in 4.16
+# test-cpu-policy and test-tsx only exist in 4.16 for x86
+ALLOW_EMPTY:${PN}-test = "1"
+
+FILES:${PN}-xen-mceinj +="\
+    ${sbindir}/xen-mceinj \
+    "
+
+# xen-mceinj is only built for x86 4.16, so allow empty package
+ALLOW_EMPTY:${PN}-xen-mceinj = "1"
+
+FILES:${PN}-xen-vmtrace +="\
+    ${sbindir}/xen-vmtrace \
+    "
+
+# xen-vmtrace is only built for x86 4.16, so allow empty package
+ALLOW_EMPTY:${PN}-xen-vmtrace = "1"
+
+INSANE_SKIP:${PN} = "already-stripped"
+
+# configure init.d scripts
+INITSCRIPT_PACKAGES = "${PN}-xend ${PN}-xen-watchdog ${PN}-xendomains ${PN}-devd"
+INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '${PN}-xencommons', d)}"
+INITSCRIPT_NAME:${PN}-xencommons = "xencommons"
+INITSCRIPT_PARAMS:${PN}-xencommons = "defaults 80"
+INITSCRIPT_NAME:${PN}-xen-watchdog = "xen-watchdog"
+INITSCRIPT_PARAMS:${PN}-xen-watchdog = "defaults 81"
+INITSCRIPT_NAME:${PN}-xend = "xend"
+INITSCRIPT_PARAMS:${PN}-xend = "defaults 82"
+INITSCRIPT_NAME:${PN}-xendomains = "xendomains"
+INITSCRIPT_PARAMS:${PN}-xendomains = "defaults 83"
+INITSCRIPT_NAME:${PN}-devd = "xendriverdomain"
+INITSCRIPT_PARAMS:${PN}-devd = "defaults 82"
+
+# systemd packages
+SYSTEMD_PACKAGES = "${PN}-xen-watchdog ${PN}-xencommons ${PN}-xendomains ${PN}-devd"
+SYSTEMD_SERVICE:${PN}-devd = "xendriverdomain.service"
+SYSTEMD_SERVICE:${PN}-xen-watchdog = "xen-watchdog.service"
+SYSTEMD_SERVICE:${PN}-xencommons = " \
+    proc-xen.mount \
+    xen-qemu-dom0-disk-backend.service \
+    xenconsoled.service \
+    xen-init-dom0.service \
+    xenstored.service \
+    "
+SYSTEMD_SERVICE:${PN}-xendomains = "xendomains.service"
+
+QEMU_ARCH = "i386"
+QEMU_ARCH:aarch64 = "aarch64"
+
+EXTRA_OECONF += " \
+    --with-systemd=${systemd_unitdir}/system \
+    --with-initddir=${INIT_D_DIR} \
+    --with-sysconfig-leaf-dir=default \
+    --with-system-qemu=${bindir}/qemu-system-${QEMU_ARCH} \
+    "
+
+do_configure() {
+    do_configure_common
+}
+
+do_compile() {
+    cd ${S}
+    oe_runmake tools PYTHON="${PYTHON}" \
+                     EXTRA_CFLAGS_XEN_TOOLS="${EXTRA_CFLAGS_XEN_TOOLS}"
+}
+
+do_install() {
+    cd ${S}
+    oe_runmake DESTDIR="${D}" install-tools
+
+    # Remove unported python 2 scripts -- see the separate xen-python2 recipe
+    rm -f ${D}${bindir}/xentrace_format \
+          ${D}${bindir}/xencons \
+          ${D}${bindir}/xencov_split \
+          ${D}${libdir}/xen/bin/xenpvnetboot
+
+    # remove installed volatiles
+    rm -rf ${D}${base_prefix}/run \
+        ${D}${localstatedir}/run \
+        ${D}${localstatedir}/lock \
+        ${D}${localstatedir}/log \
+        ${D}${localstatedir}/volatile \
+        ${D}${localstatedir}/lib/xen
+
+    VOLATILE_DIRS=" \
+        ${base_prefix}/run/xenstored \
+        ${base_prefix}/run/xend \
+        ${base_prefix}/run/xend/boot \
+        ${base_prefix}/run/xen \
+        ${localstatedir}/log/xen \
+        ${localstatedir}/lock/xen \
+        ${localstatedir}/lock/subsys \
+        ${localstatedir}/lib/xen \
+        "
+
+    # install volatiles using populate_volatiles mechanism
+    install -d ${D}${sysconfdir}/default/volatiles
+    for i in $VOLATILE_DIRS; do
+        echo "d root root 0755 $i none"  >> ${D}${sysconfdir}/default/volatiles/99_xen
+    done
+
+    # workaround for xendomains script which searchs sysconfig if directory exists
+    install -d ${D}${sysconfdir}/sysconfig
+    ln -sf ${sysconfdir}/default/xendomains ${D}${sysconfdir}/sysconfig/xendomains
+
+    # systemd
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        # install volatiles using systemd tmpfiles.d
+        install -d ${D}${sysconfdir}/tmpfiles.d
+        for i in $VOLATILE_DIRS; do
+            echo "d $i 0755 root root - -"  >> ${D}${sysconfdir}/tmpfiles.d/xen.conf
+        done
+    fi
+
+    if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service ]; then
+        sed -i 's#ExecStart=.*qemu-system-i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
+            ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
+    fi
+
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        rm -f ${D}/${sysconfdir}/init.d/xencommons
+    else
+        # fixup default path to qemu-system-i386
+        sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#' ${D}/etc/init.d/xencommons
+
+        # remove the uncondiontally installed systemd service files
+        rm -f ${D}/${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
+        rm -f ${D}/${systemd_unitdir}/system/xenconsoled.service
+        rm -f ${D}/${systemd_unitdir}/system/xen-init-dom0.service
+        rm -f ${D}/${systemd_unitdir}/system/xenstored.service
+        rm -f ${D}/${systemd_unitdir}/system/var-lib-xenstored.mount
+    fi
+}
+
+pkg_postinst:${PN}-volatiles() {
+    if [ -z "$D" ]; then
+        if command -v systemd-tmpfiles >/dev/null; then
+            systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/xen.conf
+        elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
+            ${sysconfdir}/init.d/populate-volatile.sh update
+        fi
+    fi
+}
+
+do_deploy() {
+    XEN_FULLVERSION=$(oe_runmake -C ${S}/xen xenversion --no-print-directory)
+    FLASK_POLICY_FILE="xenpolicy-${XEN_FULLVERSION}"
+
+    install -d ${DEPLOYDIR}
+
+    # Install the flask policy in the deploy directory if it exists
+    if [ -f ${D}/boot/${FLASK_POLICY_FILE} ]; then
+        install -m 0644 ${D}/boot/${FLASK_POLICY_FILE} ${DEPLOYDIR}
+        ln -sf ${FLASK_POLICY_FILE} ${DEPLOYDIR}/xenpolicy-${MACHINE}
+    fi
+}
+# Scheduling the do_deploy task:
+# - deploy copies files from ${D} that are written during do_install so must run
+#   after that task
+# - the tools binaries are included in the image filesystem, so we must ensure
+#   that the binaries deployed match what is staged in the sysroot:
+#   so do_deploy must run after do_populate_sysroot
+# - add the task before do_build to ensure that deployment has completed when
+#   the recipe build done stamp is written
+addtask deploy after do_install do_populate_sysroot before do_build
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bb
new file mode 100644
index 00000000..acc9184b
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bb
@@ -0,0 +1,18 @@
+# xen 4.17.0 release sha
+SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
+
+XEN_URI ?= "git://xenbits.xen.org/xen.git"
+XEN_REL ?= "4.17"
+XEN_BRANCH ?= "stable-${XEN_REL}"
+
+SRC_URI = " \
+    ${XEN_URI};branch=${XEN_BRANCH} \
+    file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-tools.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend
new file mode 100644
index 00000000..d033e1d2
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend
@@ -0,0 +1,2 @@
+require xen-xilinx_4.17.inc
+require xen-tools-xilinx.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bb
new file mode 100644
index 00000000..8baa2f53
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bb
@@ -0,0 +1,18 @@
+# tag: RELEASE-4.18.0
+SRCREV ?= "d75f1e9b74314cea91ce435730d4e3539ecca77d"
+
+XEN_URI ?= "git://xenbits.xen.org/xen.git"
+XEN_REL ?= "4.18"
+XEN_BRANCH ?= "stable-4.18"
+
+SRC_URI = " \
+    ${XEN_URI};branch=${XEN_BRANCH} \
+    file://0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-tools.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bbappend
new file mode 100644
index 00000000..86702979
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bbappend
@@ -0,0 +1,2 @@
+require xen-xilinx_4.18.inc
+require xen-tools-xilinx.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc
new file mode 100644
index 00000000..d7810b27
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc
@@ -0,0 +1,7 @@
+SRCREV = "38eebc6e5c6f7aa9180672a56d33217bf1ef1ca6"
+XEN_URI = "git://github.com/Xilinx/xen.git;protocol=https"
+XEN_BRANCH = "xlnx_rebase_4.17"
+
+PV .= "-xilinx+git${SRCPV}"
+
+DEFAULT_PREFERENCE = "+1"
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
new file mode 100644
index 00000000..2290a418
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
@@ -0,0 +1,7 @@
+SRCREV = "7cb7aac7f570757b67bcd43aec67e0cda9f58b14"
+XEN_URI = "git://github.com/Xilinx/xen.git;protocol=https"
+XEN_BRANCH = "xlnx_rebase_4.18"
+
+PV .= "-xilinx+git${SRCPV}"
+
+DEFAULT_PREFERENCE = "+1"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen.inc
new file mode 100644
index 00000000..5937763a
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen.inc
@@ -0,0 +1,233 @@
+HOMEPAGE = "http://xen.org"
+LICENSE = "GPL-2.0-only"
+SECTION = "console/tools"
+
+inherit autotools-brokensep pkgconfig
+
+require xen-arch.inc
+
+PACKAGECONFIG ??= " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+    "
+
+PACKAGECONFIG[lzo] = ",,lzo"
+PACKAGECONFIG[xsm] = "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd,"
+PACKAGECONFIG[externalblktap] = ",,,"
+
+DEPENDS = " \
+    ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', 'dev86-native', '', d)} \
+    bison-native \
+    flex-native \
+    file-native \
+    gettext-native \
+    acpica-native \
+    ncurses-native \
+    util-linux-native \
+    xz-native \
+    bridge-utils \
+    curl \
+    dtc \
+    gettext \
+    glib-2.0 \
+    gnutls \
+    iproute2 \
+    libnl \
+    ncurses \
+    openssl \
+    pciutils \
+    pixman \
+    procps \
+    python3 \
+    libaio \
+    util-linux \
+    xz \
+    yajl \
+    zlib \
+    gnu-efi \
+    "
+
+#### REQUIRED ENVIRONMENT VARIABLES ####
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
+
+# specify xen hypervisor to build/target
+export XEN_TARGET_ARCH = "${@map_xen_arch(d.getVar('TARGET_ARCH'), d)}"
+export XEN_COMPILE_ARCH = "${@map_xen_arch(d.getVar('BUILD_ARCH'), d)}"
+
+python () {
+    if d.getVar('XEN_TARGET_ARCH') == 'INVALID':
+        raise bb.parse.SkipPackage('Cannot map `%s` to a xen architecture' % d.getVar('TARGET_ARCH'))
+}
+
+# Yocto appends ${PN} to libexecdir by default and Xen appends 'xen' as well
+# the result is a nested xen/xen/ so let's avoid that by shunning Yocto's
+# extra ${PN} appended.
+libexecdir = "${libdir}"
+
+# hardcoded as Linux, as the only compatible hosts are Linux.
+export XEN_OS = "Linux"
+
+# this is used for the header (#!${bindir}/python) of the install python scripts
+export PYTHONPATH="${bindir}/env python3"
+export ac_cv_path_PYTHONPATH="${bindir}/env python3"
+export DISTUTILS_BUILD_ARGS
+export DISTUTILS_INSTALL_ARGS
+
+# xen and seabios require HOSTCC and HOSTCXX set to cross-compile
+export HOSTCC="${BUILD_CC}"
+export HOSTCXX="${BUILD_CXX}"
+
+# make xen requires CROSS_COMPILE set by hand as it does not abide by ./configure
+export CROSS_COMPILE="${TARGET_PREFIX}"
+
+# overide LDFLAGS to allow xen to build without: "x86_64-oe-linux-ld: unrecognized option '-Wl,-O1'"
+export LDFLAGS=""
+
+# No additional C flags for the main hypervisor build
+EXTRA_CFLAGS_XEN_CORE ?= ""
+# Add prefix maps to support buildpaths QA test and reproducibility
+DEBUG_PREFIX_MAP:append = " \
+    -ffile-prefix-map=${S}=${PN}-source \
+    -fdebug-prefix-map=${WORKDIR}=${PN} \
+    "
+
+# - The Xen tools build for x86 systems with HVM-mode enabled includes hvmloader
+#   which fails to build when "-m64" is included in flags set via the
+#   EXTRA_CFLAGS_XEN_TOOLS: so clear TUNE_CCARGS on x86 to prevent that.
+TUNE_CCARGS:x86-64=""
+
+# - Yocto supplies the _FORTIFY_SOURCE flag via CC/CPP/CXX but then passes the
+#   optimization -O via C*FLAGS which is problematic when the CFLAGS are cleared
+#   within the build because compilation fails with the compiler stating
+#   "_FORTIFY_SOURCE requires compiling with optimization (-O)".
+# - Move HOST_CC_ARCH into the Xen-provided CFLAGS variables and keep
+#   TOOLCHAIN_OPTIONS set via CC: this enables hvmloader to be built correctly.
+#   It must not be compiled with SSE compiler options enabled and the Xen build
+#   explicitly clears CFLAGS to ensure that, so such options must not be passed
+#   in via the tool variable. hvmloader is required to run HVM-mode guest VMs.
+CC="${CCACHE}${HOST_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP} ${CC_REPRODUCIBLE_OPTIONS}"
+EXTRA_CFLAGS_XEN_TOOLS="${HOST_CC_ARCH} ${CFLAGS}"
+# 32-bit ARM needs the TUNE_CCARGS component of HOST_CC_ARCH to be passed
+# in CC to ensure that configure can compile binaries for the right arch.
+CC:arm="${CCACHE}${HOST_PREFIX}gcc ${TUNE_CCARGS} ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP} ${CC_REPRODUCIBLE_OPTIONS}"
+
+# There are no Xen-provided variables for C++, so append to the tool variables:
+CPP:append = " ${CPPFLAGS}"
+CXX:append = " ${CXXFLAGS}"
+
+EXTRA_OECONF += " \
+    --exec-prefix=${prefix} \
+    --prefix=${prefix} \
+    --host=${HOST_SYS} \
+    --disable-stubdom \
+    --disable-ioemu-stubdom \
+    --disable-pv-grub \
+    --disable-xenstore-stubdom \
+    --disable-rombios \
+    --disable-ocamltools \
+    --disable-qemu-traditional \
+    ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', \
+        '--enable-pvshim --with-system-seabios="/usr/share/firmware/bios.bin"', \
+        '--disable-pvshim --disable-seabios', d)} \
+    "
+
+EXTRA_OEMAKE += "STDVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.8a.bin"
+EXTRA_OEMAKE += "CIRRUSVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.8a.cirrus.bin"
+EXTRA_OEMAKE += "SEABIOS_ROM=${STAGING_DIR_HOST}/usr/share/firmware/bios.bin"
+EXTRA_OEMAKE += "ETHERBOOT_ROMS=${STAGING_DIR_HOST}/usr/share/firmware/rtl8139.rom"
+
+# prevent the Xen build scripts from fetching things during the build
+# all dependencies should be reflected in the Yocto recipe
+EXTRA_OEMAKE += "WGET=/bin/false"
+EXTRA_OEMAKE += "GIT=/bin/false"
+
+# Improve build reproducibility: provide values for build variables.
+def get_build_time_vars(d):
+    source_date_epoch = d.getVar('SOURCE_DATE_EPOCH')
+    if source_date_epoch is not None:
+        import datetime
+        utc_datetime = datetime.datetime.utcfromtimestamp(float(source_date_epoch))
+        return " XEN_BUILD_DATE=" + utc_datetime.strftime("%Y-%m-%d") + \
+               " XEN_BUILD_TIME=" + utc_datetime.strftime("%H:%M:%S")
+    return ""
+EXTRA_OEMAKE += "${@['', 'XEN_WHOAMI=${PF} XEN_DOMAIN=${DISTRO} XEN_BUILD_HOST=${PN}-buildhost'] \
+                    [d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1']}${@get_build_time_vars(d)}"
+
+# Improve build reproducibility: compiler flags to remove filesystem differences.
+CC_REPRODUCIBLE_OPTIONS = "${@['', '-gno-record-gcc-switches'] \
+                             [d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1']}"
+
+# check for XSM in package config to allow XSM_ENABLE to be set
+python () {
+    pkgconfig = d.getVar('PACKAGECONFIG')
+    if ('xsm') in pkgconfig.split():
+        d.setVar('XSM_ENABLED', '1')
+    else:
+        d.setVar('XSM_ENABLED', '0')
+}
+
+do_post_patch() {
+    # fixup AS/CC/CCP/etc variable within StdGNU.mk
+    for i in LD CC CPP CXX; do
+        sed -i "s/^\($i\s\s*\).*=/\1?=/" ${S}/config/StdGNU.mk
+    done
+    # fixup environment passing in some makefiles
+    sed -i 's#\(\w*\)=\(\$.\w*.\)#\1="\2"#' ${S}/tools/firmware/Makefile
+
+    # libsystemd-daemon -> libsystemd for newer systemd versions
+    sed -i 's#libsystemd-daemon#libsystemd#' ${S}/tools/configure
+
+    # Improve build reproducibility: disable insertion of the build timestamp
+    # into the x86 EFI hypervisor binary.
+    # binutils should allow a user-supplied timestamp or use SOURCE_DATE_EPOCH
+    # for PE but currently does not.
+    if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ] ; then
+        sed '/^EFI_LDFLAGS = /{a EFI_LDFLAGS += --no-insert-timestamp
+}' -i "${S}/xen/arch/x86/Makefile"
+    fi
+}
+
+addtask post_patch after do_patch before do_configure
+
+# Allow all hypervisor settings in a defconfig
+EXTRA_OEMAKE += "XEN_CONFIG_EXPERT=y"
+# Build release versions always. Technically since we track release
+# tarballs this always happens but occasionally people pull in patches
+# from staging that reverts this
+EXTRA_OEMAKE += "debug=n"
+
+do_configure_common() {
+    cd ${S}
+
+    #./configure --enable-xsmpolicy does not set XSM_ENABLE must be done manually
+    if [ "${XSM_ENABLED}" = "1" ]; then
+        echo "XSM_ENABLE := y" > ${S}/.config
+    fi
+
+    if [ -f "${WORKDIR}/defconfig" ]; then
+        cp "${WORKDIR}/defconfig" "${S}/xen/.config" || \
+        bbfatal "Unable to copy defconfig to .config"
+    fi
+
+    unset CFLAGS
+
+    # do configure
+    oe_runconf EXTRA_CFLAGS_XEN_CORE="${EXTRA_CFLAGS_XEN_CORE}" \
+               EXTRA_CFLAGS_XEN_TOOLS="${EXTRA_CFLAGS_XEN_TOOLS}" \
+               PYTHON="${PYTHON}"
+}
+
+do_compile:prepend() {
+    # workaround for build bug when CFLAGS is exported
+    # https://www.mail-archive.com/xen-devel@lists.xen.org/msg67822.html
+    unset CFLAGS
+}
+
+do_install:prepend() {
+    # CFLAGS is used to set PY_CFLAGS which affects the pygrub install
+    # so also need to unset CFLAGS here:
+    unset CFLAGS
+}
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bb
new file mode 100644
index 00000000..41cf2a15
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bb
@@ -0,0 +1,19 @@
+# xen 4.17.0 release sha
+SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
+
+XEN_URI ?= "git://xenbits.xen.org/xen.git"
+XEN_REL ?= "4.17"
+XEN_BRANCH ?= "stable-${XEN_REL}"
+
+SRC_URI = " \
+    ${XEN_URI};branch=${XEN_BRANCH} \
+    file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
+    file://xen-flask-race-fix.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-hypervisor.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend
new file mode 100644
index 00000000..a569a96d
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend
@@ -0,0 +1,20 @@
+require xen-xilinx_4.17.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+RDEPENDS:${PN}-efi += "bash python3"
+
+do_deploy:append() {
+    # Mimic older behavior for compatibility
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE} ]; then
+        ln -s xen-${MACHINE} ${DEPLOYDIR}/xen
+    fi
+
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE}.gz ]; then
+        ln -s xen-${MACHINE}.gz ${DEPLOYDIR}/xen.gz
+    fi
+
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE}.efi ]; then
+        ln -s xen-${MACHINE}.efi ${DEPLOYDIR}/xen.efi
+    fi
+}
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bb
new file mode 100644
index 00000000..daa27b5b
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bb
@@ -0,0 +1,18 @@
+# tag: RELEASE-4.18.0
+SRCREV ?= "7cb7aac7f570757b67bcd43aec67e0cda9f58b14"
+
+XEN_URI ?= "git://xenbits.xen.org/xen.git"
+XEN_REL ?= "4.18"
+XEN_BRANCH ?= "stable-4.18"
+
+SRC_URI = " \
+    ${XEN_URI};branch=${XEN_BRANCH} \
+    file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-hypervisor.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bbappend
new file mode 100644
index 00000000..e2c75566
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bbappend
@@ -0,0 +1,20 @@
+require xen-xilinx_4.18.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+RDEPENDS:${PN}-efi += "bash python3"
+
+do_deploy:append() {
+    # Mimic older behavior for compatibility
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE} ]; then
+        ln -s xen-${MACHINE} ${DEPLOYDIR}/xen
+    fi
+
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE}.gz ]; then
+        ln -s xen-${MACHINE}.gz ${DEPLOYDIR}/xen.gz
+    fi
+
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE}.efi ]; then
+        ln -s xen-${MACHINE}.efi ${DEPLOYDIR}/xen.efi
+    fi
+}
diff --git a/meta-xilinx-virtualization/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-xilinx-virtualization/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
new file mode 100644
index 00000000..298b1dc8
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -0,0 +1,8 @@
+# See meta-virtualization recipes-graphics/xorg-xserver/xserver-xorg_xen.inc
+
+# We want the configuration to remain optimized, if a user wants the removal
+# behavior, then they can set one of the below using 'glamor' as in the
+# xserver-xorg_xen.inc file.
+XEN_REMOVED_OPENGL_PKGCONFIGS:zynqmp ?= ""
+XEN_REMOVED_OPENGL_PKGCONFIGS:versal ?= ""
+