136 files changed, 6100 insertions, 1454 deletions
diff --git a/meta-xilinx-core/README.md b/meta-xilinx-core/README.md
index ec5b663b..945a76a7 100644
--- a/meta-xilinx-core/README.md
+++ b/meta-xilinx-core/README.md
@@ -10,11 +10,15 @@ This layer depends on:
        URI: https://git.yoctoproject.org/poky
        layers: meta, meta-poky
-        branch: langdale
+        branch: scarthgap
        URI: https://git.openembedded.org/meta-openembedded
        layers: meta-oe
-        branch: langdale
+        branch: scarthgap
+        URI: https://git.yoctoproject.org/meta-arm
+        layers: meta-arm, meta-arm-toolchain
+        branch: scarthgap
 ---
 ## Configuring Machines
@@ -36,13 +40,13 @@ Zynqmp-generic requires pmu-firmware.  The firmware can be passed directly
 as a path to a binary: PMU_FILE, you may use the generic built version
 by including meta-xilinx-standalone, the XSCT version by adding
 meta-xilinx-tools or the DTB workflow version using
-meta-xilinx-standalone-experimental.
+meta-xilinx-standalone-sdt.
 Versal-generic requires both PLM and PSM firmware to be specified.  They can
 be specified as a path to a binary using PLM_FILE and PSM_FILE.  Or they can
 be generated by including meta-xilinx-standalone, the XSCT version by adding
 meta-xilinx-tools or the DTB workflow version using
-meta-xilinx-standalone-experimental.  Additionally some configurations may
+meta-xilinx-standalone-sdt.  Additionally some configurations may
 require you to specify the path to a PDI file using PDI_PATH.  The XSCT
 version will extract the PDI automatically.
 ---
diff --git a/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass b/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
index ed4c1f87..5020b02b 100644
--- a/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
+++ b/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
@@ -5,6 +5,8 @@
 #
 QSPI_SIZE ?= "0x2280000"
+QSPI_VERSION ?= ""
+QSPI_IMAGE_VERSION ?= ""
 # Register values
 IDN_REG ?= "0x4D554241"
@@ -60,7 +62,7 @@ def generate_spi_image(d):
    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"
+    imgsel_file = d.getVar("DEPLOY_DIR_IMAGE")+"/image-selector-"+d.getVar("MACHINE")+".bin"
    try:
        with open(imgsel_file, "rb") as il:
            imgsel = il.read(-1)
@@ -103,7 +105,7 @@ def generate_spi_image(d):
    qspi_data.write(bootbin)
    # Recovery Image & Recovery Image Backup
-    imgrcry_file = d.getVar("DEPLOY_DIR_IMAGE")+"/imgrcry-"+d.getVar("MACHINE")+".bin"
+    imgrcry_file = d.getVar("DEPLOY_DIR_IMAGE")+"/image-recovery-"+d.getVar("MACHINE")+".bin"
    try:
        with open(imgrcry_file, "rb") as iy:
            imgrcry = iy.read(-1)
@@ -116,12 +118,8 @@ def generate_spi_image(d):
    qspi_data.write(imgrcry)
    # Version string and checksum
-    version = d.getVar("QSPI_IMAGE_VERSION")
+    version = d.getVar('QSPI_IMAGE_VERSION')
-    date = time.strftime("%m%d%H%M")
+    qspi_version = f"{version}\x00"
-    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())
diff --git a/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
index 188d594b..d4a01048 100644
--- a/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
+++ b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
@@ -255,8 +255,12 @@ do_install() {
    # 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_PATH}/*.dtbo | wc -l` -eq 1 ]; then
+        install -Dm 0644 ${S}/${DTBO_PATH}/*.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
    elif [ `ls ${S}/*.dtbo | wc -l` -gt 1 ]; then
        bbfatal "Multiple DTBO found, use the right DTBO in SRC_URI from the following:\n$(basename -a ${S}/*.dtbo)"
+    elif [ `ls ${S}/${DTBO_PATH}/*.dtbo | wc -l` -gt 1 ]; then
+        bbfatal "Multiple DTBO found, use the right DTBO in SRC_URI from the following:\n$(basename -a ${S}/${DTBO_PATH}/*.dtbo)"
    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
@@ -272,12 +276,20 @@ do_install() {
    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}/${BIT_PATH}/*.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_PATH}/*.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}/${BIN_PATH}/*.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_PATH}/*.bin)"
        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}/${BIT_PATH}/*.bit | wc -l` -eq 1 ] && [ ! -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${S}/${BIT_PATH}/*.bit ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
        elif [ `ls ${S}/*.bin | wc -l` -eq 1 ]; then
            install -Dm 0644 ${S}/*.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+        elif [ `ls ${S}/${BIN_PATH}/*.bin | wc -l` -eq 1 ]; then
+            install -Dm 0644 ${S}/${BIN_PATH}/*.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
        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
@@ -295,10 +307,16 @@ do_install() {
    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_PATH}/*.pdi | wc -l` -eq 1 ] && [ ! -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${S}/${PDI_PATH}/*.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_PATH}/*.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_PATH}/*.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
+        elif [ `ls ${S}/${PDI_PATH}/*.pdi | wc -l` -eq 1 ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${S}/${PDI_PATH}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.pdi
        else
            bbwarn "A PDI file with '.pdi' expected but not found"
        fi
diff --git a/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
index a0ea1531..df7016d4 100644
--- a/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
+++ b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
@@ -23,10 +23,26 @@ QB_DEFAULT_KERNEL:zynq ?= "${@'zImage' if \
 QB_DEFAULT_KERNEL:microblaze ?= "${@'simpleImage.mb' if \
                d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1' else 'simpleImage.mb-initramfs-${MACHINE}.bin'}"
+# https://docs.amd.com/r/en-US/ug585-zynq-7000-SoC-TRM/Boot-Mode-Pin-Settings
 # https://docs.amd.com/r/en-US/ug1085-zynq-ultrascale-trm/Boot-Modes
 # https://docs.amd.com/r/en-US/ug1304-versal-acap-ssdg/Boot-Device-Modes
 QB_BOOT_MODE ?= "-boot mode=5"
+# ZynqMP or Versal SD and eMMC drive index.
+# Note: Do not set drive index based on boot mode some boards may have primary
+#       boot mode as QSPI/OSPI and secondary boot mode as SD/eMMC.
+#
+# SoC                         Device                      Drive Index
+# Zynq-7000, ZynqMP, Versal   SD0                         0
+# ZynqMP, Versal              SD1                         1
+# ZynqMP, Versal              eMMC0(secondary boot only)  2
+# ZynqMP, Versal              eMMC1                       3
+QB_SD_DRIVE_INDEX ?= "1"
+QB_SD_DRIVE_INDEX:zynq ?= "0"
+QB_SD_DRIVE_INDEX:versal-net ?= "0"
 inherit qemuboot
 def qemu_target_binary(data):
@@ -78,6 +94,7 @@ def qemu_rootfs_params(data, param):
    bundle_image = data.getVar('INITRAMFS_IMAGE_BUNDLE') or ""
    soc_family = data.getVar('SOC_FAMILY') or ""
    tune_features = (data.getVar('TUNE_FEATURES') or []).split()
+    sd_index = data.getVar('QB_SD_DRIVE_INDEX') or ""
    if 'microblaze' in tune_features:
        soc_family = 'microblaze'
@@ -101,12 +118,6 @@ def qemu_rootfs_params(data, param):
        return fstype_dict[soc_family]
    elif param == 'rootfs-opt':
-        sd_index = "1"
-        if soc_family == 'zynq':
-            sd_index = "0"
-        if soc_family == 'versal-net':
-            sd_index = "0"
        # Device is using a disk
        if not initramfs_image:
            return ' -drive if=sd,index=%s,file=@ROOTFS@,format=raw' % (sd_index)
diff --git a/meta-xilinx-core/classes/xilinx-deprecated.bbclass b/meta-xilinx-core/classes/xilinx-deprecated.bbclass
index 1aee2fe1..c7509feb 100644
--- a/meta-xilinx-core/classes/xilinx-deprecated.bbclass
+++ b/meta-xilinx-core/classes/xilinx-deprecated.bbclass
@@ -14,5 +14,6 @@ python xilinx_deprecated_config_eventhandler () {
        if msg_source == "doc":
            continue
        msg = d.getVarFlag('XILINX_DEPRECATED', msg_source) or ""
-        bb.warn('%s: %s' % (msg_source, msg))
+        if msg:
+            bb.warn('%s: %s' % (msg_source, msg))
 }
diff --git a/meta-xilinx-core/classes/xilinx-vars.bbclass b/meta-xilinx-core/classes/xilinx-vars.bbclass
index 51d3cd87..e19918ca 100644
--- a/meta-xilinx-core/classes/xilinx-vars.bbclass
+++ b/meta-xilinx-core/classes/xilinx-vars.bbclass
@@ -6,15 +6,6 @@ xilinx_variables_config_eventhandler[eventmask] = "bb.event.ConfigParsed"
 # It's up to the base sytem to define the variables being used here, we're
 # only going to check them.
 python xilinx_variables_config_eventhandler () {
-    # Verify HDF_MACHINE
-    hdf_prior = d.getVar('HDF_MACHINE_PRIOR')
-    hdf_final = d.getVar('HDF_MACHINE')
-    if hdf_prior and hdf_prior != hdf_final:
-        bb.fatal("HDF_MACHINE is set to %s, it appears you intended %s. " \
-                 "This is usually as a result of specifying it in the local.conf or before the 'require' in the machine .conf file. " \
-                 "See meta-xilinx-core/conf/machine/README." % (hdf_final, hdf_prior))
    # Verify DEFAULTTUNE
    tune_prior = d.getVar('DEFAULTTUNE_PRIOR')
    tune_final = d.getVar('DEFAULTTUNE')
@@ -26,7 +17,7 @@ python xilinx_variables_config_eventhandler () {
    # Verify 'xilinx' is in LICENSE_FLAGS_ACCEPTED
    license_flags = d.getVar('LICENSE_FLAGS_ACCEPTED') or ""
-    if 'xilinx' not in license_flags.split():
+    if all(license not in license_flags.split() for license in ['xilinx', 'xilinx_pmu-rom-native']) :
        bb.warn("The ZynqMP pmu-rom is not enabled, qemu may not be able to emulate a ZynqMP system without it. " \
                "To enable this you must add 'xilinx' to the LICENSE_FLAGS_ACCEPTED to indicate you accept the software license.")
 }
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 2aa0a1a1..399011a7 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -22,7 +22,7 @@ xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bb \
 xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bbappend \
 "
-LAYERDEPENDS_xilinx = "core"
+LAYERDEPENDS_xilinx = "core meta-arm"
 LAYERRECOMMENDS_xilinx = "openembedded-layer"
 LAYERSERIES_COMPAT_xilinx = "scarthgap"
@@ -42,7 +42,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
  *->xserver-xorg \
 "
-XILINX_RELEASE_VERSION ??= "v2024.1"
+XILINX_RELEASE_VERSION ??= "v2024.2"
 BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION"
@@ -55,13 +55,20 @@ 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_ATF_VERSION[v2024.2] = "2.10-xilinx-v2024.2%"
+PREFERRED_VERSION_virtual/arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
+# The name of the software has changed to match upstream ARM
+XILINX_ATF_PROVIDERS[v2024.2] = "trusted-firmware-a"
+PREFERRED_PROVIDER_virtual/arm-trusted-firmware = "${@d.getVarFlag('XILINX_ATF_PROVIDERS', d.getVar('XILINX_RELEASE_VERSION')) or 'arm-trusted-firmware'}"
 XILINX_UBOOT_VERSION[v2022.1] = "1:2021.01-xilinx-v2022.1%"
 XILINX_UBOOT_VERSION[v2022.2] = "1:2022.01-xilinx-v2022.2%"
 XILINX_UBOOT_VERSION[v2023.1] = "1:2023.01-xilinx-v2023.1%"
 XILINX_UBOOT_VERSION[v2023.2] = "1:2023.01-xilinx-v2023.2%"
 XILINX_UBOOT_VERSION[v2024.1] = "1:2024.01-xilinx-v2024.1%"
+XILINX_UBOOT_VERSION[v2024.2] = "1:2024.01-xilinx-v2024.2%"
 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'}"
@@ -71,6 +78,7 @@ XILINX_LINUX_VERSION[v2022.2] = "5.15.36%"
 XILINX_LINUX_VERSION[v2023.1] = "6.1.30%"
 XILINX_LINUX_VERSION[v2023.2] = "6.1.60%"
 XILINX_LINUX_VERSION[v2024.1] = "6.6.10%"
+XILINX_LINUX_VERSION[v2024.2] = "6.6.40%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 # XRT/ZOCL
@@ -78,7 +86,8 @@ XRT_ZOCL_VERSION[v2022.1] = "202210.2.13.479"
 XRT_ZOCL_VERSION[v2022.2] = "202220.2.14.0"
 XRT_ZOCL_VERSION[v2023.1] = "202310.2.15.0"
 XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0"
-XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.0"
+XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.319"
+XRT_ZOCL_VERSION[v2024.2] = "202420.2.18.0"
 PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
@@ -88,6 +97,7 @@ AIEFAL_VERSION[v2022.2] = "1.4"
 AIEFAL_VERSION[v2023.1] = "1.5"
 AIEFAL_VERSION[v2023.2] = "1.5"
 AIEFAL_VERSION[v2024.1] = "1.6"
+AIEFAL_VERSION[v2024.2] = "1.7"
 PREFERRED_VERSION_aiefal ?= "${@d.getVarFlag('AIEFAL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 AI_ENGINE_DRIVER_VERSION[v2022.1] = "3.3"
@@ -95,6 +105,7 @@ AI_ENGINE_DRIVER_VERSION[v2022.2] = "3.3"
 AI_ENGINE_DRIVER_VERSION[v2023.1] = "3.4"
 AI_ENGINE_DRIVER_VERSION[v2023.2] = "3.4"
 AI_ENGINE_DRIVER_VERSION[v2024.1] = "3.5"
+AI_ENGINE_DRIVER_VERSION[v2024.2] = "3.6"
 PREFERRED_VERSION_ai-engine-driver ?= "${@d.getVarFlag('AI_ENGINE_DRIVER_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/README b/meta-xilinx-core/conf/machine/README
index f664a2f0..5db8fa8f 100644
--- a/meta-xilinx-core/conf/machine/README
+++ b/meta-xilinx-core/conf/machine/README
@@ -44,7 +44,6 @@ MACHINEOVERRIDES =. "${@['', 'my-example:']['my-example' != '${MACHINE}']}"
 require conf/machine/zynqmp-generic.conf
-HDF_MACHINE = "zcu102-zynqmp"
 MACHINE_FEATURES += "pci"
 #### No additional settings should be after the Postamble
@@ -67,7 +66,6 @@ DEFAULTTUNE ?= "aarch64"
 require conf/machine/zynqmp-generic.conf
-HDF_MACHINE = "zcu102-zynqmp"
 MACHINE_FEATURES += "pci"
 #### No additional settings should be after the Postamble
@@ -88,7 +86,6 @@ TUNE_FEATURES:tune-microblaze ?= "microblaze v8.50 barrel-shift reorder pattern-
 require conf/machine/microblaze-generic.conf
-HDF_MACHINE = "ml605"
 SERIAL_CONSOLE = "115200,ttyUL0"
 #### No additional settings should be after the Postamble
@@ -149,12 +146,17 @@ local.conf
 System wide setting:
 TUNE_FEATURES:tune-<tune> - Specific tune features
+XILINX_WITH_ESW = "xsct" or "sdt" - Specify xsct or sdt workflow
 external-hdf recipe from meta-xilinx-tools:
-HDF_MACHINE - Machine to load from reference defign xsa using hdf-examples recipe
+XILINX_XSCT_VERSION - Version of the XSCT tool and associated ESW software
-HDF_EXT - Only ".xsa" externsion is supported, legacy variable.
+HDF_URI - URL for the .xsa file
-HDF_BASE - Download protocol (file://, git://, http:// or https://) protocol if
+HDF_URI[sha256sum] - sha256sum of the .xsa
-    not using the default external-hdf repository.
-HDF_PATH - Path to the repository or XSA file
+sdt-artifacts recipe from meta-xilinx-standalone-sdt:
+SDT_URI - URI for the system device tree artifacts (usually a tarball)
+SDT_URI[sha256sum] - sha256sum of the SDT artifacts file
+SDT_URI[S] - the 'S' (source) directory where the artifacts are extracted
 fs-boot recipe from meta-xilinx-tools:
 YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot - YAML based uart stdin configuration for
@@ -208,15 +210,3 @@ HAS_PLATFORM_INIT - List of defconfig files available for u-boot only for SPL bo
 u-boot-xlnx-scr recipe from meta-xilinx-core:
 DDR_BASEADDR - Base address for DDR used for loading the images from u-boot env.
 SKIP_APPEND_BASEADDR - Skip appending ${DDR_BASEADDR} for image offsets.
-Varibable set after required inclusion file:
-Varibables that does not intend to change must be set before required inclusion
-file.
-external-hdf recipe from meta-xilinx-tools:
-HDF_MACHINE - Used by the  recipe to find the correct XSA
-HDF_EXT - only xsa is supported, legacy variable
-HDF_BASE - protocol if not using the default external-hdf repository
-HDF_PATH - path to the repository or XSA file
-...and more...
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 904b4861..cf890a51 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -1,5 +1,3 @@
-# HDF_MACHINE should be set _AFTER_ this has been loaded
-HDF_MACHINE_PRIOR := "${HDF_MACHINE}"
 INHERIT += "xilinx-vars"
 INHERIT += "xilinx-deprecated"
@@ -14,7 +12,7 @@ IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz cpio.gz.u-boot"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-xlnx"
 # Device tree Configuration
-PREFERRED_PROVIDER_virtual/dtb ??= "device-tree"
+PREFERRED_PROVIDER_virtual/dtb ??= "${@'device-tree' if d.getVar('XILINX_WITH_ESW') else ''}"
 # U-Boot Configuration
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx"
@@ -27,8 +25,6 @@ PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-u-boot-tools-xlnx"
 PREFERRED_PROVIDER_libmetal ?= "libmetal-xlnx"
 PREFERRED_PROVIDER_open-amp ?= "open-amp-xlnx"
-do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}"
 UBOOT_SUFFIX ?= "bin"
 UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
@@ -61,12 +57,9 @@ WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'boot.bi
 WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'system.dtb',   ' virtual/dtb', '', d)}"
 WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'boot.scr',     ' u-boot-xlnx-scr', '', d)}"
 WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'uEnv.txt',     ' u-boot-xlnx-uenv', '', d)}"
-WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'atf-uboot.ub', ' arm-trusted-firmware', '', d)}"
 WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'Image',        ' virtual/kernel', '', d)}"
 WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'uImage',       ' virtual/kernel', '', d)}"
 WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'zImage',       ' virtual/kernel', '', d)}"
-WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'u-boot.bin',   ' virtual/bootloader', '', d)}"
-WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'u-boot.elf',   ' virtual/bootloader', '', d)}"
 WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', '${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz.u-boot', ' ${INITRAMFS_IMAGE}', '', d)}"
 # Automatically add IMAGE_BOOT_FILES to /boot via packages
@@ -74,9 +67,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INST
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'system.dtb',   ' ${PREFERRED_PROVIDER_virtual/dtb}', '', d)}"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'boot.scr',     ' u-boot-xlnx-scr', '', d)}"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'uEnv.txt',     ' u-boot-xlnx-uenv', '', d)}"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'atf-uboot.ub', ' arm-trusted-firmware', '', d)}"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'u-boot.bin',   ' ${PREFERRED_PROVIDER_virtual/bootloader}-bin', '', d)}"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'u-boot.elf',   ' ${PREFERRED_PROVIDER_virtual/bootloader}-elf', '', d)}"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'Image',        ' kernel-image-image', '', d)}"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'uImage',       ' kernel-image-uimage', '', d)}"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'zImage',       ' kernel-image-zimage', '', d)}"
@@ -90,6 +80,17 @@ IMAGE_BOOT_FILES ?= "${@get_default_image_boot_files(d)}"
 def get_default_image_boot_files(d):
    files = []
+    esw_type = d.getVar('XILINX_WITH_ESW') or ''
+    if esw_type:
+        if 'zynq' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+        if 'zynqmp' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+        if 'versal' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+        if 'versal-net' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
    # kernel images
    kerneltypes = set((d.getVar("KERNEL_IMAGETYPE") or "").split())
    kerneltypes |= set((d.getVar("KERNEL_IMAGETYPES") or "").split())
@@ -103,6 +104,7 @@ def get_default_image_boot_files(d):
    # device trees (device-tree only), these are first as they are likely desired over the kernel ones
    if "device-tree" in (d.getVar("PREFERRED_PROVIDER_virtual/dtb") or ""):
+        files.append("system.dtb")
        files.append("devicetree/*.dtb;devicetree/")
        files.append("devicetree/*.dtbo;devicetree/")
@@ -115,6 +117,34 @@ def get_default_image_boot_files(d):
    return " ".join(files)
+EXTRA_IMAGEDEPENDS += "${@get_default_extra_imagedepends(d)}"
+def get_default_extra_imagedepends(d):
+    depends = []
+    # Add firmware dependencies
+    esw_type = d.getVar('XILINX_WITH_ESW') or ''
+    if esw_type:
+        depends.append('libyaml-native')
+        depends.append('python3-cython-native')
+        depends.append('python3-pyyaml-native')
+        if 'microblaze' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/bitstream')
+        if 'zynq' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+        if 'zynqmp' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+        if 'versal' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+            depends.append('virtual/cdo')
+        if 'versal-net' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+            depends.append('virtual/cdo')
+    return " ".join(depends)
 XSERVER_EXT ?= ""
 FPGA_MNGR_RECONFIG_ENABLE ?= "1"
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
index c450b542..e75f556b 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
@@ -9,7 +9,7 @@ PREFERRED_PROVIDER_nativesdk-qemu = "nativesdk-qemu-xilinx"
 MACHINEOVERRIDES =. "qemuboot-xilinx:"
 # depend on qemu-helper-native, which will depend on QEMU
-EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot"
+EXTRA_IMAGEDEPENDS += "qemu-devicetrees-native qemu-system-native qemu-helper-native:do_addto_recipe_sysroot"
 # Use the xilinx specific version for these users
 IMAGE_CLASSES += "qemuboot-xilinx"
@@ -21,5 +21,5 @@ IMAGE_CLASSES += "qemuboot-xilinx"
 # QB_XILINX_SERIAL that will allow us to define serial ports for qemu
 # emulated boards that may not match the standard Linux behavior.
 #
-QB_XILINX_SERIAL ?= ""
+QB_XILINX_SERIAL ??= ""
-QB_OPT_APPEND += "${QB_XILINX_SERIAL}"
+QB_OPT_APPEND += "${QB_XILINX_SERIAL} -nodefaults"
diff --git a/meta-xilinx-core/conf/machine/include/soc-tune-include.inc b/meta-xilinx-core/conf/machine/include/soc-tune-include.inc
index b3216426..197a998d 100644
--- a/meta-xilinx-core/conf/machine/include/soc-tune-include.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-tune-include.inc
@@ -7,6 +7,7 @@ TUNEFILE[cortexr5hf] = "conf/machine/include/arm/armv7r/tune-cortexr5.inc"
 TUNEFILE[cortexr52] = "conf/machine/include/arm/armv8r/tune-cortexr52.inc"
 TUNEFILE[cortexr52hf] = "conf/machine/include/arm/armv8r/tune-cortexr52.inc"
 TUNEFILE[cortexa9thf-neon] = "conf/machine/include/arm/armv7a/tune-cortexa9.inc"
+TUNEFILE[cortexa9] = "conf/machine/include/arm/armv7a/tune-cortexa9.inc"
 TUNEFILE[armv8a] = "conf/machine/include/arm/arch-armv8a.inc"
 TUNEFILE[cortexa53] = "conf/machine/include/arm/armv8a/tune-cortexa53.inc"
 TUNEFILE[cortexa72] = "conf/machine/include/arm/armv8a/tune-cortexa72.inc"
diff --git a/meta-xilinx-core/conf/machine/include/soc-versal-net.inc b/meta-xilinx-core/conf/machine/include/soc-versal-net.inc
index b59bdacc..f7898e0d 100644
--- a/meta-xilinx-core/conf/machine/include/soc-versal-net.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-versal-net.inc
@@ -7,8 +7,6 @@ require soc-tune-include.inc
 # Linux Configuration
 KERNEL_IMAGETYPE ?= "Image"
-WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin virtual/arm-trusted-firmware"
 UBOOT_ELF ?= "u-boot.elf"
 # Default, if multiconfig is off, call plm/psm-firmware directly, otherwise call the versal-fw multiconfig version
diff --git a/meta-xilinx-core/conf/machine/include/soc-versal.inc b/meta-xilinx-core/conf/machine/include/soc-versal.inc
index daa129af..1fcb412a 100644
--- a/meta-xilinx-core/conf/machine/include/soc-versal.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-versal.inc
@@ -15,8 +15,6 @@ require soc-tune-include.inc
 # Linux Configuration
 KERNEL_IMAGETYPE ?= "Image"
-WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin virtual/arm-trusted-firmware"
 UBOOT_ELF ?= "u-boot.elf"
 # Default, if multiconfig is off, call plm/psm-firmware directly, otherwise call the versal-fw multiconfig version
diff --git a/meta-xilinx-core/conf/machine/include/soc-zynq.inc b/meta-xilinx-core/conf/machine/include/soc-zynq.inc
index e456a31f..587a0d5a 100644
--- a/meta-xilinx-core/conf/machine/include/soc-zynq.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-zynq.inc
@@ -8,15 +8,4 @@ require soc-tune-include.inc
 KERNEL_IMAGETYPE ?= "uImage"
 KERNEL_IMAGETYPES += "zImage"
-# WIC Specific dependencies
-WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin"
 UBOOT_ELF ?= "u-boot.elf"
-# Default, if multiconfig is off, the fsbl is in the regular deploydir, otherwise
-# it is located under a multiconfig specific deploydir
-FSBL_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', '', 'fsbl-firmware:do_deploy', d)}"
-FSBL_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', 'mc::fsbl-fw:fsbl-firmware:do_deploy', '', d)}"
-FSBL_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', '${TOPDIR}/tmp-fsbl-fw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}"
-FSBL_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
-FSBL_IMAGE_NAME ?= "fsbl-${MACHINE}"
diff --git a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
index a9c3ad73..aee5c19c 100644
--- a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
@@ -16,8 +16,6 @@ KERNEL_IMAGETYPE ?= "Image"
 # Support multilib on zynqmp
 DEFAULTTUNE:virtclass-multilib-lib32 ?= "armv7vethf-neon-vfpv4"
-WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin virtual/arm-trusted-firmware"
 UBOOT_SUFFIX ?= "bin"
 XSERVER_EXT:zynqmp ?= "xf86-video-armsoc"
diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index 8fb40070..39059511 100644
--- a/meta-xilinx-core/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
@@ -2,11 +2,6 @@
 #@NAME: microblaze-generic
 #@DESCRIPTION: Machine configuration for the microblaze-generic devices
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'microblaze-generic:']['microblaze-generic' != '${MACHINE}']}"
 #### Regular settings follow
@@ -19,21 +14,6 @@ DEFAULTTUNE ?= "microblaze"
 # defined before calling the required inclusion file else pre-expansion value
 # defined in local.conf without machine override will not be reflected.
-# Yocto Microblaze device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
-YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_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 kcu105}"
-# Yocto Microblaze 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 ?= "DDR4_0"
-YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
-XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
 # Yocto Microblaze u-boot-xlnx variables
 UBOOT_MACHINE ?= "microblaze-generic_defconfig"
 UBOOT_INITIAL_ENV = ""
@@ -46,7 +26,6 @@ KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}"
 # Microblaze Serial Console settings
 SERIAL_CONSOLES ?= "115200;ttyUL0"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 require conf/machine/include/soc-tune-include.inc
 require conf/machine/include/machine-xilinx-default.inc
@@ -60,27 +39,12 @@ MB_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('TUNE_PKGARCH') + '-ge
 MACHINE_ARCH = "${@['${MB_MACHINE_ARCH}', '${DEF_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}"
-# microblaze-generic.conf uses kcu105-microblazeel xsa as reference input.
-# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
-# local.conf.
-HDF_MACHINE = "kcu105-microblazeel"
 MACHINE_FEATURES = ""
 KERNEL_IMAGETYPE ?= "linux.bin.ub"
 KERNEL_IMAGETYPES = ""
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
-IMAGE_BOOT_FILES += " \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
-    "
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    virtual/bitstream \
    virtual/bootloader \
    virtual/elfrealloc \
    u-boot-xlnx-scr \
@@ -89,9 +53,9 @@ EXTRA_IMAGEDEPENDS += " \
 IMAGE_FSTYPES += "cpio.gz"
 # Microblaze QEMU Configurations
-QB_MEM = "-m 2G"
+QB_MEM ?= "-m 2G"
-QB_KERNEL_CMDLINE_APPEND = "console=ttyUL0,115200 root=/dev/ram0 rw"
+QB_KERNEL_CMDLINE_APPEND ?= "console=ttyUL0,115200 root=/dev/ram0 rw"
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@"
 # This will work with the default runqemu, as the first serial port is the
 # correct console
@@ -99,13 +63,8 @@ QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 # One total serial port defined in this model (according to the generated dts)
 #
 # hw serial0 axi_uartlite_0 (40600000) - linux serial0 (ttyUL0)
-QB_XILINX_SERIAL = ""
+QB_XILINX_SERIAL ?= ""
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${MB_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}"
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-post.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
diff --git a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
index 2b4f94d2..0d7f3223 100644
--- a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
@@ -8,9 +8,9 @@ MACHINE_FEATURES += "aie vdu"
 # VEK280 board has 12GB memory only but default versal-generic has QB_MEM set to
 # 8G, Hence we need set 12G in QB_MEM.
-QB_MEM = "-m 12G"
+QB_MEM ?= "-m 12G"
-QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb"
+QEMU_HW_DTB_PS ?= "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb"
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-common.conf b/meta-xilinx-core/conf/machine/versal-common.conf
new file mode 100644
index 00000000..bc530d63
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/versal-common.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: versal-common
+#@DESCRIPTION: Machine configuration for a common Versal filesystem devices
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'versal-common:']['versal-common' != '${MACHINE}']}"
+#### Regular settings follow
+DEFAULTTUNE = "cortexa72"
+require conf/machine/versal-generic.conf
+MACHINE_FEATURES += "aie vdu"
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_common']['versal-common' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 3ae4b800..9aa47892 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -10,12 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'versal-generic:']['versal-generic' != '${MACHINE}'
 # defined before calling the required inclusion file else pre-expansion value
 # defined in local.conf without machine override will not be reflected.
-# Yocto Versal device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree = "-@"
-YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}"
 # Yocto Versal u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 BOOTMODE ?= "generic.root"
@@ -23,68 +17,44 @@ BOOTMODE ?= "generic.root"
 # Yocto Versal arm-trusted-firmware(TF-A) variables
 TFA_BL33_LOAD ?= "0x8000000"
-# Yocto Versal PLM variables
-YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
 # Yocto Versal KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 # Versal Serial Console
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 require conf/machine/include/soc-versal.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
-# versal-generic.conf uses vck190-versal xsa as reference input.
-# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
-# local.conf.
-HDF_MACHINE = "vck190-versal"
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
 # Default SD image build onfiguration, use qemu-sd to pad
 IMAGE_CLASSES += "image-types-xilinx-qemu"
 # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies
 IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot.qemu-sd-fatimg'}"
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    arm-trusted-firmware \
-    virtual/boot-bin \
-    virtual/bootloader \
-    virtual/psm-firmware \
-    virtual/plm \
    u-boot-xlnx-scr \
-    qemu-devicetrees:do_deploy \
-    virtual/cdo:do_deploy \
    "
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
    Image \
    boot.scr \
    "
 # Versal QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 8G"
+QB_MEM ?= "-m 8G"
-QB_DEFAULT_KERNEL = "none"
+QB_DEFAULT_KERNEL ?= "none"
 # Iteration appears to be eth0 then eth1
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
 QB_KERNEL_CMDLINE_APPEND ?= ""
-QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
-QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vck190.dtb"
+QEMU_HW_DTB_PS ?= "${QEMU_HW_DTB_PATH}/board-versal-ps-vck190.dtb"
-QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
+QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 # Four total serial ports defined in this model (according to the dts)
 #
@@ -93,7 +63,7 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 # hw serial2 pl011 (ff000000)              - linux serial0 (ttyAMA0)
 # hw serial3 pl011 (ff010000)              - linux serial1 (ttyAMA1) (disabled)
 # ? dcc ?                                  - linux serial2 (????)
-QB_XILINX_SERIAL = "-serial null -serial null -serial mon:stdio -serial null"
+QB_XILINX_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 QB_OSPI_FILE ??= ""
@@ -119,7 +89,7 @@ QB_FW_FILES = " \
    -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \
    -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
 "
-QB_PLM_OPT += "${@'' if d.getVar('QB_OSPI_FILE') else d.getVar('QB_FW_FILES')}"
+QB_PLM_OPT += "${@d.getVar('QB_FW_FILES') if d.getVar('QB_OSPI_FILE') == '' else ''}"
 QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
diff --git a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
index 9fef78f3..805df7fc 100644
--- a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
@@ -6,9 +6,9 @@ require conf/machine/versal-generic.conf
 # VHK158 has 32GB memory only but default versal-generic has QB_MEM set to 8G,
 # Since versal-vhk158-reva.dts has 32GB set, we need set same in QB_MEM
-QB_MEM = "-m 32G"
+QB_MEM ?= "-m 32G"
-QEMU_HW_DTB_PS =  "${QEMU_HW_DTB_PATH}/board-versal-ps-vhk158.dtb"
+QEMU_HW_DTB_PS ?=  "${QEMU_HW_DTB_PATH}/board-versal-ps-vhk158.dtb"
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-net-common.conf b/meta-xilinx-core/conf/machine/versal-net-common.conf
new file mode 100644
index 00000000..efde0bbb
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/versal-net-common.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: versal-net-common
+#@DESCRIPTION: Machine configuration for a common versal-net filesystem devices
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'versal-net-common:']['versal-net-common' != '${MACHINE}']}"
+#### Regular settings follow
+DEFAULTTUNE = "cortexa78"
+require conf/machine/versal-net-generic.conf
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_net_common']['versal-net-common' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index d6524510..b26fb5e1 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -10,12 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'versal-net-generic:']['versal-net-generic' != '${M
 # defined before calling the required inclusion file else pre-expansion value
 # defined in local.conf without machine override will not be reflected.
-# Yocto Versal device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree = "-@"
-YAML_DT_BOARD_FLAGS ?= "{BOARD versal-net-ipp-rev1.9}"
 # Yocto Versal u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig"
 BOOTMODE ?= "generic.root"
@@ -23,68 +17,44 @@ BOOTMODE ?= "generic.root"
 # Yocto Versal arm-trusted-firmware(TF-A) variables
 TFA_BL33_LOAD ?= "0x8000000"
-# Yocto Versal PLM variables
-YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
 # Yocto Versal KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 # Versal Serial Console
 SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 require conf/machine/include/soc-versal-net.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
-# versal-net-generic.conf uses a qemu only xsa as reference input.
-# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
-# local.conf.
-HDF_MACHINE = "versal-net-generic"
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
 # Default SD image build onfiguration, use qemu-sd to pad
 IMAGE_CLASSES += "image-types-xilinx-qemu"
 # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies
 IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot.qemu-sd-fatimg'}"
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    arm-trusted-firmware \
-    virtual/boot-bin \
-    virtual/bootloader \
-    virtual/psm-firmware \
-    virtual/plm \
    u-boot-xlnx-scr \
-    qemu-devicetrees:do_deploy \
-    virtual/cdo:do_deploy \
    "
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
    Image \
    boot.scr \
    "
 # Versal QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 8G"
+QB_MEM ?= "-m 8G"
-QB_DEFAULT_KERNEL = "none"
+QB_DEFAULT_KERNEL ?= "none"
 # Iteration appears to be eth0 then eth1
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
 QB_KERNEL_CMDLINE_APPEND ?= ""
-QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
-QEMU_HW_DTB_PS =  "${QEMU_HW_DTB_PATH}/board-versal-net-psx-spp-1.4.dtb"
+QEMU_HW_DTB_PS ?=  "${QEMU_HW_DTB_PATH}/board-versal-net-psx-spp-1.4.dtb"
-QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
+QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
 # Four total serial ports defined in this model (according to the dts)
 #
@@ -92,7 +62,7 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
 # hw serial1 xps-uartlite (0xf0310000) - 
 # hw serial2 pl011 (0xf1920000)        - linux serial0 (ttyAMA0)
 # hw serial3 pl011 (0xf1930000)        - linux serial1 (ttyAMA1)
-QB_XILINX_SERIAL = "-serial null -serial null -serial mon:stdio -serial null"
+QB_XILINX_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 QB_OSPI_FILE ??= ""
@@ -114,11 +84,11 @@ QB_PLM_OPT = " \
    "
 QB_FW_FILES = " \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \
+    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw=on \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \
+    -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw=on \
    -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
 "
-QB_PLM_OPT += "${@'' if d.getVar('QB_OSPI_FILE') else d.getVar('QB_FW_FILES')}"
+QB_PLM_OPT += "${@d.getVar('QB_FW_FILES') if d.getVar('QB_OSPI_FILE') == '' else ''}"
 QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
diff --git a/meta-xilinx-core/conf/machine/zynq-common.conf b/meta-xilinx-core/conf/machine/zynq-common.conf
new file mode 100644
index 00000000..f54b6e5b
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/zynq-common.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: zynq-common
+#@DESCRIPTION: Machine configuration for a common Zynq7 filesystem devices
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynq-common:']['zynq-common' != '${MACHINE}']}"
+#### Regular settings follow
+DEFAULTTUNE = "cortexa9thf-neon"
+require conf/machine/zynq-generic.conf
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynq_common']['zynq-common' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index 3dea2012..8442e4e3 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -10,21 +10,10 @@ MACHINEOVERRIDES =. "${@['', 'zynq-generic:']['zynq-generic' != '${MACHINE}']}"
 # defined before calling the required inclusion file else pre-expansion value
 # defined in local.conf without machine override will not be reflected.
-# Yocto Zynq-7000 device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "ps7_uart_1"
-YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PS7_DDR_0"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree = "-@"
-YAML_DT_BOARD_FLAGS ?= "{BOARD zc702}"
 # Yocto Zynq-7000 u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
 BOOTMODE ?= "generic.root"
-# Yocto Zynq-7000 FSBL variables
-YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "ps7_uart_1"
-YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1"
 # Yocto KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
@@ -32,34 +21,18 @@ KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}"
 # Zynq-7000 Serial Console settings
 SERIAL_CONSOLES ?= "115200;ttyPS0"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 require conf/machine/include/soc-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
-# zynq-generic.conf uses zc702-zynq7 xsa as reference input.
-# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
-# local.conf.
-HDF_MACHINE = "zc702-zynq7"
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    virtual/fsbl \
-    virtual/boot-bin \
-    virtual/bootloader \
    u-boot-xlnx-scr \
    "
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
    boot.scr \
    uImage \
    "
@@ -70,10 +43,10 @@ IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == ''
 # Zynq-7000 QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 1024"
+QB_MEM ?= "-m 1024"
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@"
-QB_KERNEL_ROOT = "/dev/mmcblk0p2"
+QB_KERNEL_ROOT ?= "/dev/mmcblk0p2"
 # Side effect of not-enabled serial port is we have to lock
 # the second (console) to mon:stdio.
@@ -82,7 +55,7 @@ QB_KERNEL_ROOT = "/dev/mmcblk0p2"
 #
 # hw uart0 xuartps (e0000000) -
 # hw uart1 xuartps (e0001000) - linux serial0 (ttyPS0)
-QB_XILINX_SERIAL = "-serial null -serial mon:stdio"
+QB_XILINX_SERIAL ?= "-serial null -serial mon:stdio"
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND += " \
diff --git a/meta-xilinx-core/conf/machine/zynqmp-common.conf b/meta-xilinx-core/conf/machine/zynqmp-common.conf
new file mode 100644
index 00000000..e2e112f9
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/zynqmp-common.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: zynqmp-common
+#@DESCRIPTION: Machine configuration for a common ZynqMP (MPSOC) filesystem devices w/o mali400
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynqmp-common:']['zynqmp-common' != '${MACHINE}']}"
+#### Regular settings follow
+DEFAULTTUNE = "cortexa53"
+require conf/machine/zynqmp-generic.conf
+MACHINE_FEATURES += "vcu rfsoc"
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_common']['zynqmp-common' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index b5a2f832..15a48102 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'zynqmp-generic:']['zynqmp-generic' != '${MACHINE}'
 # defined before calling the required inclusion file else pre-expansion value
 # defined in local.conf without machine override will not be reflected.
-# Yocto device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0"
-YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree = "-@"
-YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}"
 # Yocto ZynqMP u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 BOOTMODE ?= "generic.root"
@@ -30,31 +23,17 @@ SPL_BINARY ?= ""
 # Yocto ZynqMP arm-trusted-firmware(TF-A) variables
 TFA_BL33_LOAD ?= "0x8000000"
-# Yocto ZynqMP PMUFW variables
-YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0"
-# Yocto ZynqMP FSBL variables
-YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0"
 # Yocto ZynqMP KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 # ZynqMP Serial Console
 SERIAL_CONSOLES ?= "115200;ttyPS0 115200;ttyPS1"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 require conf/machine/include/soc-zynqmp.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
-# zynqmp-generic.conf uses zcu102-zynqmp xsa as reference input.
-# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
-# local.conf.
-HDF_MACHINE = "zcu102-zynqmp"
 # Machine features must result in a superset
 # Basic features:
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth"
@@ -64,40 +43,28 @@ IMAGE_CLASSES += "image-types-xilinx-qemu"
 # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies
 IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot'}"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    virtual/fsbl \
-    virtual/pmu-firmware \
-    arm-trusted-firmware \
-    virtual/boot-bin \
    virtual/bootloader \
-    qemu-devicetrees:do_deploy \
    u-boot-xlnx-uenv \
    u-boot-xlnx-scr \
    "
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
    boot.scr \
    Image \
    "
 # ZynqMP QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 4096"
+QB_MEM ?= "-m 4096"
 # Iteration appears to be eth3, eth2, eth1, eth0
-QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
+QB_NETWORK_DEVICE ?= "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
 # Set variables for QEMU DTB PATH, PS DTB and PMU DTB for zynqmp_generic, this
 # allows user to use different QEMU HW DTB to match their board.
-QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
-QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/zcu102-arm.dtb"
+QEMU_HW_DTB_PS ?= "${QEMU_HW_DTB_PATH}/zcu102-arm.dtb"
-QEMU_HW_DTB_PMU = "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
+QEMU_HW_DTB_PMU ?= "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
 # Two total serial ports defined in this model (according to the dts)
 #
diff --git a/meta-xilinx-core/conf/machine/zynqmp-mali-common.conf b/meta-xilinx-core/conf/machine/zynqmp-mali-common.conf
new file mode 100644
index 00000000..7b5dc68c
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/zynqmp-mali-common.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: zynqmp-mali-common
+#@DESCRIPTION: Machine configuration for a common ZynqMP (MPSOC) filesystem devices w/ mali400
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynqmp-mali-common:']['zynqmp-mali-common' != '${MACHINE}']}"
+#### Regular settings follow
+DEFAULTTUNE = "cortexa53"
+require conf/machine/zynqmp-generic.conf
+MACHINE_FEATURES += "mali400 vcu"
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_mali_common']['zynqmp-mali-common' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend
index 7dcee565..7d374291 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend
@@ -3,19 +3,19 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 # openamp.dtsi is in the WORKDIR
 DT_INCLUDE:append = " ${WORKDIR}"
-do_configure[vardeps] += "ENABLE_OPENAMP_DTSI OPENAMP_EXTRA_OVERLAYS"
+do_configure[vardeps] += "ENABLE_OPENAMP_DTSI OPENAMP_EXTRA_DT_INCLUDE_FILES"
-OPENAMP_EXTRA_OVERLAYS:zynq = "zynq-openamp.dtsi"
+OPENAMP_EXTRA_DT_INCLUDE_FILES ?= ""
-OPENAMP_EXTRA_OVERLAYS:zynqmp = "zynqmp-openamp.dtsi"
+OPENAMP_EXTRA_DT_INCLUDE_FILES:zynqmp = "zynqmp-openamp.dtsi"
-OPENAMP_EXTRA_OVERLAYS:versal = "versal-openamp.dtsi"
+OPENAMP_EXTRA_DT_INCLUDE_FILES:versal = "versal-openamp.dtsi"
-OPENAMP_EXTRA_OVERLAYS:versal-net = "versal-net-openamp.dtsi"
+OPENAMP_EXTRA_DT_INCLUDE_FILES:versal-net = "versal-net-openamp.dtsi"
-def set_openamp_extra_overlays(d):
+def set_openamp_extra_dt_include_files(d):
    distro_features = d.getVar('DISTRO_FEATURES', True)
    enable_openamp_dtsi = d.getVar('ENABLE_OPENAMP_DTSI')
    if 'openamp' in distro_features and enable_openamp_dtsi == '1':
-        return ' ${OPENAMP_EXTRA_OVERLAYS}'
+        return ' ${OPENAMP_EXTRA_DT_INCLUDE_FILES}'
    else:
        return ''
-EXTRA_OVERLAYS:append = "${@set_openamp_extra_overlays(d)}"
+EXTRA_DT_INCLUDE_FILES:append = "${@set_openamp_extra_dt_include_files(d)}"
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 a918faf2..a1c939eb 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
@@ -53,7 +53,7 @@
                reg = <0x0 0xeba00000 0x0 0x10000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&versal_net_firmware 0x183180cb>;
+                power-domains = <&versal_net_firmware 0x183180cb>;
        };
        tcm_0b: tcm_0b@eba10000 {
@@ -61,7 +61,7 @@
                reg = <0x0 0xeba10000 0x0 0x8000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&versal_net_firmware 0x183180cc>;
+                power-domains = <&versal_net_firmware 0x183180cc>;
        };
        tcm_0c: tcm_0b@eba20000 {
@@ -69,7 +69,7 @@
                reg = <0x0 0xeba20000 0x0 0x8000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&versal_net_firmware 0x183180cd>;
+                power-domains = <&versal_net_firmware 0x183180cd>;
        };
        tcm_1a: tcm_0a@eba40000 {
@@ -77,7 +77,7 @@
                reg = <0x0 0xeba40000 0x0 0x10000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&versal_net_firmware 0x183180ce>;
+                power-domains = <&versal_net_firmware 0x183180ce>;
        };
        tcm_1b: tcm_0b@eba50000 {
@@ -85,7 +85,7 @@
                reg = <0x0 0xeba50000 0x0 0x8000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&versal_net_firmware 0x183180cf>;
+                power-domains = <&versal_net_firmware 0x183180cf>;
        };
        tcm_1c: tcm_0b@eba60000 {
@@ -93,7 +93,7 @@
                reg = <0x0 0xeba60000 0x0 0x8000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&versal_net_firmware 0x183180d0>;
+                power-domains = <&versal_net_firmware 0x183180d0>;
        };
        r52ss {
@@ -110,7 +110,7 @@
                        ranges;
                        sram = <&tcm_0a>, <&tcm_0b>, <&tcm_0c>;
                        memory-region = <&rproc_0_reserved>, <&rpu0vdev0buffer>, <&rpu0vdev0vring0>, <&rpu0vdev0vring1>;
-                        power-domain = <&versal_net_firmware 0x181100BF>;
+                        power-domains = <&versal_net_firmware 0x181100BF>;
                        mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>;
                        mbox-names = "tx", "rx";
                };
@@ -121,7 +121,7 @@
                        ranges;
                        sram = <&tcm_1a>, <&tcm_1b>, <&tcm_1c>;
                        memory-region = <&rproc_1_reserved>, <&rpu1vdev0buffer>, <&rpu1vdev0vring0>, <&rpu1vdev0vring1>;
-                        power-domain = <&versal_net_firmware 0x181100C0>;
+                        power-domains = <&versal_net_firmware 0x181100C0>;
                        mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>;
                        mbox-names = "tx", "rx";
                };
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-openamp.dtsi b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-openamp.dtsi
index 01e337c7..b21b4096 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-openamp.dtsi
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-openamp.dtsi
@@ -52,7 +52,7 @@
                reg = <0x0 0xffe00000 0x0 0x10000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&versal_firmware 0x1831800b>;
+                power-domains = <&versal_firmware 0x1831800b>;
        };
        tcm_0b: tcm_0b@ffe20000 {
@@ -60,7 +60,7 @@
                reg = <0x0 0xffe20000 0x0 0x10000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&versal_firmware 0x1831800c>;
+                power-domains = <&versal_firmware 0x1831800c>;
        };
        tcm_1a: tcm_1a@ffe90000 {
@@ -68,7 +68,7 @@
                reg = <0x0 0xffe90000 0x0 0x10000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&versal_firmware 0x1831800d>;
+                power-domains = <&versal_firmware 0x1831800d>;
        };
        tcm_1b: tcm_1b@ffeb0000 {
@@ -76,7 +76,7 @@
                reg = <0x0 0xffeb0000 0x0 0x10000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&versal_firmware 0x1831800e>;
+                power-domains = <&versal_firmware 0x1831800e>;
        };
        rf5ss@ff9a0000 {
@@ -94,7 +94,7 @@
                        ranges;
                        sram = <&tcm_0a>, <&tcm_0b>;
                        memory-region = <&rproc_0_reserved>, <&rpu0vdev0buffer>, <&rpu0vdev0vring0>, <&rpu0vdev0vring1>;
-                        power-domain = <&versal_firmware 0x18110005>;
+                        power-domains = <&versal_firmware 0x18110005>;
                        mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>;
                        mbox-names = "tx", "rx";
                };
@@ -105,7 +105,7 @@
                        ranges;
                        sram = <&tcm_1a>, <&tcm_1b>;
                        memory-region = <&rproc_1_reserved>, <&rpu1vdev0buffer>, <&rpu1vdev0vring0>, <&rpu1vdev0vring1>;
-                        power-domain = <&versal_firmware 0x18110006>;
+                        power-domains = <&versal_firmware 0x18110006>;
                        mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>;
                        mbox-names = "tx", "rx";
                };
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynq-openamp-overlay.dts b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynq-openamp-overlay.dts
deleted file mode 100644
index b5d238ff..00000000
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynq-openamp-overlay.dts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * dts overlay file for Zynq OpenAMP
- *
- * Copyright (C) 2022, Advanced Micro Devices, Inc.  All rights reserved.
- *
- */
-/dts-v1/;
-/plugin/;
-#include "zynq-openamp.dtsi"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynq-openamp.dtsi b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynq-openamp.dtsi
deleted file mode 100644
index 0e822202..00000000
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynq-openamp.dtsi
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * dts file for Zynq OpenAMP
- *
- * Copyright (C) 2022, Advanced Micro Devices, Inc.  All rights reserved.
- *
- */
-&{/} {
-        reserved-memory {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                ranges;
-                vdev0vring0: vdev0vring0@3e800000 {
-                        no-map;
-                        compatible = "shared-dma-pool";
-                        reg = <0x3e800000 0x4000>;
-                };
-                vdev0vring1: vdev0vring1@3e804000 {
-                        no-map;
-                        compatible = "shared-dma-pool";
-                        reg = <0x3e804000 0x4000>;
-                };
-                vdev0buffer: vdev0buffer@3e808000 {
-                        no-map;
-                        compatible = "shared-dma-pool";
-                        reg = <0x3e808000 0x100000>;
-                };
-                rproc_0_reserved: rproc@3e000000 {
-                        no-map;
-                        compatible = "shared-dma-pool";
-                        reg = <0x3e000000 0x800000>;
-                };
-        };
-        remoteproc0: remoteproc@0 {
-                compatible = "xlnx,zynq_remoteproc";
-                firmware = "firmware";
-                memory-region = <&rproc_0_reserved>, <&vdev0buffer>, <&vdev0vring0>, <&vdev0vring1>;
-                interrupt-parent = <&intc>;
-        };
-};
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 8ef72656..1ad51fef 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
@@ -52,7 +52,7 @@
                reg = <0x0 0xffe00000 0x0 0x10000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&zynqmp_firmware 15>;
+                power-domains = <&zynqmp_firmware 15>;
        };
        tcm_0b: tcm_0b@ffe20000 {
@@ -60,14 +60,14 @@
                reg = <0x0 0xffe20000 0x0 0x10000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&zynqmp_firmware 16>;
+                power-domains = <&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>;
+                power-domains = <&zynqmp_firmware 17>;
        };
        tcm_1b: tcm_0b@ffeb0000 {
@@ -75,7 +75,7 @@
                reg = <0x0 0xffeb0000 0x0 0x10000>;
                status = "okay";
                compatible = "mmio-sram";
-                power-domain = <&zynqmp_firmware 18>;
+                power-domains = <&zynqmp_firmware 18>;
        };
        rf5ss@ff9a0000 {
                compatible = "xlnx,zynqmp-r5-remoteproc";
@@ -92,7 +92,7 @@
                        ranges;
                        sram = <&tcm_0a>, <&tcm_0b>;
                        memory-region = <&rproc_0_reserved>, <&rpu0vdev0buffer>, <&rpu0vdev0vring0>, <&rpu0vdev0vring1>;
-                        power-domain = <&zynqmp_firmware 7>;
+                        power-domains = <&zynqmp_firmware 7>;
                        mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>;
                        mbox-names = "tx", "rx";
                };
@@ -103,7 +103,7 @@
                        ranges;
                        sram = <&tcm_1a>, <&tcm_1b>;
                        memory-region = <&rproc_1_reserved>, <&rpu1vdev0buffer>, <&rpu1vdev0vring0>, <&rpu1vdev0vring1>;
-                        power-domain = <&zynqmp_firmware 8>;
+                        power-domains = <&zynqmp_firmware 8>;
                        mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>;
                        mbox-names = "tx", "rx";
                };
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb
index 9f481fec..7b626ee3 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb
@@ -5,8 +5,6 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 SRC_URI = " \
-    file://zynq-openamp.dtsi \
-    file://zynq-openamp-overlay.dts \
    file://zynqmp-openamp.dtsi \
    file://zynqmp-openamp-overlay.dts \
    file://versal-openamp.dtsi \
@@ -18,7 +16,6 @@ SRC_URI = " \
 # We don't have anything to include from the kernel
 KERNEL_INCLUDE = ""
-COMPATIBLE_MACHINE:zynq = "${MACHINE}"
 COMPATIBLE_MACHINE:zynqmp = "${MACHINE}"
 COMPATIBLE_MACHINE:versal = "${MACHINE}"
 COMPATIBLE_MACHINE:versal-net = "${MACHINE}"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-core/packagegroups/packagegroup-openamp.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-core/packagegroups/packagegroup-openamp.bb
new file mode 100644
index 00000000..13992ebc
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-core/packagegroups/packagegroup-openamp.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "OpenAMP supported packages"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+# We don't support Zynq
+COMPATIBLE_MACHINE:zynq = "$^"
+inherit packagegroup features_check
+REQUIRED_DISTRO_FEATURES = "openamp"
+PACKAGES = "\
+        packagegroup-openamp-echo-test \
+        packagegroup-openamp-matrix-mul \
+        packagegroup-openamp-rpc-demo \
+        packagegroup-openamp \
+        "
+RDEPENDS:${PN}-echo-test = "rpmsg-echo-test"
+RDEPENDS:${PN}-echo-test:append:zcu102-zynqmp = " openamp-fw-echo-testd"
+RDEPENDS:${PN}-matrix-mul = "rpmsg-mat-mul"
+RDEPENDS:${PN}-matrix-mul:append:zcu102-zynqmp = " openamp-fw-mat-muld"
+RDEPENDS:${PN}-rpc-demo = "rpmsg-proxy-app"
+RDEPENDS:${PN}-rpc-demo:append:zcu102-zynqmp = " openamp-fw-rpc-demo"
+RDEPENDS:${PN}:append = " ${@'open-amp-device-tree' if d.getVar('ENABLE_OPENAMP_DTSI') != '1' else ''}"
+RDEPENDS:${PN}:append = " \
+        libmetal \
+        libmetal-demos \
+        open-amp \
+        open-amp-demos \
+        packagegroup-openamp-echo-test \
+        packagegroup-openamp-matrix-mul \
+        packagegroup-openamp-rpc-demo \
+        "
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
index a03912d7..9ca9cbc1 100644
--- 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
@@ -1,8 +1,8 @@
 SRCBRANCH ?= "2024"
-SRCREV = "e2fdb4fecbebe41b4cd1c0b4fbfa3496bcded485"
+SRCREV = "9e9997221ddd335c31cf881edf7026c762024a58"
 BRANCH = "xlnx_rel_v2024.1"
 LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
-PV = "${SRCBRANCH}+git"
+PV .= "+git"
 REPO = "git://github.com/Xilinx/libmetal.git;protocol=https"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.2.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.2.bb
new file mode 100644
index 00000000..bcde904d
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.2.bb
@@ -0,0 +1,16 @@
+SRCBRANCH ?= "2024"
+SRCREV = "e2fdb4fecbebe41b4cd1c0b4fbfa3496bcded485"
+BRANCH = "xlnx_rel_v2024.2"
+LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
+PV .= "+git"
+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
index 94535abc..29d4bc4f 100644
--- 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
@@ -1,8 +1,8 @@
 SRCBRANCH ?= "2024"
-SRCREV = "dbf0857389190f4c4cedfb77bd1f9bdd7ab404f3"
+SRCREV = "699ad2c5b9236d61aae1b89e2857361db1bfeb95"
 BRANCH = "xlnx_rel_v2024.1"
 LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
-PV = "${SRCBRANCH}+git"
+PV .= "+git"
 REPO = "git://github.com/Xilinx/open-amp.git;protocol=https"
 include ${LAYER_PATH_openamp-layer}/recipes-openamp/open-amp/open-amp.inc
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.2.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.2.bb
new file mode 100644
index 00000000..06c2ecbc
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.2.bb
@@ -0,0 +1,16 @@
+SRCBRANCH ?= "2024"
+SRCREV = "47caef116ccbf5d5a9778082a98fe8f3710b549c"
+BRANCH = "xlnx_rel_v2024.2"
+LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
+PV .= "+git"
+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_%.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202210.2.13.479.bbappend
index 0e7f3693..0e7f3693 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_%.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202210.2.13.479.bbappend
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend
new file mode 100644
index 00000000..0e7f3693
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend
@@ -0,0 +1,8 @@
+# Use libmetal for systems with AIE
+# For versal devices with the ai-engine
+PACKAGE_ARCH_orig := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}"
+EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}"
+TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}"
+DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}"
+RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend
index 362dc45a..a7ab6bb8 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend
@@ -1,2 +1,9 @@
-# Older xrt requires a manual dependency on libmetal
+# Use libmetal for systems with AIE
-DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libmetal', '', d)}"
+# For versal devices with the ai-engine
+PACKAGE_ARCH_orig := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}"
+EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}"
+TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}"
+DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal libmetal', '', d)}"
+RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend
index 362dc45a..a7ab6bb8 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend
@@ -1,2 +1,9 @@
-# Older xrt requires a manual dependency on libmetal
+# Use libmetal for systems with AIE
-DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libmetal', '', d)}"
+# For versal devices with the ai-engine
+PACKAGE_ARCH_orig := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}"
+EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}"
+TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}"
+DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal libmetal', '', d)}"
+RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202410.2.17.319.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202410.2.17.319.bbappend
new file mode 100644
index 00000000..0e7f3693
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202410.2.17.319.bbappend
@@ -0,0 +1,8 @@
+# Use libmetal for systems with AIE
+# For versal devices with the ai-engine
+PACKAGE_ARCH_orig := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}"
+EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}"
+TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}"
+DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}"
+RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}"
diff --git a/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-xf86-video-armosc-Accelerate-picture-composition.patch b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-xf86-video-armosc-Accelerate-picture-composition.patch
new file mode 100644
index 00000000..3fa4d6ec
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-xf86-video-armosc-Accelerate-picture-composition.patch
@@ -0,0 +1,1058 @@
+From 015f8a54f7e5a754e1cefba1aa7b1f6992a8aa9b Mon Sep 17 00:00:00 2001
+From: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
+Date: Tue, 16 Jul 2024 19:48:47 +0000
+Subject: [PATCH] xf86-video-armosc: Accelerate picture composition
+Introduce Repulsion - simplistic GPU accelerated compositor to back RandR
+display manipulation features. This library is inspired by Glamor extension
+https://www.freedesktop.org/wiki/Software/Glamor/. Unfortunately Glamor
+doesn't work as is on ARM Mali-400 MP due to the lack of required features
+and several bugs in Mali EGL/GLES implementation.
+Install and manage picture compositor hooks.
+Provide access to dma-buf fd from ARSOC buffer object.
+Attach shadow buffer object to corresponding pixmap.
+Signed-off-by: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
+---
+ src/Makefile.am        |   3 +-
+ src/armsoc_driver.c    | 145 ++++++++++
+ src/armsoc_driver.h    |   7 +
+ src/armsoc_dumb.c      |   8 +
+ src/armsoc_dumb.h      |   1 +
+ src/armsoc_exa.c       |  18 +-
+ src/armsoc_repulsion.c | 624 +++++++++++++++++++++++++++++++++++++++++
+ src/armsoc_repulsion.h |  67 +++++
+ 8 files changed, 867 insertions(+), 6 deletions(-)
+ create mode 100644 src/armsoc_repulsion.c
+ create mode 100644 src/armsoc_repulsion.h
+diff --git a/src/Makefile.am b/src/Makefile.am
+index db5f110..cd4f795 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -38,7 +38,7 @@ ERROR_CFLAGS = -Werror -Wall -Wdeclaration-after-statement -Wvla \
+ AM_CFLAGS = @XORG_CFLAGS@ $(ERROR_CFLAGS)
+ armsoc_drv_la_LTLIBRARIES = armsoc_drv.la
+ armsoc_drv_la_LDFLAGS = -module -avoid-version -no-undefined
+-armsoc_drv_la_LIBADD = @XORG_LIBS@
+armsoc_drv_la_LIBADD = -lMali @XORG_LIBS@
+ armsoc_drv_ladir = @moduledir@/drivers
+ DRMMODE_SRCS = drmmode_exynos/drmmode_exynos.c \
+        drmmode_pl111/drmmode_pl111.c \
+@@ -54,4 +54,5 @@ armsoc_drv_la_SOURCES = \
+          armsoc_dri2.c \
+          armsoc_driver.c \
+          armsoc_dumb.c \
+         armsoc_repulsion.c \
+          $(DRMMODE_SRCS)
+diff --git a/src/armsoc_driver.c b/src/armsoc_driver.c
+index a4a1ba3..f5b8f21 100644
+--- a/src/armsoc_driver.c
+++ b/src/armsoc_driver.c
+@@ -42,6 +42,7 @@
+ #include <pixman.h>
+ 
+ #include "armsoc_driver.h"
+#include "armsoc_repulsion.h"
+ 
+ #include "micmap.h"
+ 
+@@ -971,6 +972,138 @@ ARMSOCAccelInit(ScreenPtr pScreen)
+                pARMSOC->dri = FALSE;
+ }
+ 
+#define ARMSOC_ACCEL_MIN_DIMS  200
+
+/**
+ * Classify compositor input to figure out if we can accelerate composition
+ */
+static Bool
+ARMSOCCanAccelerateComposition(CARD8 op,
+                                                          PicturePtr src,
+                                                          PicturePtr mask,
+                                                          PicturePtr dest,
+                                                          CARD16 width,
+                                                          CARD16 height)
+{
+       /* We only support source to destination pixmap copy */
+       if (op != PictOpSrc)
+               return FALSE;
+
+       /*
+        * Don't accelerate small picture compositions, e.g. toolbars, cursor,
+        * icons, etc.
+        */
+       if (width < ARMSOC_ACCEL_MIN_DIMS || height < ARMSOC_ACCEL_MIN_DIMS)
+               return FALSE;
+
+       /* Check source picture */
+       if (!src || !src->pDrawable)
+               return FALSE;
+
+       /* Check destination picture constraints */
+       if (!dest || !dest->pDrawable || dest->pDrawable->type != DRAWABLE_PIXMAP)
+               return FALSE;
+
+       /* We don't support masking */
+       if (mask)
+               return FALSE;
+
+       /*
+        * We expect source transform to be assigned, otherwise there is not much
+        * to accelerate
+        */
+       if (!src->transform)
+               return FALSE;
+
+       /* We expect buffer object to be assigned to source */
+       if (!draw2pix(src->pDrawable))
+               return FALSE;
+
+       /* We expect buffer object to be assigned to destination */
+       if (!draw2pix(dest->pDrawable))
+               return FALSE;
+
+       return TRUE;
+}
+
+/**
+ * This callback will be invoked every time xserver needs to combine  2
+ * pictures. Our special interest is the case when we need to blit draw buffer
+ * into shadow buffer while performing rotation or reflection. Without
+ * acceleration such composition will end up in tons of matrix multiplications
+ * for every pixel, which is obviously very slow. Here we need to detect such
+ * cases and accelerate the composition on the GPU.
+ */
+static void
+ARMSOCComposite(CARD8 op,
+                               PicturePtr src,
+                               PicturePtr mask,
+                               PicturePtr dest,
+                               INT16 x_src,
+                               INT16 y_src,
+                               INT16 x_mask,
+                               INT16 y_mask,
+                               INT16 x_dest,
+                               INT16 y_dest,
+                               CARD16 width,
+                               CARD16 height)
+{
+       ScreenPtr pScreen = dest->pDrawable->pScreen;
+       PictureScreenPtr ps = GetPictureScreen(pScreen);
+       ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+       struct ARMSOCRec *pARMSOC = ARMSOCPTR(pScrn);
+    struct armsoc_bo *src_bo = NULL, *dest_bo = NULL;
+       float xform_matrix[3][3] = {};
+
+       Bool can_accelerate =
+               ARMSOCCanAccelerateComposition(op, src, mask, dest, width, height);
+
+
+       if (can_accelerate) {
+               /* Transpose, scale & adjust transformation matrix */
+               int x, y;
+               for (y = 0; y < 3; ++y)
+                       for (x = 0; x < 3; ++x)
+                               xform_matrix[x][y] =
+                                       (float)src->transform->matrix[y][x] / 65536.f;
+               /*
+                * TODO: Figure out coordinate system where these sins make sence,
+                * insted of just reversing them
+                */
+               xform_matrix[0][1] = -xform_matrix[0][1];
+               xform_matrix[1][0] = -xform_matrix[1][0];
+       }
+
+       /* Extract source buffer object */
+       if (can_accelerate) {
+               PixmapPtr pm = draw2pix(src->pDrawable);
+               src_bo = ARMSOCPixmapBo(pm);
+       }
+
+       /* Extract destination buffer object */
+       if (can_accelerate) {
+               PixmapPtr pm = draw2pix(dest->pDrawable);
+               dest_bo = ARMSOCPixmapBo(pm);
+       }
+
+       if (can_accelerate &&
+               armsoc_repulsion_composite(pARMSOC->repulsion,
+                                                                  src_bo,
+                                                                  dest_bo,
+                                                                  xform_matrix)) {
+       } else {
+               /* Fallback to saved compositor if accelerated composition fails */
+               pARMSOC->composite_proc(op, src, mask, dest,
+                                                               x_src, y_src, x_mask, y_mask,
+                                                               x_dest, y_dest, width, height);
+       }
+
+       if (ps->Composite != ARMSOCComposite) {
+               pARMSOC->composite_proc = ps->Composite;
+               ps->Composite = ARMSOCComposite;
+       }
+}
+
+ /**
+  * The driver's ScreenInit() function, called at the start of each server
+  * generation. Fill in pScreen, map the frame buffer, save state,
+@@ -986,6 +1119,7 @@ ARMSOCScreenInit(SCREEN_INIT_ARGS_DECL)
+        struct ARMSOCRec *pARMSOC = ARMSOCPTR(pScrn);
+        VisualPtr visual;
+        xf86CrtcConfigPtr xf86_config;
+       PictureScreenPtr ps;
+        int j;
+        const char *fbdev;
+        int depth;
+@@ -1174,6 +1308,13 @@ ARMSOCScreenInit(SCREEN_INIT_ARGS_DECL)
+                pARMSOC->lockFD = -1;
+        }
+ 
+       pARMSOC->repulsion = armsoc_repulsion_init();
+
+       ps = GetPictureScreen(pScreen);
+       pARMSOC->composite_proc = ps->Composite;
+
+       ps->Composite = ARMSOCComposite;
+
+        TRACE_EXIT();
+        return TRUE;
+ 
+@@ -1250,6 +1391,8 @@ ARMSOCCloseScreen(CLOSE_SCREEN_ARGS_DECL)
+ 
+        TRACE_ENTER();
+ 
+       armsoc_repulsion_release(pARMSOC->repulsion);
+
+        drmmode_screen_fini(pScrn);
+        drmmode_cursor_fini(pScreen);
+ 
+@@ -1294,6 +1437,8 @@ ARMSOCCloseScreen(CLOSE_SCREEN_ARGS_DECL)
+                pARMSOC->lockFD = -1;
+        }
+ 
+       armsoc_repulsion_release(pARMSOC->repulsion);
+
+        TRACE_EXIT();
+ 
+        return ret;
+diff --git a/src/armsoc_driver.h b/src/armsoc_driver.h
+index eae76ca..20b0f80 100644
+--- a/src/armsoc_driver.h
+++ b/src/armsoc_driver.h
+@@ -38,6 +38,7 @@
+ #include "xf86drm.h"
+ #include <errno.h>
+ #include "armsoc_exa.h"
+#include "armsoc_repulsion.h"
+ 
+ /* Apparently not used by X server */
+ #define ARMSOC_VERSION         1000
+@@ -183,6 +184,12 @@ struct ARMSOCRec {
+        /* Size of the swap chain. Set to 1 if DRI2SwapLimit unsupported,
+         * driNumBufs if early display enabled, otherwise driNumBufs-1 */
+        unsigned int                       swap_chain_size;
+
+       /* GPU accelerated picture compositor, AKA Repulsion */
+       struct ARMSOCRepulsion                          *repulsion;
+
+       /* SW (pixman based) picture compositor fallback */
+       CompositeProcPtr composite_proc;
+ };
+ 
+ /*
+diff --git a/src/armsoc_dumb.c b/src/armsoc_dumb.c
+index 7e6dbd9..3c16ed2 100644
+--- a/src/armsoc_dumb.c
+++ b/src/armsoc_dumb.c
+@@ -130,6 +130,14 @@ int armsoc_bo_has_dmabuf(struct armsoc_bo *bo)
+        return bo->dmabuf >= 0;
+ }
+ 
+int armsoc_bo_get_dmabuf(struct armsoc_bo *bo)
+{
+       if (!armsoc_bo_has_dmabuf(bo))
+               armsoc_bo_set_dmabuf(bo);
+
+       return bo->dmabuf;
+}
+
+ struct armsoc_bo *armsoc_bo_new_with_dim(struct armsoc_device *dev,
+                        uint32_t width, uint32_t height, uint8_t depth,
+                        uint8_t bpp, enum armsoc_buf_type buf_type)
+diff --git a/src/armsoc_dumb.h b/src/armsoc_dumb.h
+index a299ccf..3b687c7 100644
+--- a/src/armsoc_dumb.h
+++ b/src/armsoc_dumb.h
+@@ -89,6 +89,7 @@ void armsoc_bo_unreference(struct armsoc_bo *bo);
+ int armsoc_bo_set_dmabuf(struct armsoc_bo *bo);
+ void armsoc_bo_clear_dmabuf(struct armsoc_bo *bo);
+ int armsoc_bo_has_dmabuf(struct armsoc_bo *bo);
+int armsoc_bo_get_dmabuf(struct armsoc_bo *bo);
+ int armsoc_bo_clear(struct armsoc_bo *bo);
+ int armsoc_bo_rm_fb(struct armsoc_bo *bo);
+ int armsoc_bo_resize(struct armsoc_bo *bo, uint32_t new_width,
+diff --git a/src/armsoc_exa.c b/src/armsoc_exa.c
+index a310727..7edf0ac 100644
+--- a/src/armsoc_exa.c
+++ b/src/armsoc_exa.c
+@@ -161,10 +161,16 @@ ARMSOCModifyPixmapHeader(PixmapPtr pPixmap, int width, int height,
+        ScrnInfoPtr pScrn = pix2scrn(pPixmap);
+        struct ARMSOCRec *pARMSOC = ARMSOCPTR(pScrn);
+        enum armsoc_buf_type buf_type = ARMSOC_BO_NON_SCANOUT;
+       struct armsoc_bo *fb_bo = NULL;
+ 
+     /* Only modify specified fields, keeping all others intact. */
+-       if (pPixData)
+       if (pPixData) {
+                pPixmap->devPrivate.ptr = pPixData;
+               if (pARMSOC->shadow && pPixData == armsoc_bo_map(pARMSOC->shadow))
+                       fb_bo = pARMSOC->shadow;
+               else if (pPixData == armsoc_bo_map(pARMSOC->scanout))
+                       fb_bo = pARMSOC->scanout;
+       }
+ 
+        if (devKind > 0)
+                pPixmap->devKind = devKind;
+@@ -173,7 +179,7 @@ ARMSOCModifyPixmapHeader(PixmapPtr pPixmap, int width, int height,
+         * We can't accelerate this pixmap, and don't ever want to
+         * see it again..
+         */
+-       if (pPixData && pPixData != armsoc_bo_map(pARMSOC->scanout)) {
+       if (pPixData && fb_bo && pPixData != armsoc_bo_map(fb_bo)) {
+                /* scratch-pixmap (see GetScratchPixmapHeader()) gets recycled,
+                 * so could have a previous bo!
+                 * Pixmap drops ref on its old bo */
+@@ -185,10 +191,10 @@ ARMSOCModifyPixmapHeader(PixmapPtr pPixmap, int width, int height,
+        }
+ 
+        /* Replacing the pixmap's current bo with the scanout bo */
+-       if (pPixData == armsoc_bo_map(pARMSOC->scanout) && priv->bo != pARMSOC->scanout) {
+       if (fb_bo && pPixData == armsoc_bo_map(fb_bo) && priv->bo != fb_bo) {
+                struct armsoc_bo *old_bo = priv->bo;
+ 
+-               priv->bo = pARMSOC->scanout;
+               priv->bo = fb_bo;
+                /* pixmap takes a ref on its new bo */
+                armsoc_bo_reference(priv->bo);
+ 
+@@ -225,7 +231,9 @@ ARMSOCModifyPixmapHeader(PixmapPtr pPixmap, int width, int height,
+        if (!pPixmap->drawable.width || !pPixmap->drawable.height)
+                return TRUE;
+ 
+-       assert(priv->bo);
+       if(!priv->bo)
+               return FALSE;
+
+        if (armsoc_bo_width(priv->bo) != pPixmap->drawable.width ||
+            armsoc_bo_height(priv->bo) != pPixmap->drawable.height ||
+            armsoc_bo_bpp(priv->bo) != pPixmap->drawable.bitsPerPixel) {
+diff --git a/src/armsoc_repulsion.c b/src/armsoc_repulsion.c
+new file mode 100644
+index 0000000..1a7c0cd
+--- /dev/null
+++ b/src/armsoc_repulsion.c
+@@ -0,0 +1,624 @@
+/*
+ * Copyright (C) 2024 AMD, Inc.
+ *
+ * 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 (including the next
+ * paragraph) 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.
+ *
+ * Author: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
+ *
+ */
+
+#include "armsoc_repulsion.h"
+
+#include <stdlib.h>
+#include <drm_fourcc.h>
+
+#define EGL_GL_PROTOTYPES 1
+#include <EGL/egl.h>
+#define EGL_EGLEXT_PROTOTYPES 1
+#include <EGL/eglext.h>
+#include <GLES2/gl2.h>
+#define GL_GLEXT_PROTOTYPES 1
+#include <GLES2/gl2ext.h>
+
+#include <xf86.h>
+
+/* -----------------------------------------------------------------------------
+ * Utilities
+ */
+
+#define INFO_LOG(fmt, ...) \
+do { xf86DrvMsg(0, X_INFO, fmt "\n", ##__VA_ARGS__); } while (0)
+
+#define WARN_LOG(fmt, ...) \
+do { xf86DrvMsg(0, X_WARNING, "WARNING: " fmt "\n", ##__VA_ARGS__); } while (0)
+
+#define ERROR_LOG(fmt, ...) \
+do { xf86DrvMsg(0, X_ERROR, "ERROR: " fmt "\n", ##__VA_ARGS__); } while (0)
+
+/**
+ * struct RepulsiveVertex - vertex data used for rendering
+ * @pos: vertex position in the screen coordinate  space
+ * @uv: texture coordinate bound to this vertex
+ */
+struct RepulsiveVertex {
+    GLfloat pos[3];
+    GLfloat uv[2];
+};
+
+/**
+ * struct ARMSOCRepulsion - GPU acceleration data
+ * @egl: EGL specific bits
+ * @egl.display: EGL display connection
+ * @egl.context: EGL context
+ * @egl.surface: primary EGL surface
+ * @gles: OpenGL ES related bits
+ * @gles.vbo: Vertex buffer object
+ * @gles.ibo: Index buffer object
+ * @gles.texture: External texture object
+ * @gles.proj_location: Shader location for projection matrix
+ * @gles.xform_location: Shader location for transformation matrix
+ * @gles.vertices: Array of vertices used in rendering
+ */
+struct ARMSOCRepulsion {
+    struct {
+        EGLDisplay display;
+        EGLContext context;
+        EGLSurface surface;
+    } egl;
+    struct {
+        GLuint  vbo;
+        GLuint  ibo;
+        GLuint  texture;
+        GLuint  program;
+        GLint   proj_location;
+        GLint   xform_location;
+        struct RepulsiveVertex vertices[4];
+    } gles;
+};
+
+/* -----------------------------------------------------------------------------
+ * GLES2 Functions
+ */
+
+static const char *vertex_shader = "                                \
+precision highp float;                                              \
+                                                                    \
+uniform mat3 u_projection;                                          \
+uniform mat3 u_transform;                                           \
+attribute vec3 a_position;                                          \
+attribute vec2 a_texcoord;                                          \
+                                                                    \
+varying vec2 v_texcoord;                                            \
+                                                                    \
+void main()                                                         \
+{                                                                   \
+    gl_Position.xyz =  u_transform * u_projection * a_position;     \
+    gl_Position.w = 1.0;                                            \
+    v_texcoord = a_texcoord;                                        \
+}                                                                   \
+";
+
+static const char *fragment_shader = "                              \
+#extension GL_OES_EGL_image_external : require\n                    \
+precision highp float;                                              \
+                                                                    \
+uniform samplerExternalOES texture;                                 \
+varying vec2 v_texcoord;                                            \
+                                                                    \
+void main()                                                         \
+{                                                                   \
+    gl_FragColor = texture2D(texture, v_texcoord);                  \
+}                                                                   \
+";
+
+#define SHADER_POSITION_ATTR_SLOT 0
+#define SHADER_TEX_COOR_ATTR_SLOT 1
+
+static void armsoc_repulsion_gles_log(GLenum source, GLenum type, GLuint id,
+                                      GLenum severity, GLsizei length,
+                                      const GLchar *message, const void *data)
+{
+    switch (severity) {
+        case GL_DEBUG_SEVERITY_HIGH_KHR:
+            ERROR_LOG("GLES2: %s", message);
+            break;
+        case GL_DEBUG_SEVERITY_MEDIUM_KHR:
+            WARN_LOG("GLES2: %s", message);
+            break;
+        default:
+            INFO_LOG("GLES2: %s", message);
+    };
+}
+
+static const char* gles_error_str(GLenum err)
+{
+    switch (err) {
+        case GL_NO_ERROR:                       return "no error";
+        case GL_INVALID_ENUM:                   return "invalid enum";
+        case GL_INVALID_VALUE:                  return "invalid value";
+        case GL_INVALID_OPERATION:              return "invalid operation";
+        case GL_OUT_OF_MEMORY:                  return "out of memory";
+        case GL_INVALID_FRAMEBUFFER_OPERATION:  return "invalid fb operation";
+        default:                                return "unknowm error";
+    }
+};
+
+static int armsoc_repulsion_compile_shader(struct ARMSOCRepulsion *repulsion)
+{
+    GLuint vs, fs;
+    GLint status, texture;
+    GLenum err;
+
+    vs = glCreateShader(GL_VERTEX_SHADER);
+    if (!vs) {
+        err = glGetError();
+        return err == GL_NO_ERROR ? -1 : err;
+    }
+    glShaderSource(vs, 1, &vertex_shader, NULL);
+    glCompileShader(vs);
+    glGetShaderiv(vs, GL_COMPILE_STATUS, &status);
+    if (status == GL_FALSE) {
+        GLint max_len = 1024;
+        GLchar err_log[1024];
+        glGetShaderInfoLog(vs, max_len, &max_len, &err_log[0]);
+        ERROR_LOG("VS: %s", err_log);
+        err = glGetError();
+        return err == GL_NO_ERROR ? -1 : err;
+    }
+
+    fs = glCreateShader(GL_FRAGMENT_SHADER);
+    if (!fs) {
+        err = glGetError();
+        return err == GL_NO_ERROR ? -1 : err;
+    }
+    glShaderSource(fs, 1, &fragment_shader, NULL);
+    glCompileShader(fs);
+    glGetShaderiv(fs, GL_COMPILE_STATUS, &status);
+    if (status == GL_FALSE) {
+        err = glGetError();
+        return err == GL_NO_ERROR ? -1 : err;
+    }
+
+    repulsion->gles.program = glCreateProgram();
+    if (!repulsion->gles.program) {
+        err = glGetError();
+        return err == GL_NO_ERROR ? -1 : err;
+    }
+    glAttachShader(repulsion->gles.program, vs);
+    glAttachShader(repulsion->gles.program, fs);
+    glBindAttribLocation(repulsion->gles.program, SHADER_POSITION_ATTR_SLOT,
+                         "a_position");
+    glBindAttribLocation(repulsion->gles.program, SHADER_TEX_COOR_ATTR_SLOT,
+                         "a_texcoord");
+    glLinkProgram(repulsion->gles.program);
+    glDetachShader(repulsion->gles.program, vs);
+    glDetachShader(repulsion->gles.program, fs);
+    glGetProgramiv(repulsion->gles.program, GL_LINK_STATUS, &status);
+    if (status == GL_FALSE) {
+        err = glGetError();
+        return err == GL_NO_ERROR ? -1 : err;
+    }
+    glUseProgram(repulsion->gles.program);
+    glEnableVertexAttribArray(SHADER_POSITION_ATTR_SLOT);
+    glEnableVertexAttribArray(SHADER_TEX_COOR_ATTR_SLOT);
+
+    repulsion->gles.proj_location =
+        glGetUniformLocation(repulsion->gles.program, "u_projection");
+    repulsion->gles.xform_location =
+        glGetUniformLocation(repulsion->gles.program, "u_transform");
+
+    texture = glGetUniformLocation(repulsion->gles.program, "texture");
+    glUniform1i(texture, 0);
+    glActiveTexture(GL_TEXTURE0);
+
+    return GL_NO_ERROR;
+}
+
+static int armsoc_repulsion_create_vbo(struct ARMSOCRepulsion *repulsion)
+{
+    glGenBuffers(1, &repulsion->gles.vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, repulsion->gles.vbo);
+
+    return GL_NO_ERROR;
+}
+
+static int armsoc_repulsion_create_ibo(struct ARMSOCRepulsion *repulsion)
+{
+    static const GLushort indices[] = {0, 1, 2, 0, 2, 3};
+
+    glGenBuffers(1, &repulsion->gles.ibo);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, repulsion->gles.ibo);
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices,
+                 GL_STATIC_DRAW);
+
+    return GL_NO_ERROR;
+}
+
+static int armsoc_repulsion_create_texture(struct ARMSOCRepulsion *repulsion)
+{
+    glGenTextures(1, &repulsion->gles.texture);
+    glBindTexture(GL_TEXTURE_EXTERNAL_OES, repulsion->gles.texture);
+    glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S,
+                    GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T,
+                    GL_CLAMP_TO_EDGE);
+
+    return GL_NO_ERROR;
+}
+
+static int armsoc_repulsion_init_gles(struct ARMSOCRepulsion *repulsion)
+{
+    int rc;
+
+    glEnable(GL_DEBUG_OUTPUT_KHR);
+    glDebugMessageCallbackKHR(armsoc_repulsion_gles_log, repulsion);
+
+    rc = armsoc_repulsion_compile_shader(repulsion);
+    if (rc != GL_NO_ERROR) {
+        ERROR_LOG("Failed to compile shader: 0x%04x (%s)",
+                  rc, gles_error_str(rc));
+        return rc;
+    }
+
+    rc = armsoc_repulsion_create_vbo(repulsion);
+    if (rc != GL_NO_ERROR) {
+        ERROR_LOG("Failed to create vertex buffer: 0x%04x (%s)",
+                  rc, gles_error_str(rc));
+        return rc;
+    }
+
+    rc = armsoc_repulsion_create_ibo(repulsion);
+    if (rc != GL_NO_ERROR) {
+        ERROR_LOG("Failed to create index buffer: 0x%04x (%s)",
+                  rc, gles_error_str(rc));
+        return rc;
+    }
+
+    rc = armsoc_repulsion_create_texture(repulsion);
+    if (rc != GL_NO_ERROR) {
+        ERROR_LOG("Failed to create texture: 0x%04x (%s)",
+                  rc, gles_error_str(rc));
+        return rc;
+    }
+
+    return GL_NO_ERROR;
+}
+
+static void armsoc_repulsion_release_texture(struct ARMSOCRepulsion *repulsion)
+{
+    glDeleteTextures(1, &repulsion->gles.texture);
+}
+
+static void armsoc_repulsion_release_ibo(struct ARMSOCRepulsion *repulsion)
+{
+    glDeleteBuffers(1, &repulsion->gles.ibo);
+}
+
+static void armsoc_repulsion_release_vbo(struct ARMSOCRepulsion *repulsion)
+{
+    glDeleteBuffers(1, &repulsion->gles.vbo);
+}
+
+static void armsoc_repulsion_release_shader(struct ARMSOCRepulsion *repulsion)
+{
+    glDeleteProgram(repulsion->gles.program);
+}
+
+static void armsoc_repulsion_release_gles(struct ARMSOCRepulsion *repulsion)
+{
+    armsoc_repulsion_release_texture(repulsion);
+    armsoc_repulsion_release_ibo(repulsion);
+    armsoc_repulsion_release_vbo(repulsion);
+    armsoc_repulsion_release_shader(repulsion);
+}
+
+/* -----------------------------------------------------------------------------
+ * EGL Functions
+ */
+
+static const char* egl_error_str(EGLint err)
+{
+    switch (err) {
+        case EGL_SUCCESS:               return "no error";
+        case EGL_NOT_INITIALIZED:       return "not initialized";
+        case EGL_BAD_ACCESS:            return "bad access";
+        case EGL_BAD_ALLOC:             return "bad alloc";
+        case EGL_BAD_CONFIG:            return "bad config";
+        case EGL_BAD_CONTEXT:           return "bad context";
+        case EGL_BAD_CURRENT_SURFACE:   return "bad current surface";
+        case EGL_BAD_DISPLAY:           return "bad display";
+        case EGL_BAD_MATCH:             return "bad match";
+        case EGL_BAD_NATIVE_PIXMAP:     return "bad native pixmap";
+        case EGL_BAD_NATIVE_WINDOW:     return "bad native window";
+        case EGL_BAD_PARAMETER:         return "bad parameter";
+        case EGL_BAD_SURFACE:           return "bad surface";
+        case EGL_CONTEXT_LOST:          return "context lost";
+        default:                        return "unknowm error";
+    }
+};
+
+static int armsoc_repulsion_init_egl(struct ARMSOCRepulsion *repulsion)
+{
+    static const EGLint config_attrs[] = {
+        EGL_RENDERABLE_TYPE,    EGL_OPENGL_ES2_BIT,
+        EGL_CONFORMANT,         EGL_OPENGL_ES2_BIT,
+        EGL_SURFACE_TYPE,       EGL_PBUFFER_BIT,
+        EGL_DEPTH_SIZE,         8,
+        EGL_RED_SIZE,           8,
+        EGL_GREEN_SIZE,         8,
+        EGL_BLUE_SIZE,          8,
+        EGL_ALPHA_SIZE,         8,
+        EGL_NONE
+    };
+    static const EGLint context_attrs[] = {
+        EGL_CONTEXT_CLIENT_VERSION,     2,
+        EGL_NONE
+    };
+    EGLint count;
+    EGLConfig config;
+
+    repulsion->egl.display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    if (repulsion->egl.display == EGL_NO_DISPLAY)
+        return eglGetError();
+
+    if(!eglInitialize(repulsion->egl.display, NULL, NULL))
+        return eglGetError();
+
+    if (!eglChooseConfig(repulsion->egl.display, config_attrs, &config, 1,
+                         &count))
+        return eglGetError();
+
+    if (!eglBindAPI(EGL_OPENGL_ES_API))
+        return eglGetError();
+
+    repulsion->egl.context = eglCreateContext(repulsion->egl.display, config,
+                                              EGL_NO_CONTEXT, context_attrs);
+    if (repulsion->egl.context == EGL_NO_CONTEXT)
+        return eglGetError();
+
+    repulsion->egl.surface = eglCreatePbufferSurface(repulsion->egl.display,
+                                                     config, NULL);
+    if (repulsion->egl.surface == EGL_NO_SURFACE)
+        return eglGetError();
+
+    if (!eglMakeCurrent(repulsion->egl.display, repulsion->egl.surface,
+                        repulsion->egl.surface, repulsion->egl.context))
+        return eglGetError();
+
+    if (!eglSwapInterval(repulsion->egl.display, 0))
+        return eglGetError();
+
+    return EGL_SUCCESS;
+}
+
+static void armsoc_repulsion_release_egl(struct ARMSOCRepulsion *repulsion)
+{
+    if (repulsion->egl.surface != EGL_NO_SURFACE)
+        eglDestroySurface(repulsion->egl.display, repulsion->egl.surface);
+
+    if (repulsion->egl.context)
+        eglDestroyContext(repulsion->egl.display, repulsion->egl.context);
+
+    if (repulsion->egl.display)
+        eglTerminate(repulsion->egl.display);
+
+    repulsion->egl.display = EGL_NO_DISPLAY;
+}
+
+static EGLint armsoc_repulsion_guess_bo_format(struct armsoc_bo *bo)
+{
+    switch(armsoc_bo_bpp(bo)) {
+        case 16:
+            return DRM_FORMAT_RGB565;
+        case 32:
+            return DRM_FORMAT_ARGB8888;
+        default:
+            return 0;
+    }
+}
+
+static EGLImageKHR
+armsoc_repulsion_create_egl_image(struct ARMSOCRepulsion *repulsion,
+                                  struct armsoc_bo *bo)
+{
+    const EGLint attributes[] = {
+        EGL_WIDTH,                      armsoc_bo_width(bo),
+        EGL_HEIGHT,                     armsoc_bo_height(bo),
+        EGL_LINUX_DRM_FOURCC_EXT,       armsoc_repulsion_guess_bo_format(bo),
+        EGL_DMA_BUF_PLANE0_FD_EXT,      armsoc_bo_get_dmabuf(bo),
+        EGL_DMA_BUF_PLANE0_OFFSET_EXT,  0,
+        EGL_DMA_BUF_PLANE0_PITCH_EXT,   armsoc_bo_pitch(bo),
+        EGL_NONE
+    };
+
+    return eglCreateImageKHR(repulsion->egl.display, EGL_NO_CONTEXT,
+                             EGL_LINUX_DMA_BUF_EXT, NULL, attributes);
+}
+
+static void
+armsoc_repulsion_destroy_egl_image(struct ARMSOCRepulsion *repulsion,
+                                   EGLImageKHR img)
+{
+    eglDestroyImageKHR(repulsion->egl.display, img);
+}
+
+/* -----------------------------------------------------------------------------
+ * Repulsion API
+ */
+
+bool armsoc_repulsion_composite(struct ARMSOCRepulsion *repulsion,
+                                struct armsoc_bo *src,
+                                struct armsoc_bo *dest,
+                                float xform_matrix[3][3])
+{
+    GLuint tex, fbo;
+    GLenum status;
+    EGLImageKHR dest_img, src_img;
+    GLsizei width, height;
+    static GLfloat proj_matrix[3][3] = {
+        {  2.f,  0.f, 0.f },
+        {  0.f,  2.f, 0.f },
+        { -1.f, -1.f, 0.f },
+    };
+
+    if (!repulsion || !src || !dest)
+        return false;
+
+    dest_img = armsoc_repulsion_create_egl_image(repulsion, dest);
+    if (dest_img == EGL_NO_IMAGE_KHR) {
+        EGLint err = eglGetError();
+        ERROR_LOG("Failed to create dest EGL image: 0x%04x (%s)",
+                  err, egl_error_str(err));
+        return false;
+    }
+    src_img = armsoc_repulsion_create_egl_image(repulsion, src);
+    if (src_img == EGL_NO_IMAGE_KHR) {
+        EGLint err = eglGetError();
+        ERROR_LOG("Failed to create src EGL image: 0x%04x (%s)",
+                  err, egl_error_str(err));
+        armsoc_repulsion_destroy_egl_image(repulsion, dest_img);
+        return false;
+    }
+
+    glGenTextures(1, &tex);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, dest_img);
+
+    glGenFramebuffers(1, &fbo);
+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                           GL_TEXTURE_2D, tex, 0);
+
+    status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+    if (status != GL_FRAMEBUFFER_COMPLETE) {
+        ERROR_LOG("Failed to complete framebuffer");
+        glDeleteFramebuffers(1, &fbo);
+        glDeleteTextures(1, &tex);
+        armsoc_repulsion_destroy_egl_image(repulsion, dest_img);
+        armsoc_repulsion_destroy_egl_image(repulsion, src_img);
+        return false;
+    }
+
+    width = armsoc_bo_width(dest);
+    height = armsoc_bo_height(dest);
+    proj_matrix[0][0] = 2.f / width;
+    proj_matrix[1][1] = 2.f / height;
+
+    glUniformMatrix3fv(repulsion->gles.proj_location, 1, false,
+                       &proj_matrix[0][0]);
+
+    glUniformMatrix3fv(repulsion->gles.xform_location, 1, false,
+                       &xform_matrix[0][0]);
+
+    glViewport(0, 0, width, height);
+
+    glClearColor(0.f, 0.f, 1.f, 1.f);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, src_img);
+
+    repulsion->gles.vertices[0].pos[0] = 0.f;
+    repulsion->gles.vertices[0].pos[1] = height;
+    repulsion->gles.vertices[0].pos[2] = 1.f;
+    repulsion->gles.vertices[0].uv[0]  = 0.f;
+    repulsion->gles.vertices[0].uv[1]  = 1.f;
+
+    repulsion->gles.vertices[1].pos[0] = 0.f;
+    repulsion->gles.vertices[1].pos[1] = 0.f;
+    repulsion->gles.vertices[1].pos[2] = 1.f;
+    repulsion->gles.vertices[1].uv[0]  = 0.f;
+    repulsion->gles.vertices[1].uv[1]  = 0.f;
+
+    repulsion->gles.vertices[2].pos[0] = width;
+    repulsion->gles.vertices[2].pos[1] = 0.f;
+    repulsion->gles.vertices[2].pos[2] = 1.f;
+    repulsion->gles.vertices[2].uv[0]  = 1.f;
+    repulsion->gles.vertices[2].uv[1]  = 0.f;
+
+    repulsion->gles.vertices[3].pos[0] = width;
+    repulsion->gles.vertices[3].pos[1] = height;
+    repulsion->gles.vertices[3].pos[2] = 1.f;
+    repulsion->gles.vertices[3].uv[0]  = 1.f;
+    repulsion->gles.vertices[3].uv[1]  = 1.f;
+
+    glBufferData(GL_ARRAY_BUFFER, sizeof(repulsion->gles.vertices),
+                 repulsion->gles.vertices, GL_STATIC_DRAW);
+
+    glVertexAttribPointer(SHADER_POSITION_ATTR_SLOT, 3, GL_FLOAT, GL_FALSE,
+                          sizeof(*repulsion->gles.vertices), (const void *)(0));
+    glVertexAttribPointer(SHADER_TEX_COOR_ATTR_SLOT, 2, GL_FLOAT, GL_FALSE,
+                          sizeof(*repulsion->gles.vertices),
+                          (const void *)(sizeof(repulsion->gles.vertices->pos)));
+
+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0);
+
+    glFinish();
+
+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    glDeleteFramebuffers(1, &fbo);
+    glDeleteTextures(1, &tex);
+
+    armsoc_repulsion_destroy_egl_image(repulsion, src_img);
+    armsoc_repulsion_destroy_egl_image(repulsion, dest_img);
+
+    return true;
+}
+
+struct ARMSOCRepulsion *armsoc_repulsion_init(void)
+{
+    int rc;
+    struct ARMSOCRepulsion *repulsion = calloc(1, sizeof(*repulsion));
+    if (!repulsion) {
+        ERROR_LOG("Out of memory");
+        return NULL;
+    }
+
+    rc = armsoc_repulsion_init_egl(repulsion);
+    if (rc != EGL_SUCCESS) {
+        ERROR_LOG("Failed to initialize EGL: 0x%04x (%s)",
+                  rc, egl_error_str(rc));
+        armsoc_repulsion_release(repulsion);
+        return NULL;
+    }
+
+    rc = armsoc_repulsion_init_gles(repulsion);
+    if (rc != GL_NO_ERROR) {
+        ERROR_LOG("Failed to initialize GLES: 0x%04x (%s)",
+                  rc, gles_error_str(rc));
+        armsoc_repulsion_release(repulsion);
+        return NULL;
+    }
+
+    INFO_LOG("Repulsion initialized");
+
+    return repulsion;
+}
+
+void armsoc_repulsion_release(struct ARMSOCRepulsion *repulsion)
+{
+    if (!repulsion)
+        return;
+    armsoc_repulsion_release_gles(repulsion);
+    armsoc_repulsion_release_egl(repulsion);
+    free(repulsion);
+}
+diff --git a/src/armsoc_repulsion.h b/src/armsoc_repulsion.h
+new file mode 100644
+index 0000000..b5e57df
+--- /dev/null
+++ b/src/armsoc_repulsion.h
+@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2024 AMD, Inc.
+ *
+ * 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 (including the next
+ * paragraph) 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.
+ *
+ * Author: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
+ *
+ */
+
+#ifndef ARMSOC_REPULSION_H_
+#define ARMSOC_REPULSION_H_
+
+#include <stdbool.h>
+#include "armsoc_dumb.h"
+
+struct ARMSOCRepulsion;
+
+/**
+ * Initialize armsoc repulsion compositor.
+ *
+ * Return: pointer to new ARMSOCRepulsion object on success, NULL otherwise.
+ */
+struct ARMSOCRepulsion *armsoc_repulsion_init(void);
+
+/**
+ * Release armsoc repulsion compositor and free all resources.
+ * @repulsion: pointer to previously allocated ARMSOCRepulsion object.
+ */
+void armsoc_repulsion_release(struct ARMSOCRepulsion *repulsion);
+
+/**
+ * Perform 2 image composition.
+ * @repulsion: pointer to ARMSOCRepulsion object.
+ * @src: source buffer object.
+ * @dest: destination buffer object.
+ * @xform_matrix: transformation matrix to apply to source image before copying
+ * it into destination.
+ *
+ * This function performs GPU accelerated copy of @src buffer into @dest buffer
+ * while applying linear transformation.
+ *
+ * Return: pointer to new ARMSOCRepulsion object on success, NULL otherwise.
+ */
+bool armsoc_repulsion_composite(struct ARMSOCRepulsion *repulsion,
+                                struct armsoc_bo *src,
+                                struct armsoc_bo *dest,
+                                float xform_matrix[3][3]);
+
+
+#endif // ARMSOC_REPULSION_H_
+-- 
+2.25.1
diff --git a/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-xf86-video-armosc-Option-to-control-acceleration.patch b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-xf86-video-armosc-Option-to-control-acceleration.patch
new file mode 100644
index 00000000..9cc186de
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-xf86-video-armosc-Option-to-control-acceleration.patch
@@ -0,0 +1,110 @@
+From 83047c38b0a9e8cc535eba580ca28497f1bee544 Mon Sep 17 00:00:00 2001
+From: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
+Date: Fri, 19 Jul 2024 14:10:22 -0700
+Subject: [PATCH] xf86-video-armosc: Option to control acceleration
+Add xorg config option to enable / disable GPU accelerated picture
+composition. Enable acceleration by default.
+Signed-off-by: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
+---
+ man/armsoc.man      |  6 ++++++
+ src/armsoc_driver.c | 20 +++++++++++++++-----
+ src/armsoc_driver.h |  3 +++
+ 3 files changed, 24 insertions(+), 5 deletions(-)
+diff --git a/man/armsoc.man b/man/armsoc.man
+index d85c2fa..cdeb19e 100644
+--- a/man/armsoc.man
+++ b/man/armsoc.man
+@@ -69,6 +69,12 @@ Default: NULL
+ Use the umplock module for cross-process access synchronization. It should be only enabled for Mali400
+ .IP
+ Default: Umplock is Disabled
+.TP
+.BI "Option \*qAccelerateComposition\*q \*q" boolean \*q
+Accelerate picture composition on GPU.
+.IP
+Default: Accelerated composition is Enabled
+
+ 
+ .SH DRM DEVICE SELECTION
+ 
+diff --git a/src/armsoc_driver.c b/src/armsoc_driver.c
+index f5b8f21..15cc620 100644
+--- a/src/armsoc_driver.c
+++ b/src/armsoc_driver.c
+@@ -110,6 +110,7 @@ enum {
+        OPTION_DRI_NUM_BUF,
+        OPTION_INIT_FROM_FBDEV,
+        OPTION_UMP_LOCK,
+       OPTION_ACCELERATE_COMPOSITION,
+ };
+ 
+ /** Supported options. */
+@@ -122,6 +123,8 @@ static const OptionInfoRec ARMSOCOptions[] = {
+        { OPTION_DRI_NUM_BUF, "DRI2MaxBuffers", OPTV_INTEGER, {-1}, FALSE },
+        { OPTION_INIT_FROM_FBDEV, "InitFromFBDev", OPTV_STRING, {0}, FALSE },
+        { OPTION_UMP_LOCK,   "UMP_LOCK",   OPTV_BOOLEAN, {0}, FALSE },
+       { OPTION_ACCELERATE_COMPOSITION, "AccelerateComposition", OPTV_BOOLEAN,
+               {0}, FALSE },
+        { -1,                NULL,         OPTV_NONE,    {0}, FALSE }
+ };
+ 
+@@ -871,6 +874,10 @@ ARMSOCPreInit(ScrnInfoPtr pScrn, int flags)
+        armsocDebug = xf86ReturnOptValBool(pARMSOC->pOptionInfo,
+                                        OPTION_DEBUG, FALSE);
+ 
+       /* Should we enable GPU accelerated picture composition? */
+       pARMSOC->enable_repulsion = xf86ReturnOptValBool(pARMSOC->pOptionInfo,
+                                       OPTION_ACCELERATE_COMPOSITION, TRUE);
+
+        if (!xf86GetOptValInteger(pARMSOC->pOptionInfo, OPTION_DRI_NUM_BUF,
+                        &driNumBufs)) {
+                /* Default to double buffering */
+@@ -1119,7 +1126,6 @@ ARMSOCScreenInit(SCREEN_INIT_ARGS_DECL)
+        struct ARMSOCRec *pARMSOC = ARMSOCPTR(pScrn);
+        VisualPtr visual;
+        xf86CrtcConfigPtr xf86_config;
+-       PictureScreenPtr ps;
+        int j;
+        const char *fbdev;
+        int depth;
+@@ -1308,12 +1314,16 @@ ARMSOCScreenInit(SCREEN_INIT_ARGS_DECL)
+                pARMSOC->lockFD = -1;
+        }
+ 
+-       pARMSOC->repulsion = armsoc_repulsion_init();
+       if (pARMSOC->enable_repulsion) {
+               PictureScreenPtr ps;
+
+               pARMSOC->repulsion = armsoc_repulsion_init();
+ 
+-       ps = GetPictureScreen(pScreen);
+-       pARMSOC->composite_proc = ps->Composite;
+               ps = GetPictureScreen(pScreen);
+               pARMSOC->composite_proc = ps->Composite;
+ 
+-       ps->Composite = ARMSOCComposite;
+               ps->Composite = ARMSOCComposite;
+       }
+ 
+        TRACE_EXIT();
+        return TRUE;
+diff --git a/src/armsoc_driver.h b/src/armsoc_driver.h
+index 20b0f80..27e978e 100644
+--- a/src/armsoc_driver.h
+++ b/src/armsoc_driver.h
+@@ -185,6 +185,9 @@ struct ARMSOCRec {
+         * driNumBufs if early display enabled, otherwise driNumBufs-1 */
+        unsigned int                       swap_chain_size;
+ 
+       /* Enable GPU accelerated picture compositor? */
+       Bool                                                            enable_repulsion;
+
+        /* GPU accelerated picture compositor, AKA Repulsion */
+        struct ARMSOCRepulsion                          *repulsion;
+ 
+-- 
+2.25.1
diff --git a/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-xf86-video-armsoc-Add-shadow-buffer-hooks.patch b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-xf86-video-armsoc-Add-shadow-buffer-hooks.patch
new file mode 100644
index 00000000..8a1a8ca7
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-xf86-video-armsoc-Add-shadow-buffer-hooks.patch
@@ -0,0 +1,141 @@
+From 8c62932a848c3c9eef8b663a24d90026687d5b02 Mon Sep 17 00:00:00 2001
+From: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
+Date: Thu, 13 Jun 2024 17:37:46 -0700
+Subject: [PATCH] xf86-video-armsoc: Add shadow buffer hooks
+Add shadow buffer management callbacks. These callbacks are required for
+RandR extension to operate. Implement the shadow buffer as a dumb DRM
+framebuffer. Use the shadow buffer as page flip souce. Fix armsoc_dri2.c
+file mode (drop exec bits).
+Signed-off-by: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
+---
+ src/armsoc_dri2.c     |  3 ++
+ src/armsoc_driver.h   |  3 ++
+ src/drmmode_display.c | 65 +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 71 insertions(+)
+ mode change 100755 => 100644 src/armsoc_dri2.c
+diff --git a/src/armsoc_dri2.c b/src/armsoc_dri2.c
+old mode 100755
+new mode 100644
+index dc502e4..af5d074
+--- a/src/armsoc_dri2.c
+++ b/src/armsoc_dri2.c
+@@ -853,6 +853,9 @@ ARMSOCDRI2ScheduleSwap(ClientPtr client, DrawablePtr pDraw,
+                        (armsoc_bo_height(src_bo) == armsoc_bo_height(dst_bo));
+ 
+        if (do_flip) {
+               if (pARMSOC->shadow)
+                       src_fb_id = armsoc_bo_get_fb(pARMSOC->shadow);
+
+                DEBUG_MSG("FLIPPING:  FB%d -> FB%d", src_fb_id, dst_fb_id);
+                cmd->type = DRI2_FLIP_COMPLETE;
+ 
+diff --git a/src/armsoc_driver.h b/src/armsoc_driver.h
+index ef2836f..eae76ca 100644
+--- a/src/armsoc_driver.h
+++ b/src/armsoc_driver.h
+@@ -149,6 +149,9 @@ struct ARMSOCRec {
+        /** Scan-out buffer. */
+        struct armsoc_bo                *scanout;
+ 
+       /** Rotation shadow buffer */
+       struct armsoc_bo                *shadow;
+
+        /** Pointer to the options for this screen. */
+        OptionInfoPtr           pOptionInfo;
+ 
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 39fa75c..f054b3a 100644
+--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
+@@ -333,6 +333,9 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+                goto cleanup;
+        }
+ 
+       if (pARMSOC->shadow)
+               fb_id = armsoc_bo_get_fb(pARMSOC->shadow);
+
+        if (crtc->funcs->gamma_set)
+                crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+                                       crtc->gamma_blue, crtc->gamma_size);
+@@ -860,6 +863,65 @@ drmmode_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
+ }
+ #endif
+ 
+static void*
+drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
+{
+       ScrnInfoPtr pScrn = crtc->scrn;
+       struct ARMSOCRec *pARMSOC = ARMSOCPTR(pScrn);
+       struct armsoc_bo *bo;
+       int ret;
+
+       bo = armsoc_bo_new_with_dim(pARMSOC->dev, width, height,
+                       pScrn->bitsPerPixel, pScrn->bitsPerPixel, ARMSOC_BO_SCANOUT);
+       if (!bo)
+               return NULL;
+
+       /* We will use this bo as a scanout, so add it as a framebuffer */
+       ret = armsoc_bo_add_fb(bo);
+       if (ret) {
+               xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                       "failed to add framebuffer: %s\n", strerror(-ret));
+               armsoc_bo_unreference(bo);
+               return NULL;
+       }
+
+       pARMSOC->shadow = bo;
+
+       return bo;
+}
+
+static PixmapPtr
+drmmode_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
+{
+       ScrnInfoPtr pScrn = crtc->scrn;
+       ScreenPtr pScreen = pScrn->pScreen;
+       struct armsoc_bo *bo = data;
+       PixmapPtr pixmap;
+
+       pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, armsoc_bo_depth(bo), 0);
+       if (!pixmap) {
+               xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "failed to create pixmap.\n");
+               return NULL;
+       }
+       (*pScreen->ModifyPixmapHeader)(pixmap, armsoc_bo_width(bo),
+               armsoc_bo_height(bo), armsoc_bo_depth(bo), armsoc_bo_bpp(bo),
+               armsoc_bo_pitch(bo), armsoc_bo_map(bo));
+
+       return pixmap;
+}
+
+static void
+drmmode_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data)
+{
+       ScrnInfoPtr pScrn = crtc->scrn;
+       struct ARMSOCRec *pARMSOC = ARMSOCPTR(pScrn);
+       struct armsoc_bo *bo = data;
+
+       armsoc_bo_unreference(bo);
+
+       pARMSOC->shadow = NULL;
+}
+
+ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
+                .dpms = drmmode_crtc_dpms,
+                .set_mode_major = drmmode_set_mode_major,
+@@ -870,6 +932,9 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
+ #if 1 == ARMSOC_SUPPORT_GAMMA
+                .gamma_set = drmmode_gamma_set,
+ #endif
+               .shadow_allocate = drmmode_shadow_allocate,
+               .shadow_create = drmmode_shadow_create,
+               .shadow_destroy = drmmode_shadow_destroy,
+ };
+ 
+ 
+-- 
+2.25.1
diff --git a/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
index f7b52f58..9f8af267 100644
--- a/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
@@ -2,4 +2,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/xf86-video-armsoc:"
 SRC_URI:append = " file://0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch \
                   file://0001-armsoc_driver.c-Bypass-the-exa-layer-to-free-the-roo.patch \
-                "
+                   file://0001-xf86-video-armsoc-Add-shadow-buffer-hooks.patch \
+                 "
+EXTRA_MALI400_SRC = " file://0001-xf86-video-armosc-Accelerate-picture-composition.patch \
+                      file://0001-xf86-video-armosc-Option-to-control-acceleration.patch \
+                    "
+SRC_URI:append = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${EXTRA_MALI400_SRC}', '', d)}"
+DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', ' libmali-xlnx', '', 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 8a2b7a46..6de745a5 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,9 +1,9 @@
-SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=v0.2024.x;protocol=https"
+SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master;protocol=https"
-SRCREV = "4fb08575157d7712e0cd50e9e9c07620bc9f8b4b"
+SRCREV = "c0facd087263a24a83f7fad917884348db03175d"
 FILESEXTRAPATHS:prepend := "${THISDIR}/lopper:"
-BASEVERSION = "1.1.0"
+BASEVERSION = "1.2.0"
 RDEPENDS:${PN} += " \
    python3-ruamel-yaml \
diff --git a/meta-xilinx-core/gen-machine-conf b/meta-xilinx-core/gen-machine-conf
-Subproject e3968c5d6b1d02b2c1fa51de838f0757bca1c16
+Subproject 3e691e28bf47876fb7e0c4be3c62be6b9d46bf8
diff --git a/meta-xilinx-core/lib/devtool/boot-jtag.py b/meta-xilinx-core/lib/devtool/boot-jtag.py
index 247851ec..2d8a7d8f 100644
--- a/meta-xilinx-core/lib/devtool/boot-jtag.py
+++ b/meta-xilinx-core/lib/devtool/boot-jtag.py
@@ -8,12 +8,9 @@
 # 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
+import logging
+from devtool import setup_tinfoil
 logger = logging.getLogger('devtool')
@@ -24,8 +21,8 @@ def bootjtag(args, config, basepath, workspace):
        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)
+    # Get required boot variables
    try:
        rd = tinfoil.parse_recipe('u-boot-xlnx-scr')
        deploy_dir = rd.getVar('DEPLOY_DIR_IMAGE')
@@ -39,6 +36,7 @@ def bootjtag(args, config, basepath, workspace):
        rootfs_load_addr = rd.getVar('RAMDISK_IMAGE_ADDRESS')
        machine_features = rd.getVar('MACHINE_FEATURES')
        boot_mode = rd.getVar('BOOTMODE')
+        image_name_suffix = rd.getVar('IMAGE_NAME_SUFFIX')
    finally:
        tinfoil.shutdown()
@@ -99,7 +97,7 @@ def bootjtag(args, config, basepath, workspace):
    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')
+        data['rfs'] = os.path.join(deploy_dir, args.image + '-' + machine + image_name_suffix + '.cpio.gz.u-boot')
    # Check if all the required boot images exists
    for key in data:
@@ -258,19 +256,19 @@ def bootjtag(args, config, basepath, workspace):
 def register_commands(subparsers, context):
    """Register devtool subcommands from this plugin"""
-    parser_bootjtag = subparsers.add_parser('boot-jtag', 
+    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', 
+    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',  
+    parser_bootjtag.add_argument('-v', '--verbose',
                                 help='verbose mode', action="store_true")
-    parser_bootjtag.add_argument('-n', '--norootfs', 
+    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.3.bb
index 63718813..828a3ca1 100644
--- a/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
+++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb
@@ -6,9 +6,9 @@ SUMMARY = "Image update is used to update alternate image on compatible firmware
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b"
-BRANCH = "xlnx_rel_v2024.1"
+BRANCH = "master"
 SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https"
-SRCREV = "a68308f329578d3585fd335071a9184aa7f46d2e"
+SRCREV = "1bd7d7405b484d808176c6e711691a846c18b4f0"
 RDEPENDS:${PN} += "freeipmi"
diff --git a/meta-xilinx-core/recipes-apps/raft/python-async.inc b/meta-xilinx-core/recipes-apps/raft/python-async.inc
new file mode 100644
index 00000000..fde86460
--- /dev/null
+++ b/meta-xilinx-core/recipes-apps/raft/python-async.inc
@@ -0,0 +1,14 @@
+SUMMARY = "Python framework to process interdependent tasks in a pool of workers"
+HOMEPAGE = "http://github.com/gitpython-developers/async"
+SECTION = "devel/python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=88df8e78b9edfd744953862179f2d14e"
+inherit pypi
+SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b"
+SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051"
+RDEPENDS:${PN} += "${PYTHON_PN}-threading"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-apps/raft/python3-async_0.6.2.bb b/meta-xilinx-core/recipes-apps/raft/python3-async_0.6.2.bb
new file mode 100644
index 00000000..0da5fdec
--- /dev/null
+++ b/meta-xilinx-core/recipes-apps/raft/python3-async_0.6.2.bb
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-async.inc
diff --git a/meta-xilinx-core/recipes-apps/raft/raft_2024.1.bb b/meta-xilinx-core/recipes-apps/raft/raft_2024.1.bb
new file mode 100644
index 00000000..a287d8ce
--- /dev/null
+++ b/meta-xilinx-core/recipes-apps/raft/raft_2024.1.bb
@@ -0,0 +1,65 @@
+SUMMARY = "RAFT python application"
+LICENSE = "MIT & BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://${WORKDIR}/git/LICENSE;md5=cc21c526211d34984839aa67dd16f172 \
+    file://${WORKDIR}/git/docs/LICENSE;md5=d8f0ffdbc8d019bc821a5a07bdca1406 \
+"
+BRANCH = "2024.1"
+SRC_URI = "git://github.com/Xilinx/RAFT;protocol=https;branch=${BRANCH}"
+SRCREV = "87ea8f4c5ac52fcbc465f41e681fc77aaee9a285"
+inherit update-rc.d systemd
+S = "${WORKDIR}/git"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zcu208-zynqmp = "${MACHINE}"
+COMPATIBLE_MACHINE:zcu216-zynqmp = "${MACHINE}"
+COMPATIBLE_MACHINE:system-controller = "${MACHINE}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+INITSCRIPT_NAME = "raft-startup"
+INITSCRIPT_PARAMS = "start 99 S ."
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE:${PN} = "raft-startup.service"
+SYSTEMD_AUTO_ENABLE:${PN}="enable"
+DEPENDS += "libmetal"
+RDEPENDS:${PN} += "\
+    python3 \
+    python3-pyro4 \
+    python3-cffi \
+    python3-serpent \
+    bash \
+    "
+PACKAGECONFIG[raftnotebooks] = "enabled,disabled,,packagegroup-xilinx-jupyter"
+PACKAGECONFIG[raftstartup] = "enabled,disabled,,librfdc librfclk libmetal"
+PACKAGECONFIG[raftstartupsc] = "enabled,disabled,,python3-psutil python3-periphery"
+do_install() {
+    if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+        SYSCONFDIR=${D}${sysconfdir}/init.d/
+    else
+        SYSCONFDIR=''
+    fi
+    oe_runmake install DESTDIR=${D}\
+    NOTEBOOKS=${@bb.utils.contains('PACKAGECONFIG','raftnotebooks','enabled','', d)}\
+    STARTUPSC=${@bb.utils.contains('PACKAGECONFIG','raftstartupsc','enabled','',d)}\
+    STARTUP=${@bb.utils.contains('PACKAGECONFIG','raftstartup','enabled','',d)}\
+    BINDIR=${D}${bindir}\
+    SYSTEM_UNIT_DIR=${D}${systemd_system_unitdir}\
+    SYSCONF_DIR=${SYSCONFDIR}
+}
+PACKAGECONFIG:append:zcu208-zynqmp = "raftnotebooks raftstartup"
+PACKAGECONFIG:append:zcu216-zynqmp = "raftnotebooks raftstartup"
+PACKAGECONFIG:append:system-controller = "raftstartupsc"
+FILES:${PN} += " \
+    ${datadir}/raft/* \
+    ${datadir}/notebooks \
+    ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${sysconfdir}/*', '', d)} \
+    "
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.6.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.6.bb
new file mode 100644
index 00000000..a99f296a
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.6.bb
@@ -0,0 +1,40 @@
+SUMMARY = "Xilinx AI Engine runtime"
+DESCRIPTION = "This library provides APIs for the runtime support of the Xilinx AI Engine IP"
+require aie-rt-2024.2.inc
+SECTION = "libs"
+AIEDIR ?= "${S}/driver"
+S = "${WORKDIR}/git"
+I = "${AIEDIR}/include"
+IOBACKENDS ?= "Linux"
+DEPENDS = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '', d)}"
+RDEPENDS:${PN} = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '', d)}"
+PROVIDES = "libxaiengine"
+RPROVIDES:${PN} = "libxaiengine"
+# The makefile isn't ready for parallel execution at the moment
+PARALLEL_MAKE = "-j 1"
+CFLAGS += "-Wall -Wextra"
+CFLAGS += "${@bb.utils.contains('IOBACKENDS', 'Linux', ' -D__AIELINUX__', '', d)}"
+CFLAGS += "${@bb.utils.contains('IOBACKENDS', 'metal', ' -D__AIEMETAL__', '', d)}"
+EXTRA_OEMAKE = "-C ${AIEDIR}/src -f Makefile.Linux CFLAGS='${CFLAGS}'"
+do_compile(){
+        oe_runmake
+}
+do_install(){
+        install -d ${D}${includedir}
+        install ${I}/*.h ${D}${includedir}/
+        install -d ${D}${includedir}/xaiengine
+        install ${I}/xaiengine/*.h ${D}${includedir}/xaiengine/
+        install -d ${D}${libdir}
+        cp -dr ${AIEDIR}/src/*.so* ${D}${libdir}
+}
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.2.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.2.inc
new file mode 100644
index 00000000..9ccc7621
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.2.inc
@@ -0,0 +1,11 @@
+SECTION = "libs"
+REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https"
+BRANCH ?= "xlnx_rel_v2024.2"
+SRCREV ?= "8845d962e5b30b576c87dcf6635fb84a90ef1e36"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM ?= "file://license.txt;md5=04a153cae61a8a606fc79dff49c2c897"
+SRC_URI = "${REPO};branch=${BRANCH}"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.7.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.7.bb
new file mode 100644
index 00000000..2e60941b
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.7.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Xilinx AI Engine FAL(Functional Abstraction Layer)"
+DESCRIPTION = "AIE FAL provides functional abstraction APIs for runtime support of Xilinx AI Engine IP"
+require aie-rt-2024.2.inc
+SECTION = "devel"
+XAIEFAL_DIR ?= "fal"
+S = "${WORKDIR}/git"
+IOBACKENDS ?= "Linux"
+PROVIDES = "aiefal"
+ALLOW_EMPTY:${PN} = "1"
+inherit pkgconfig cmake
+DEPENDS = "libxaiengine"
+OECMAKE_SOURCEPATH = "${S}/${XAIEFAL_DIR}"
+EXTRA_OECMAKE = "-DWITH_TESTS=OFF  -DFAL_LINUX=ON "
+EXTRA_OECMAKE:append = "${@'-DWITH_EXAMPLES=ON' if d.getVar('WITH_EXAMPLES') == 'y' else '-DWITH_EXAMPLES=OFF'}"
+FILES:${PN}-demos = " \
+    ${bindir}/* \
+"
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
index 67b97613..485d3b17 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
@@ -75,9 +75,6 @@ EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.get
 EXTRA_OEMAKE:append:versal-net = "${@' VERSAL_NET_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}"
 EXTRA_OEMAKE:append:versal-net = "${@' VERSAL_NET_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}"
-ATF_PROVENCORE = "SPD=pncd SPD_PNCD_NS_IRQ=51 ZYNQMP_BL32_MEM_BASE=0x70000000 ZYNQMP_BL32_MEM_SIZE=0x0FF00000"
-EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'provencore', ' ${ATF_PROVENCORE}', '', d)}"
 TFA_BL33_LOAD ?= ""
 EXTRA_OEMAKE:append = "${@' PRELOADED_BL33_BASE=${TFA_BL33_LOAD}' if d.getVar('TFA_BL33_LOAD', True) != '' else ''}"
@@ -129,3 +126,19 @@ FILES:${PN} += "/boot/*.elf /boot/*.bin /boot/*.ub"
 # Disable buildpaths QA check warnings for Versal.
 INSANE_SKIP:${PN}:append:versal = " buildpaths"
 INSANE_SKIP:${PN}:append:versal-net = " buildpaths"
+python() {
+    soc_family = d.getVar('SOC_FAMILY')
+    atf_console = d.getVar('ATF_CONSOLE')
+    # See plat/xilinx/<soc_family>/platform.mk 
+    if soc_family and soc_family == "zynqmp":
+        if not atf_console in [ 'cadence', 'cadence0', 'cadence1', 'dcc' ]:
+            raise bb.parse.SkipRecipe('ATF_CONSOLE (%s) is not configured properly for ZynqMP, only cadence, cadence0, cadence1, and dcc are valid options.' % (atf_console))
+    elif soc_family and soc_family == "versal":
+        if not atf_console in [ 'pl011', 'pl011_0', 'pl011_1', 'dcc' ]:
+            raise bb.parse.SkipRecipe('ATF_CONSOLE (%s) is not configured properly for Versal, only pl011, pl011_0, pl011_1, and dcc are valid options.' % (atf_console))
+    elif soc_family and soc_family == "versal-net":
+        if not atf_console in [ 'pl011', 'pl011_0', 'pl011_1', 'dcc' ]:
+            raise bb.parse.SkipRecipe('ATF_CONSOLE (%s) is not configured properly for Versal-Net, only pl011, pl011_0, pl011_1, and dcc are valid options.' % (atf_console))
+}
diff --git a/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb b/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb
index f3457640..9fd9c34a 100644
--- a/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb
@@ -4,6 +4,8 @@ LICENSE = "CLOSED"
 PROVIDES = "virtual/base-pdi"
+INHIBIT_DEFAULT_DEPS = "1"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:microblaze = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
diff --git a/meta-xilinx-core/recipes-bsp/bitstream/bitstream.bb b/meta-xilinx-core/recipes-bsp/bitstream/bitstream.bb
deleted file mode 100644
index f61761f4..00000000
--- a/meta-xilinx-core/recipes-bsp/bitstream/bitstream.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "Recipe to provide a bitstream via virtual/bitstream"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-INHIBIT_DEFAULT_DEPS = "1"
-# We never want to prefer this over another provider
-DEFAULT_PREFERENCE = "-1"
-PROVIDES = "virtual/bitstream"
-COMPATIBLE_MACHINE = "$^"
-COMPATIBLE_MACHINE:zynq = ".*"
-COMPATIBLE_MACHINE:zynqmp = ".*"
-# Since we're just copying, we can run any config
-COMPATIBLE_HOST = ".*"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-# Path where the bitstream can be found
-BITSTREAM_PATH ?= ""
-inherit deploy
-do_install() {
-    if [ ! -e ${BITSTREAM_PATH} ]; then
-        echo "Unable to find BITSTREAM_PATH (${BITSTREAM_PATH})"
-        exit 1
-    fi
-    install -Dm 0644 ${BITSTREAM_PATH} ${D}/boot/.
-}
-# If the item is already in OUR deploy_image_dir, nothing to deploy!
-SHOULD_DEPLOY = "${@'false' if (d.getVar('BITSTREAM_PATH')).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 ${BITSTREAM_PATH} ${DEPLOYDIR}/.
-    fi
-}
-def check_bitstream_vars(d):
-   # If BITSTREAM_PATH is not defined, we error and instruct the user
-   # Don't cache this, as the items on disk can change!
-   d.setVar('BB_DONT_CACHE', '1')
-   if d.getVar('BITSTREAM_PATH') and not os.path.exists(d.getVar('BITSTREAM_PATH')):
-        raise bb.parse.SkipRecipe("The expected bitstream file %s is not available.\nSee the meta-xilinx-core README.")
-   if not d.getVar('BITSTREAM_PATH'):
-        raise bb.parse.SkipRecipe("Something is depending on virtual/bitstream and you have not provided a bitstream using BITSTREAM_PATH variable.\n See the meta-xilinx-core README.")
-python() {
-    # Need to allow bbappends to change the check
-    check_bitstream_vars(d)
-}
diff --git a/meta-xilinx-core/recipes-bsp/bitstream/bitstream_1.0.bb b/meta-xilinx-core/recipes-bsp/bitstream/bitstream_1.0.bb
new file mode 100644
index 00000000..97965279
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/bitstream/bitstream_1.0.bb
@@ -0,0 +1,76 @@
+DESCRIPTION = "Recipe to provide a bitstream via virtual/bitstream"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+INHIBIT_DEFAULT_DEPS = "1"
+BITSTREAM_PATH_DEPENDS ??= ""
+DEPENDS += "${BITSTREAM_PATH_DEPENDS}"
+# We never want to prefer this over another provider
+DEFAULT_PREFERENCE = "-1"
+PROVIDES = "virtual/bitstream"
+COMPATIBLE_MACHINE = "$^"
+COMPATIBLE_MACHINE:zynq = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+# Since we're just copying, we can run any config
+COMPATIBLE_HOST = ".*"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+# Path where the bitstream can be found
+BITSTREAM_PATH ?= ""
+inherit deploy
+BITSTREAM_NAME ?= "download"
+BITSTREAM_NAME:microblaze ?= "system"
+BITSTREAM_BASE_NAME ?= "${BITSTREAM_NAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
+SYSROOT_DIRS += "/boot/bitstream"
+do_install() {
+    if [ ! -e ${BITSTREAM_PATH} ]; then
+        echo "Unable to find BITSTREAM_PATH (${BITSTREAM_PATH})"
+        exit 1
+    fi
+    install -d ${D}/boot/bitstream/
+    install -Dm 0644 ${BITSTREAM_PATH} ${D}/boot/bitstream/${BITSTREAM_BASE_NAME}.bit
+}
+# If the item is already in OUR deploy_image_dir, nothing to deploy!
+SHOULD_DEPLOY = "${@'false' if (d.getVar('BITSTREAM_PATH')).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 ${BITSTREAM_PATH} ${DEPLOYDIR}/${BITSTREAM_BASE_NAME}.bit
+    fi
+}
+addtask deploy before do_build after do_install
+FILES:${PN} += "/boot/bitstream/*.bit"
+def check_bitstream_vars(d):
+    # Assuming if BITSTREAM_PATH_DEPENDS exists, that the file will be available later.
+    if not d.getVar('BITSTREAM_PATH_DEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+        # If BITSTREAM_PATH is not found or defined, we error and instruct the user
+        if not d.getVar('BITSTREAM_PATH'):
+            raise bb.parse.SkipRecipe("Something is depending on virtual/bitstream and you have not provided a bitstream using BITSTREAM_PATH variable.\n See the meta-xilinx-core README.")
+        if d.getVar('BITSTREAM_PATH') and not os.path.exists(d.getVar('BITSTREAM_PATH')):
+            raise bb.parse.SkipRecipe("The expected bitstream file %s is not available.\nSee the meta-xilinx-core README." % d.getVar('BITSTREAM_PATH'))
+python() {
+    # Need to allow bbappends to change the check
+    check_bitstream_vars(d)
+}
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
index 98eebc3e..f4a96f41 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
@@ -9,7 +9,6 @@ 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"
@@ -17,12 +16,16 @@ BOOTBIN_MANIFEST_FILE ?= "bootbin-version-header.manifest"
 inherit deploy image-artifact-names
+IMAGE_NAME_SUFFIX = ""
 python do_configure() {
-    if d.getVar("BOOTBIN_VER_SUFFIX"):
-        version = version + "-" + d.getVar("BOOTBIN_VER_SUFFIX")
+    if not 'version' in locals():
+        version = d.getVar("MACHINE") + "-v" + d.getVar("BOOTBIN_VER_MAIN")
+    version += d.getVar("IMAGE_VERSION_SUFFIX")
    if len(version) > int(d.getVar("BOOTBIN_VER_MAX_LEN")):
-        bb.error("version string too long")
+        bb.fatal("version string too long")
    with open(d.expand("${B}/${BOOTBIN_VER_FILE}"), "w") as f:
        f.write(version.encode("utf-8").hex())
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb
index af30a17d..765d35e8 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb
@@ -15,9 +15,14 @@ BOOTBIN_VER_FILE = "bootbin-version-string.txt"
 inherit deploy image-artifact-names
+IMAGE_NAME_SUFFIX = ""
 python do_configure() {
-    if d.getVar("BOOTBIN_VER_SUFFIX"):
-        version = version + "-" + d.getVar("BOOTBIN_VER_SUFFIX")
+    if not 'version' in locals():
+        version = d.getVar("MACHINE") + "-v" + d.getVar("BOOTBIN_VER_MAIN")
+    version += d.getVar("IMAGE_VERSION_SUFFIX")
    with open(d.expand("${B}/${BOOTBIN_VER_FILE}"), "w") as f:
        f.write(version)
 }
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
index e53d21f7..b9236f55 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
@@ -7,6 +7,8 @@ LICENSE = "BSD"
 include machine-xilinx-${SOC_FAMILY}.inc
+BOOTBIN_INCLUDE ?= ""
 inherit deploy
 # Don't allow building for microblaze MACHINE
@@ -18,10 +20,11 @@ COMPATIBLE_MACHINE:versal-net = ".*"
 PROVIDES = "virtual/boot-bin"
-DEPENDS += "bootgen-native"
+DEPENDS += "bootgen-native u-boot-xlnx-scr"
 # There is no bitstream recipe, so really depend on virtual/bitstream
-DEPENDS += "${@(d.getVar('BIF_PARTITION_ATTR') or "").replace('bitstream', 'virtual/bitstream')}"
+# We need to refer to virtual/arm-trusted-firmware and not arm-trusted-firmware as there may be multiple providers
+DEPENDS += "${@(d.getVar('BIF_PARTITION_ATTR') or "").replace('bitstream', 'virtual/bitstream').replace('arm-trusted-firmware', 'virtual/arm-trusted-firmware')}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -45,8 +48,17 @@ BOOTGEN_ARCH_DEFAULT:versal-net = "versalnet"
 BOOTGEN_ARCH ?= "${BOOTGEN_ARCH_DEFAULT}"
 BOOTGEN_EXTRA_ARGS ?= ""
+QEMU_FLASH_TYPE ?= "qspi"
+BOOTSCR_DEP = ''
+BOOTSCR_DEP:versal = 'u-boot-xlnx-scr:do_deploy'
+BOOTSCR_DEP:versal-net = 'u-boot-xlnx-scr:do_deploy'
+BIF_BITSTREAM_ATTR ?= "${@bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', '', 'bitstream', d)}"
 do_patch[noexec] = "1"
+do_compile[depends] .= " ${BOOTSCR_DEP}"
 def create_bif(config, attrflags, attrimage, ids, common_attr, biffd, d):
    arch = d.getVar("SOC_FAMILY")
    bb.error("create_bif function not defined for arch: %s" % (arch))
@@ -177,6 +189,18 @@ do_compile() {
    fi
 }
+do_compile:append:versal() {
+    dd if=/dev/zero bs=256M count=1  > ${B}/qemu-${QEMU_FLASH_TYPE}.bin
+    dd if=${B}/BOOT.bin of=${B}/qemu-${QEMU_FLASH_TYPE}.bin bs=1 seek=0 conv=notrunc
+    dd if=${DEPLOY_DIR_IMAGE}/boot.scr of=${B}/qemu-${QEMU_FLASH_TYPE}.bin bs=1 seek=66584576 conv=notrunc
+}
+do_compile:append:versal-net() {
+    dd if=/dev/zero bs=256M count=1  > ${B}/qemu-${QEMU_FLASH_TYPE}.bin
+    dd if=${B}/BOOT.bin of=${B}/qemu-${QEMU_FLASH_TYPE}.bin bs=1 seek=0 conv=notrunc
+    dd if=${DEPLOY_DIR_IMAGE}/boot.scr of=${B}/qemu-${QEMU_FLASH_TYPE}.bin bs=1 seek=66584576 conv=notrunc
+}
 do_install() {
    install -d ${D}/boot
    install -m 0644 ${B}/BOOT.bin ${D}/boot/BOOT.bin
@@ -184,7 +208,7 @@ do_install() {
 inherit image-artifact-names
-QEMUQSPI_BASE_NAME ?= "QEMU_qspi-${MACHINE}${IMAGE_VERSION_SUFFIX}"
+QEMU_FLASH_IMAGE_NAME ?= "qemu-${QEMU_FLASH_TYPE}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
 BOOTBIN_BASE_NAME ?= "BOOT-${MACHINE}${IMAGE_VERSION_SUFFIX}"
@@ -199,12 +223,18 @@ do_deploy:append:versal () {
    install -m 0644 ${B}/BOOT_bh.bin ${DEPLOYDIR}/${BOOTBIN_BASE_NAME}_bh.bin
    ln -sf ${BOOTBIN_BASE_NAME}_bh.bin ${DEPLOYDIR}/BOOT-${MACHINE}_bh.bin
+    install -m 0644 ${B}/qemu-${QEMU_FLASH_TYPE}.bin ${DEPLOYDIR}/${QEMU_FLASH_IMAGE_NAME}.bin
+    ln -sf ${QEMU_FLASH_IMAGE_NAME}.bin ${DEPLOYDIR}/qemu-${QEMU_FLASH_TYPE}-${MACHINE}.bin
 }
 do_deploy:append:versal-net () {
    install -m 0644 ${B}/BOOT_bh.bin ${DEPLOYDIR}/${BOOTBIN_BASE_NAME}_bh.bin
    ln -sf ${BOOTBIN_BASE_NAME}_bh.bin ${DEPLOYDIR}/BOOT-${MACHINE}_bh.bin
+    install -m 0644 ${B}/qemu-${QEMU_FLASH_TYPE}.bin ${DEPLOYDIR}/${QEMU_FLASH_IMAGE_NAME}.bin
+    ln -sf ${QEMU_FLASH_IMAGE_NAME}.bin ${DEPLOYDIR}/qemu-${QEMU_FLASH_TYPE}-${MACHINE}.bin
 }
 FILES:${PN} += "/boot/BOOT.bin"
diff --git a/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb b/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
index b52c7853..17d8af8c 100644
--- a/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
@@ -37,4 +37,4 @@ do_deploy() {
    install -m 0644 ${B}/pmc_cdo.bin ${DEPLOYDIR}/pmc_cdo.bin
 }
-addtask do_deploy after do_compile
+addtask deploy before do_build after do_install
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 4783a329..fbe85f96 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -23,6 +23,9 @@ inherit devicetree image-artifact-names
 SYSTEM_DTFILE ??= ""
 CONFIG_DTFILE ??= "${SYSTEM_DTFILE}"
+SYSTEM_DTFILE_DEPENDS ??= ""
+DEPENDS += "${SYSTEM_DTFILE_DEPENDS}"
 BASE_DTS ?= "${@os.path.splitext(os.path.basename(d.getVar('CONFIG_DTFILE') or ''))[0] or 'system-top'}"
 EXTRA_DT_FILES ?= ""
@@ -31,12 +34,12 @@ EXTRA_DTFILES_BUNDLE ?= ""
 UBOOT_DT_FILES ?= ""
 UBOOT_DTFILE_PREFIX ?= "system-top"
 UBOOT_DTFILES_BUNDLE ?= ""
-EXTRA_OVERLAYS ?= ""
+EXTRA_DT_INCLUDE_FILES ?= ""
 SYSTEM_DTFILE[doc] = "System Device Tree which accepts at 0...1 dts file"
 CONFIG_DTFILE[doc] = "Domain Specific Device Tree which accepts 0...1 dts file"
 EXTRA_DT_FILES[doc] = "Add extra files to DT_FILES_PATH, it accepts 1...n dtsi files and adds to SRC_URI"
-EXTRA_OVERLAYS[doc] = "Add extra files to DT_FILES_PATH and adds a #include for each to the BASE_DTS, it access 1..n dtsi files and adds to SRC_URI"
+EXTRA_DT_INCLUDE_FILES[doc] = "Add extra files to DT_FILES_PATH and adds a #include for each to the BASE_DTS, it access 1..n dtsi files and adds to SRC_URI"
 # There should only be ONE CONFIG_DTFILE listed
 # These need to be passed in from global, not from a bbappend
@@ -44,7 +47,7 @@ FILESEXTRAPATHS:prepend := "${@'%s:' % os.path.dirname(d.getVar('CONFIG_DTFILE')
 SRC_URI:append := " ${@'file://%s' % os.path.basename(d.getVar('CONFIG_DTFILE') or '') if (d.getVar('CONFIG_DTFILE')) else ''}"
 SRC_URI:append = " ${@" ".join(["file://%s" % f for f in (d.getVar('EXTRA_DT_FILES') or "").split()])}"
-SRC_URI:append = " ${@" ".join(["file://%s" % f for f in (d.getVar('EXTRA_OVERLAYS') or "").split()])}"
+SRC_URI:append = " ${@" ".join(["file://%s" % f for f in (d.getVar('EXTRA_DT_INCLUDE_FILES') or "").split()])}"
 COMPATIBLE_MACHINE:zynq   = ".*"
 COMPATIBLE_MACHINE:zynqmp = ".*"
@@ -62,7 +65,7 @@ DTB_FILE_NAME ?= "${BASE_DTS}.dtb"
 DTB_BASE_NAME ?= "${MACHINE}-system${IMAGE_VERSION_SUFFIX}"
-# Copy the EXTRA_DT_FILES and EXTRA_OVERLAYS files in prepend operation so that
+# Copy the EXTRA_DT_FILES and EXTRA_DT_INCLUDE_FILES files in prepend operation so that
 # it can be preprocessed.
 do_configure:prepend () {
    # Create DT_FILES_PATH directory if doesn't exist during prepend operation.
@@ -70,7 +73,7 @@ do_configure:prepend () {
        mkdir -p ${DT_FILES_PATH}
    fi
-    for f in ${EXTRA_DT_FILES} ${EXTRA_OVERLAYS}; do
+    for f in ${EXTRA_DT_FILES} ${EXTRA_DT_INCLUDE_FILES}; do
        if [ "$(realpath ${WORKDIR}/${f})" != "$(realpath ${DT_FILES_PATH}/`basename ${f}`)" ]; then
            cp ${WORKDIR}/${f} ${DT_FILES_PATH}/
        fi
@@ -78,12 +81,12 @@ do_configure:prepend () {
 }
 do_configure:append () {
-    for f in ${EXTRA_OVERLAYS}; do
+    for f in ${EXTRA_DT_INCLUDE_FILES}; do
        if [ ! -e ${DT_FILES_PATH}/${BASE_DTS}.dts ]; then
            if [ -e ${DT_FILES_PATH}/${BASE_DTS}.dtb ]; then
-                bberror "Unable to find ${BASE_DTS}.dts, to use EXTRA_OVERLAYS you must use a 'dts' and not 'dtb' in CONFIG_DTFILE"
+                bberror "Unable to find ${BASE_DTS}.dts, to use EXTRA_DT_INCLUDE_FILES you must use a 'dts' and not 'dtb' in CONFIG_DTFILE"
            else
-                bberror "Unable to find ${BASE_DTS}.dts, to use EXTRA_OVERLAYS you must set a valid CONFIG_DTFILE or use system-top.dts"
+                bberror "Unable to find ${BASE_DTS}.dts, to use EXTRA_DT_INCLUDE_FILES you must set a valid CONFIG_DTFILE or use system-top.dts"
            fi
            exit 1
        fi
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb
new file mode 100644
index 00000000..88dec7b8
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb
@@ -0,0 +1,74 @@
+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 = "xlnx_rel_v2024.2"
+SRCREV = "839e8e646c54a63326e36c48a7bd879f5e8efa31"
+SOMAJOR = "2"
+SOMINOR = "0"
+SOVERSION = "${SOMAJOR}.${SOMINOR}"
+# Don't allow building for Zynq and Microblaze MACHINE unless it is supported.
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
+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/embeddedsw/imgrcry.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/imgrcry.bb
new file mode 100644
index 00000000..e87e8793
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/imgrcry.bb
@@ -0,0 +1,69 @@
+DESCRIPTION = "Image Recovery"
+LICENSE = "CLOSED"
+PROVIDES = "virtual/imgrcry"
+INHIBIT_DEFAULT_DEPS = "1"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+# Since we're just copying, we can run any config
+COMPATIBLE_HOST = ".*"
+# Default expects the user to provide the imagerecovery in the deploy
+# directory, named "image-recovery-${MACHINE}.bin" and "image-recovery-${MACHINE}.bin"
+# A machine, multiconfig, or local.conf should override this
+IMGRCRY_DEPENDS ??= ""
+IMGRCRY_MCDEPENDS ??= ""
+IMGRCRY_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+IMGRCRY_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+IMGRCRY_IMAGE_NAME ??= "image-recovery-${MACHINE}"
+# Default is for the multilib case (without the extension .bin)
+IMGRCRY_FILE ??= "${IMGRCRY_DEPLOY_DIR}/${IMGRCRY_IMAGE_NAME}"
+IMGRCRY_FILE[vardepsexclude] = "IMGRCRY_DEPLOY_DIR"
+do_fetch[depends] += "${IMGRCRY_DEPENDS}"
+do_fetch[mcdepends] += "${IMGRCRY_MCDEPENDS}"
+inherit deploy
+# If the item is already in OUR deploy_image_dir, nothing to deploy!
+SHOULD_DEPLOY = "${@'false' if (d.getVar('IMGRCRY_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 ${IMGRCRY_FILE}.bin ${DEPLOYDIR}/${IMGRCRY_IMAGE_NAME}.bin
+        install -Dm 0644 ${IMGRCRY_FILE}.elf ${DEPLOYDIR}/${IMGRCRY_IMAGE_NAME}.elf
+    fi
+}
+addtask deploy before do_build after do_install
+INSANE_SKIP:${PN} = "arch"
+INSANE_SKIP:${PN}-dbg = "arch"
+# Disable buildpaths QA check warnings.
+INSANE_SKIP:${PN} += "buildpaths"
+def check_imgrcry_variables(d):
+    # If both are blank, the user MUST pass in the path to the firmware!
+    if not d.getVar('IMGRCRY_DEPENDS') and not d.getVar('IMGRCRY_MCDEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+        if not os.path.exists(d.getVar('IMGRCRY_FILE') + ".bin"):
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("The expected file %s.bin is not available.\nSet IMGRCRY_FILE to the path with a precompiled IMGRCRY binary." % d.getVar('IMGRCRY_FILE'))
+        else:
+            # We found the file, so be sure to track it
+            d.setVar('SRC_URI', 'file://${IMGRCRY_FILE}.bin')
+            d.setVarFlag('do_install', 'file-checksums', '${IMGRCRY_FILE}.bin:True')
+            d.setVarFlag('do_deploy', 'file-checksums', '${IMGRCRY_FILE}.bin:True')
+python() {
+    # Need to allow bbappends to change the check
+    check_imgrcry_variables(d)
+}
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/imgsel.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/imgsel.bb
new file mode 100644
index 00000000..0c0f1549
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/imgsel.bb
@@ -0,0 +1,72 @@
+DESCRIPTION = "Image Selector"
+LICENSE = "CLOSED"
+PROVIDES = "virtual/imgsel"
+INHIBIT_DEFAULT_DEPS = "1"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+# Since we're just copying, we can run any config
+COMPATIBLE_HOST = ".*"
+# Default expects the user to provide the imageselector in the deploy
+# directory, named "image-selector-${MACHINE}.bin" and "image-selector-${MACHINE}.bin"
+# A machine, multiconfig, or local.conf should override this
+IMGSEL_DEPENDS ??= ""
+IMGSEL_MCDEPENDS ??= ""
+IMGSEL_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+IMGSEL_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+IMGSEL_IMAGE_NAME ??= "image-selector-${MACHINE}"
+# Default is for the multilib case (without the extension .bin)
+IMGSEL_FILE ??= "${IMGSEL_DEPLOY_DIR}/${IMGSEL_IMAGE_NAME}"
+IMGSEL_FILE[vardepsexclude] = "IMGSEL_DEPLOY_DIR"
+do_fetch[depends] += "${IMGSEL_DEPENDS}"
+do_fetch[mcdepends] += "${IMGSEL_MCDEPENDS}"
+inherit deploy
+# If the item is already in OUR deploy_image_dir, nothing to deploy!
+SHOULD_DEPLOY = "${@'false' if (d.getVar('IMGSEL_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 ${IMGSEL_FILE}.bin ${DEPLOYDIR}/${IMGSEL_IMAGE_NAME}.bin
+        install -Dm 0644 ${IMGSEL_FILE}.elf ${DEPLOYDIR}/${IMGSEL_IMAGE_NAME}.elf
+    fi
+}
+addtask deploy before do_build after do_install
+INSANE_SKIP:${PN} = "arch"
+INSANE_SKIP:${PN}-dbg = "arch"
+# Disable buildpaths QA check warnings.
+INSANE_SKIP:${PN} += "buildpaths"
+#SYSROOT_DIRS += "/boot"
+#FILES:${PN} = "/boot/${PN}.bin"
+def check_imgsel_variables(d):
+    # If both are blank, the user MUST pass in the path to the firmware!
+    if not d.getVar('IMGSEL_DEPENDS') and not d.getVar('IMGSEL_MCDEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+        if not os.path.exists(d.getVar('IMGSEL_FILE') + ".bin"):
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("The expected file %s.bin is not available.\nSet IMGSEL_FILE to the path with a precompiled IMGSEL binary." % d.getVar('IMGSEL_FILE'))
+        else:
+            # We found the file, so be sure to track it
+            d.setVar('SRC_URI', 'file://${IMGSEL_FILE}.bin')
+            d.setVarFlag('do_install', 'file-checksums', '${IMGSEL_FILE}.bin:True')
+            d.setVarFlag('do_deploy', 'file-checksums', '${IMGSEL_FILE}.bin:True')
+python() {
+    # Need to allow bbappends to change the check
+    check_imgsel_variables(d)
+}
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.2.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.2.bb
new file mode 100644
index 00000000..3a097b24
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.2.bb
@@ -0,0 +1,25 @@
+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 ?= "xlnx_rel_v2024.2"
+REPO ?= "git://github.com/Xilinx/libdfx.git;protocol=https"
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+SRCREV = "af8d735fae286e7bc94c830a86c960598a4ac014"
+# Don't allow building for Zynq and Microblaze MACHINE unless it is supported.
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
+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/trusted-firmware-a/trusted-firmware-a_2.10.0-xilinx-v2024.2.bb b/meta-xilinx-core/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0-xilinx-v2024.2.bb
new file mode 100644
index 00000000..e6ba4938
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0-xilinx-v2024.2.bb
@@ -0,0 +1,154 @@
+require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
+DEPENDS:remove:zynqmp:qemuall = " optee-os"
+DEPENDS:remove:versal:qemuall = " optee-os"
+DEPENDS:remove:versal-net:qemuall = " optee-os"
+# Xilinx TF-A v2.10
+SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/Xilinx/arm-trusted-firmware.git;protocol=https"
+SRCREV_tfa = "14cea4616b6edaceabb607c7c92332436a1699e5"
+SRCBRANCH = "xlnx_rebase_v2.10"
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
+# mbedtls-3.4.1 is not enabled in this configuration
+# The following are Xilinx specific settings
+PROVIDES = "virtual/arm-trusted-firmware"
+COMPATIBLE_MACHINE ?= "^$"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
+### Platform Settings
+TFA_PLATFORM:zynqmp     = "zynqmp"
+TFA_PLATFORM:versal     = "versal"
+TFA_PLATFORM:versal-net = "versal_net"
+### Console settings
+TFA_CONSOLE_DEFAULT = ""
+TFA_CONSOLE_DEFAULT:zynqmp = "cadence"
+TFA_CONSOLE_DEFAULT:versal = "pl011"
+TFA_CONSOLE_DEFAULT:versal-net = "pl011"
+# Use old name for compatibility
+ATF_CONSOLE ?= "${TFA_CONSOLE_DEFAULT}"
+# Old name to new name
+TFA_CONSOLE ?= "${ATF_CONSOLE}"
+TFA_CONSOLE_OEMAKE = ""
+TFA_CONSOLE_OEMAKE:append:zynqmp = "${@' ZYNQMP_CONSOLE=${TFA_CONSOLE}' if d.getVar('TFA_CONSOLE', True) != '' else ''}"
+TFA_CONSOLE_OEMAKE:append:versal = "${@' VERSAL_CONSOLE=${TFA_CONSOLE}' if d.getVar('TFA_CONSOLE', True) != '' else ''}"
+TFA_CONSOLE_OEMAKE:append:versal-net = "${@' VERSAL_NET_CONSOLE=${TFA_CONSOLE}' if d.getVar('TFA_CONSOLE', True) != '' else ''}"
+EXTRA_OEMAKE += "${TFA_CONSOLE_OEMAKE}"
+### Debug settings
+DEBUG_ATF_DEFAULT = ""
+DEBUG_ATF_DEFAULT:versal = "1"
+DEBUG_ATF_DEFAULT:versal-net = "1"
+DEBUG_ATF ?= "${DEBUG_ATF_DEFAULT}"
+# Translate old to new name
+TFA_DEBUG = "${DEBUG_ATF}"
+### Mem Settings
+ATF_MEM_BASE ?= ""
+ATF_MEM_SIZE ?= ""
+TFA_MEM_BASE ?= "${ATF_MEM_BASE}"
+TFA_MEM_SIZE ?= "${ATF_MEM_SIZE}"
+TFA_MEM_OEMAKE = ""
+TFA_MEM_OEMAKE:append:zynqmp     = "${@' ZYNQMP_ATF_MEM_BASE=${ATF_MEM_BASE}'     if d.getVar('ATF_MEM_BASE', True) != '' else ''}"
+TFA_MEM_OEMAKE:append:zynqmp     = "${@' ZYNQMP_ATF_MEM_SIZE=${ATF_MEM_SIZE}'     if d.getVar('ATF_MEM_SIZE', True) != '' else ''}"
+TFA_MEM_OEMAKE:append:versal     = "${@' VERSAL_ATF_MEM_BASE=${ATF_MEM_BASE}'     if d.getVar('ATF_MEM_BASE', True) != '' else ''}"
+TFA_MEM_OEMAKE:append:versal     = "${@' VERSAL_ATF_MEM_SIZE=${ATF_MEM_SIZE}'     if d.getVar('ATF_MEM_SIZE', True) != '' else ''}"
+TFA_MEM_OEMAKE:append:versal-net = "${@' VERSAL_NET_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}"
+TFA_MEM_OEMAKE:append:versal-net = "${@' VERSAL_NET_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}"
+EXTRA_OEMAKE += "${TFA_MEM_OEMAKE}"
+### Preloaded Base
+TFA_BL33_LOAD ?= ""
+EXTRA_OEMAKE += "${@' PRELOADED_BL33_BASE=${TFA_BL33_LOAD}' if d.getVar('TFA_BL33_LOAD', True) != '' else ''}"
+# Workaround for bl31.elf has a LOAD segment with RWX permissions
+EXTRA_OEMAKE += ' TF_LDFLAGS="--no-warn-rwx-segments --fatal-warnings -O1 --gc-sections"'
+# We use bl31
+TFA_BUILD_TARGET = "bl31"
+TFA_INSTALL_TARGET = "bl31"
+inherit image-artifact-names
+# arm-trusted-firmware instead of ${PN} for compatibility
+ATF_BASE_NAME ?= "arm-trusted-firmware-${PKGE}-${PKGV}-${PKGR}${IMAGE_VERSION_SUFFIX}"
+do_install:append() {
+    # The first TFA_INSTALL_TARGET found will be copied as the standard boot firmware
+    for atfbin in ${TFA_INSTALL_TARGET} ; do
+        install -d ${D}/boot
+        if [ -e ${D}/firmware/$atfbin-${TFA_PLATFORM}.elf ]; then
+            ln ${D}/firmware/$atfbin-${TFA_PLATFORM}.elf ${D}/boot/${ATF_BASE_NAME}.elf
+            ln -sf ${ATF_BASE_NAME}.elf ${D}/boot/arm-trusted-firmware.elf
+            ln ${D}/firmware/$atfbin-${TFA_PLATFORM}.bin ${D}/boot/${ATF_BASE_NAME}.bin
+            ln -sf ${ATF_BASE_NAME}.bin ${D}/boot/arm-trusted-firmware.bin
+            # Get the entry point address from the elf.
+            BL31_BASE_ADDR=$(${READELF} -h ${D}/boot/${ATF_BASE_NAME}.elf | egrep -m 1 -i "entry point.*?0x" | sed -r 's/.*?(0x.*?)/\1/g')
+            mkimage -A arm64 -O arm-trusted-firmware -T kernel -C none \
+                    -a $BL31_BASE_ADDR -e $BL31_BASE_ADDR \
+                    -d ${D}/firmware/$atfbin-${TFA_PLATFORM}.bin ${D}/boot/${ATF_BASE_NAME}.ub
+            ln -sf ${ATF_BASE_NAME}.ub ${D}/boot/arm-trusted-firmware.ub
+            ln -sf ${ATF_BASE_NAME}.ub ${D}/boot/atf-uboot.ub
+            break
+        fi
+    done
+}
+inherit deploy
+DEPENDS += "u-boot-mkimage-native"
+do_deploy() {
+    # Copy the /boot items to deploy
+    install -d ${DEPLOYDIR}
+    install -m 0644 ${D}/boot/${ATF_BASE_NAME}.elf ${DEPLOYDIR}/${ATF_BASE_NAME}.elf
+    ln -sf ${ATF_BASE_NAME}.elf ${DEPLOYDIR}/arm-trusted-firmware.elf
+    install -m 0644 ${D}/boot/${ATF_BASE_NAME}.bin ${DEPLOYDIR}/${ATF_BASE_NAME}.bin
+    ln -sf ${ATF_BASE_NAME}.bin ${DEPLOYDIR}/arm-trusted-firmware.bin
+    install -m 0644 ${D}/boot/${ATF_BASE_NAME}.ub ${DEPLOYDIR}/${ATF_BASE_NAME}.ub
+    ln -sf ${ATF_BASE_NAME}.ub ${DEPLOYDIR}/arm-trusted-firmware.ub
+    ln -sf ${ATF_BASE_NAME}.ub ${DEPLOYDIR}/atf-uboot.ub
+}
+addtask deploy before do_build after do_compile
+SYSROOT_DIRS += "/boot"
+FILES:${PN} += "/boot/*.elf /boot/*.bin /boot/*.ub"
+RPROVIDES:${PN} += "arm-trusted-firmware"
+python() {
+    soc_family = d.getVar('SOC_FAMILY')
+    tfa_console = d.getVar('TFA_CONSOLE')
+    # See plat/xilinx/<soc_family>/platform.mk
+    if soc_family and soc_family == "zynqmp":
+        if not tfa_console in [ 'cadence', 'cadence0', 'cadence1', 'dcc' ]:
+            raise bb.parse.SkipRecipe('TFA_CONSOLE (%s) is not configured properly for ZynqMP, only cadence, cadence0, cadence1, and dcc are valid options.' % (tfa_console))
+    elif soc_family and soc_family == "versal":
+        if not tfa_console in [ 'pl011', 'pl011_0', 'pl011_1', 'dcc' ]:
+            raise bb.parse.SkipRecipe('TFA_CONSOLE (%s) is not configured properly for Versal, only pl011, pl011_0, pl011_1, and dcc are valid options.' % (tfa_console))
+    elif soc_family and soc_family == "versal-net":
+        if not tfa_console in [ 'pl011', 'pl011_0', 'pl011_1', 'dcc' ]:
+            raise bb.parse.SkipRecipe('TFA_CONSOLE (%s) is not configured properly for Versal-Net, only pl011, pl011_0, pl011_1, and dcc are valid options.' % (tfa_console))
+}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.2.bb
new file mode 100644
index 00000000..4214fdd9
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.2.bb
@@ -0,0 +1,21 @@
+require u-boot-tools-xlnx.inc
+require u-boot-xlnx-2024.2.inc
+# MUST clear CONFIG_VIDEO to avoid a compilation failure trying to construct
+# bmp_logo.h
+SED_CONFIG_EFI:append = ' -e "s/CONFIG_VIDEO=.*/# CONFIG_VIDEO is not set/"'
+# Default do_compile fails with:
+# | error: object directory ../downloads/git2/github.com.Xilinx.u-boot-xlnx.git/objects does not exist; check .git/objects/info/alternates.
+# The regular workaround of calling 'git diff' seems to be problematic.
+do_compile () {
+        oe_runmake -C ${S} tools-only_defconfig O=${B}
+        # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
+        # generating it requires bin2header tool, which for target build
+        # is built with target tools and thus cannot be executed on host.
+        sed -i -e "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" ${SED_CONFIG_EFI} ${B}/.config
+        oe_runmake -C ${S} cross_tools NO_SDL=1 O=${B}
+}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.2.inc
new file mode 100644
index 00000000..feb9bbcd
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.2.inc
@@ -0,0 +1,17 @@
+UBRANCH = "xlnx_rebase_v2024.01"
+SRCREV = "7f6ec94aac7eacfec07bd45c83a6d17df4b7d383"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
+# u-boot-xlnx has support for these
+HAS_PLATFORM_INIT ?= " \
+                xilinx_zynqmp_virt_config \
+                xilinx_zynq_virt_defconfig \
+                xilinx_versal_vc_p_a2197_revA_x_prc_01_revA \
+                "
+DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2024.01:"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc
index bbf4125f..7eac6bfd 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc
@@ -9,7 +9,6 @@ IMPORT_CC_DTBS ?= ""
 CC_DTBS_DUP ?= ""
 IMPORT_CC_UBOOT_DTBS ?= ""
-DEPENDS:append:eval-brd-sc-zynqmp = " uboot-device-tree"
 MKIMAGE_DTBLOB_OPTS ?= "-E -B 0x8"
 # Everything is swtiched on with UBOOT_IMAGE_BLOB = '1'
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 678ae236..e13413a1 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
@@ -39,6 +39,9 @@ DDR_BASEADDR ?= "0x0"
 DDR_BASEADDR:microblaze ?= "0x80000000"
 PRE_BOOTENV ?= ""
+# Set debfault SD boot device to mmc 0 interface
+SDBOOTDEV ?= "0"
 SRC_URI = " \
    file://boot.cmd.sd.zynq \
    file://boot.cmd.sd.zynqmp \
@@ -81,7 +84,7 @@ DEVICETREE_OVERLAY_OFFSET:zynqmp ??= "0x100000"
 DEVICETREE_OVERLAY_OFFSET:zynq ??= "0x100000"
 DEVICETREE_OVERLAY_OFFSET:versal ??= "0x1000"
 DEVICETREE_OVERLAY_OFFSET:versal-net ??= "0x1000"
-DEVICETREE_OVERLAY_PADSIZE ??= "0xf00000"
+DEVICETREE_OVERLAY_PADSIZE ??= "0x1f00000"
 DEVICETREE_OVERLAY_ADDRESS ?= "${@hex(int(append_baseaddr(d,d.getVar('DEVICETREE_OVERLAY_OFFSET')),16) \
                                + int(d.getVar('DEVICETREE_OVERLAY_PADSIZE'),16))}"
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 e09bdfa9..f60a1ea9 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
@@ -13,7 +13,6 @@ rootfs_name=@@RAMDISK_IMAGE@@
 setenv get_bootargs 'fdt addr $fdtcontroladdr;fdt get value bootargs /chosen bootargs;'
 setenv update_bootargs 'if test -n ${launch_ramdisk_init} && test ${bootargs} = "";then if run get_bootargs;then setenv bootargs "\$bootargs launch_ramdisk_init=${launch_ramdisk_init} $extrabootargs";fi;fi'
 for boot_target in ${boot_targets};
 do
        echo "Trying to load boot images from ${boot_target}"
@@ -83,4 +82,15 @@ do
                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@;
                echo "Booting using Separate images failed"
        fi
+        if test "${boot_target}" = "nor" || test "${boot_target}" = "nor0"; then
+                cp.b @@QSPI_FIT_IMAGE_OFFSET@@ @@FIT_IMAGE_LOAD_ADDRESS@@ @@QSPI_FIT_IMAGE_SIZE@@
+                bootm @@FIT_IMAGE_LOAD_ADDRESS@@;
+                echo "Booting using Fit image failed"
+                cp.b @@QSPI_KERNEL_OFFSET@@ @@KERNEL_LOAD_ADDRESS@@ @@QSPI_KERNEL_SIZE@@
+                cp.b @@QSPI_RAMDISK_OFFSET@@ @@RAMDISK_IMAGE_ADDRESS@@ @@QSPI_RAMDISK_SIZE@@
+                run update_bootargs
+                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@;
+                echo "Booting using Separate images failed"
+fi
 done
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic.root b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic.root
index ed12f941..a3ec1286 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic.root
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic.root
@@ -9,6 +9,7 @@ ramdisk_name=@@RAMDISK_IMAGE1@@
 rootfs_name=@@RAMDISK_IMAGE@@
 @@PRE_BOOTENV@@
 for boot_target in ${boot_targets};
 do
        echo "Trying to load boot images from ${boot_target}"
@@ -43,17 +44,17 @@ do
                fi
                echo "Checking for /${kernel_name}"
                if test -e ${devtype} ${devnum}:${distro_bootpart} /${kernel_name}; then
-                        echo "Loading ${kernel_name}";
+                        echo "Loading ${kernel_name} at @@KERNEL_LOAD_ADDRESS@@";
                        fatload ${devtype} ${devnum}:${distro_bootpart} @@KERNEL_LOAD_ADDRESS@@ ${kernel_name};
                fi
                echo "Checking for /system.dtb"
                if test -e ${devtype} ${devnum}:${distro_bootpart} /system.dtb; then
-                        echo "Loading system.dtb";
+                        echo "Loading system.dtb at @@DEVICETREE_ADDRESS@@";
                        fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_ADDRESS@@ system.dtb;
                fi
                echo "Checking for /devicetree/openamp.dtbo"
                if test -e ${devtype} ${devnum}:${distro_bootpart} /devicetree/openamp.dtbo; then
-                        echo "Loading and merging openamp.dtbo into device tree";
+                        echo "Loading and merging openamp.dtbo into device tree at @@DEVICETREE_OVERLAY_ADDRESS@@";
                        fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_OVERLAY_ADDRESS@@ devicetree/openamp.dtbo;
                        fdt addr @@DEVICETREE_ADDRESS@@
                        fdt resize 8192
@@ -61,7 +62,7 @@ do
                fi
                echo "Checking for /${ramdisk_name}"
                if test -e ${devtype} ${devnum}:${distro_bootpart} /${ramdisk_name} && test "${skip_tinyramdisk}" != "yes"; then
-                        echo "Loading ${ramdisk_name}";
+                        echo "Loading ${ramdisk_name} at @@RAMDISK_IMAGE_ADDRESS@@";
                        fatload ${devtype} ${devnum}:${distro_bootpart} @@RAMDISK_IMAGE_ADDRESS@@ ${ramdisk_name};
                        fdt addr @@DEVICETREE_ADDRESS@@
                        fdt get value bootargs /chosen bootargs
@@ -70,7 +71,7 @@ do
                fi
                echo "Checking for /${rootfs_name}"
                if test -e ${devtype} ${devnum}:${distro_bootpart} /${rootfs_name} && test "${skip_ramdisk}" != "yes"; then
-                        echo "Loading ${rootfs_name}";
+                        echo "Loading ${rootfs_name} at @@RAMDISK_IMAGE_ADDRESS@@";
                        fatload ${devtype} ${devnum}:${distro_bootpart} @@RAMDISK_IMAGE_ADDRESS@@ ${rootfs_name};
                        fdt addr @@DEVICETREE_ADDRESS@@
                        fdt get value bootargs /chosen bootargs
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 1efc5392..dafaab25 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
@@ -16,7 +16,7 @@ def remove_task_from_depends(d):
    extra_imagedepends = d.getVar('EXTRA_IMAGEDEPENDS') or ''
    uenv_depends = ''
    for imagedepend in extra_imagedepends.split():
-        if imagedepend == d.getVar("BPN"):
+        if imagedepend == d.getVar("BPN") or '':
            continue
        elif ':' in imagedepend:
            uenv_depends += ' %s' % imagedepend.split(':')[0]
@@ -25,16 +25,16 @@ def remove_task_from_depends(d):
    return uenv_depends
 def uboot_boot_cmd(d):
-    if d.getVar("KERNEL_IMAGETYPE") in ["uImage", "fitImage"]:
+    if (d.getVar("KERNEL_IMAGETYPE") or '') in ["uImage", "fitImage"]:
        return "bootm"
-    if d.getVar("KERNEL_IMAGETYPE") in ["zImage"]:
+    if (d.getVar("KERNEL_IMAGETYPE") or '') in ["zImage"]:
        return "bootz"
-    if d.getVar("KERNEL_IMAGETYPE") in ["Image"]:
+    if (d.getVar("KERNEL_IMAGETYPE") or '') in ["Image"]:
        return "booti"
    raise bb.parse.SkipRecipe("Unsupport kernel image type")
 def get_sdbootdev(d):
-    if d.getVar("SOC_FAMILY") in ["zynqmp"]:
+    if (d.getVar("SOC_FAMILY") or '') in ["zynqmp"]:
        return "${devnum}"
    else:
        return "0"
@@ -43,24 +43,24 @@ def uenv_populate(d):
    # populate the environment values
    env = {}
-    env["machine_name"] = d.getVar("MACHINE")
+    env["machine_name"] = d.getVar("MACHINE") or ''
-    env["kernel_image"] = d.getVar("KERNEL_IMAGETYPE")
+    env["kernel_image"] = d.getVar("KERNEL_IMAGETYPE") or ''
-    env["kernel_load_address"] = d.getVar("KERNEL_LOAD_ADDRESS")
+    env["kernel_load_address"] = d.getVar("KERNEL_LOAD_ADDRESS") or ''
    env["devicetree_image"] = boot_files_dtb_filepath(d)
-    env["devicetree_load_address"] = d.getVar("DEVICETREE_LOAD_ADDRESS")
+    env["devicetree_load_address"] = d.getVar("DEVICETREE_LOAD_ADDRESS") or ''
-    env["devicetree_overlay_load_address" ] = d.getVar("DEVICETREE_OVERLAY_LOAD_ADDRESS")
+    env["devicetree_overlay_load_address" ] = d.getVar("DEVICETREE_OVERLAY_LOAD_ADDRESS") or ''
-    env["bootargs"] = d.getVar("KERNEL_BOOTARGS")
+    env["bootargs"] = d.getVar("KERNEL_BOOTARGS") or ''
    env["loadkernel"] = "fatload mmc " + get_sdbootdev(d) + " ${kernel_load_address} ${kernel_image}"
    env["loaddtb"] = "fatload mmc  " + get_sdbootdev(d) + " ${devicetree_load_address} ${devicetree_image}"
    env["loaddtbo"] = "if test -e mmc " + get_sdbootdev(d) + " /devicetree/openamp.dtbo; then fatload mmc " + get_sdbootdev(d) + " ${devicetree_overlay_load_address} /devicetree/openamp.dtbo ; fdt addr ${devicetree_load_address} ; fdt resize 8192 ; fdt apply ${devicetree_overlay_load_address} ; fi"
    env["bootkernel"] = "run loadkernel && run loaddtb && run loaddtbo && " + uboot_boot_cmd(d) + " ${kernel_load_address} - ${devicetree_load_address}"
-    if d.getVar("SOC_FAMILY") in ["zynqmp"]:
+    if (d.getVar("SOC_FAMILY") or '') in ["zynqmp"]:
-        env["bootkernel"] = "setenv bootargs " +  d.getVar("KERNEL_BOOTARGS") + " ; " + env["bootkernel"]
+        env["bootkernel"] = "setenv bootargs " +  (d.getVar("KERNEL_BOOTARGS") or '') + " ; " + env["bootkernel"]
    # default uenvcmd does not load bitstream
    env["uenvcmd"] = "run bootkernel"
@@ -89,7 +89,8 @@ KERNEL_LOAD_ADDRESS:zynq = "0x2080000"
 KERNEL_LOAD_ADDRESS:zynqmp = "0x200000"
 DEVICETREE_LOAD_ADDRESS:zynq = "0x2000000"
 DEVICETREE_LOAD_ADDRESS:zynqmp = "0x4000000"
-DEVICETREE_OVERLAY_LOAD_ADDRESS = "${@hex(int(d.getVar("DEVICETREE_LOAD_ADDRESS"),16) + 0xf00000)}"
+DEVICETREE_OVERLAY_LOAD_ADDRESS:zynq = "${@hex(int(d.getVar("DEVICETREE_LOAD_ADDRESS"),16) + 0xf00000)}"
+DEVICETREE_OVERLAY_LOAD_ADDRESS:zynqmp = "${@hex(int(d.getVar("DEVICETREE_LOAD_ADDRESS"),16) + 0xf00000)}"
 python do_compile() {
    env = uenv_populate(d)
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.2.bb
new file mode 100644
index 00000000..bcadf1e4
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.2.bb
@@ -0,0 +1,4 @@
+require u-boot-xlnx.inc
+require u-boot-spl-zynq-init.inc
+require u-boot-xlnx-2024.2.inc
diff --git a/meta-xilinx-core/recipes-connectivity/iproute2/iproute2.inc b/meta-xilinx-core/recipes-connectivity/iproute2/iproute2.inc
deleted file mode 100644
index b1bcc143..00000000
--- a/meta-xilinx-core/recipes-connectivity/iproute2/iproute2.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-SUMMARY = "TCP / IP networking and traffic control utilities"
-DESCRIPTION = "Iproute2 is a collection of utilities for controlling \
-TCP / IP networking and traffic control in Linux.  Of the utilities ip \
-and tc are the most important.  ip controls IPv4 and IPv6 \
-configuration and tc stands for traffic control."
-HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-SECTION = "base"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
-                    file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817"
-DEPENDS = "flex-native bison-native iptables libcap"
-inherit update-alternatives bash-completion pkgconfig
-CLEANBROKEN = "1"
-PACKAGECONFIG ??= "tipc elf devlink"
-PACKAGECONFIG[tipc] = ",,libmnl,"
-PACKAGECONFIG[elf] = ",,elfutils,"
-PACKAGECONFIG[devlink] = ",,libmnl,"
-PACKAGECONFIG[rdma] = ",,libmnl,"
-IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}"
-EXTRA_OEMAKE = "\
-    CC='${CC}' \
-    KERNEL_INCLUDE=${STAGING_INCDIR} \
-    DOCDIR=${docdir}/iproute2 \
-    SUBDIRS='${IPROUTE2_MAKE_SUBDIRS}' \
-    SBINDIR='${base_sbindir}' \
-    LIBDIR='${libdir}' \
-"
-do_configure:append () {
-    sh configure ${STAGING_INCDIR}
-    # Explicitly disable ATM support
-    sed -i -e '/TC_CONFIG_ATM/d' config.mk
-}
-do_install () {
-    oe_runmake DESTDIR=${D} install
-    mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2
-    install -d ${D}${datadir}
-    mv ${D}/share/* ${D}${datadir}/ || true
-    rm ${D}/share -rf || true
-}
-# The .so files in iproute2-tc are modules, not traditional libraries
-INSANE_SKIP:${PN}-tc = "dev-so"
-IPROUTE2_PACKAGES =+ "\
-    ${PN}-devlink \
-    ${PN}-genl \
-    ${PN}-ifstat \
-    ${PN}-ip \
-    ${PN}-lnstat \
-    ${PN}-nstat \
-    ${PN}-rtacct \
-    ${PN}-ss \
-    ${PN}-tc \
-    ${PN}-tipc \
-    ${PN}-rdma \
-"
-PACKAGE_BEFORE_PN = "${IPROUTE2_PACKAGES}"
-RDEPENDS:${PN} += "${PN}-ip"
-FILES:${PN}-tc = "${base_sbindir}/tc* \
-                  ${libdir}/tc/*.so"
-FILES:${PN}-lnstat = "${base_sbindir}/lnstat \
-                      ${base_sbindir}/ctstat \
-                      ${base_sbindir}/rtstat"
-FILES:${PN}-ifstat = "${base_sbindir}/ifstat"
-FILES:${PN}-ip = "${base_sbindir}/ip.${PN} ${sysconfdir}/iproute2"
-FILES:${PN}-genl = "${base_sbindir}/genl"
-FILES:${PN}-rtacct = "${base_sbindir}/rtacct"
-FILES:${PN}-nstat = "${base_sbindir}/nstat"
-FILES:${PN}-ss = "${base_sbindir}/ss"
-FILES:${PN}-tipc = "${base_sbindir}/tipc"
-FILES:${PN}-devlink = "${base_sbindir}/devlink"
-FILES:${PN}-rdma = "${base_sbindir}/rdma"
-ALTERNATIVE:${PN}-ip = "ip"
-ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}"
-ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip"
-ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE:${PN}-tc = "tc"
-ALTERNATIVE_LINK_NAME[tc] = "${base_sbindir}/tc"
-ALTERNATIVE_PRIORITY_${PN}-tc = "100"
diff --git a/meta-xilinx-core/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch b/meta-xilinx-core/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
deleted file mode 100644
index 74e3de1c..00000000
--- a/meta-xilinx-core/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c25f8d1f7a6203dfeb10b39f80ffd314bb84a58d Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Thu, 22 Dec 2016 15:26:30 +0200
-Subject: [PATCH] libc-compat.h: add musl workaround
-The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and
-__USE_MISC) to solve conflicts with libc provided headers. This patch makes
-libc-compat.h work for musl libc as well.
-Upstream-Status: Pending
-Taken From:
-https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
- include/uapi/linux/libc-compat.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
-index a159991..22198fa 100644
--- a/include/uapi/linux/libc-compat.h
-+++ b/include/uapi/linux/libc-compat.h
-@@ -50,10 +50,12 @@
- #define _LIBC_COMPAT_H
- 
- /* We have included glibc headers... */
-#if defined(__GLIBC__)
-+#if 1
-+#define __USE_MISC
- 
- /* Coordinate with glibc net/if.h header. */
- #if defined(_NET_IF_H) && defined(__USE_MISC)
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
- 
- /* GLIBC headers included first so don't define anything
-  * that would already be defined. */
diff --git a/meta-xilinx-core/recipes-connectivity/iproute2/iproute2_5.15.0.bb b/meta-xilinx-core/recipes-connectivity/iproute2/iproute2_5.15.0.bb
deleted file mode 100644
index 99a74339..00000000
--- a/meta-xilinx-core/recipes-connectivity/iproute2/iproute2_5.15.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require iproute2.inc
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
-           file://0001-libc-compat.h-add-musl-workaround.patch \
-           "
-SRC_URI[sha256sum] = "38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff"
-# CFLAGS are computed in Makefile and reference CCOPTS
-#
-EXTRA_OEMAKE:append = " CCOPTS='${CFLAGS}'"
diff --git a/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb b/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb
deleted file mode 100644
index 334b786b..00000000
--- a/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-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-core/packagegroups/packagegroup-lmsensors.bb b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-lmsensors.bb
new file mode 100644
index 00000000..d6df0b13
--- /dev/null
+++ b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-lmsensors.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "PetaLinux packages that provides tools and drivers for monitoring temperatures, voltage"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+inherit packagegroup
+LMSENSORS_PACKAGES = " \
+        lmsensors-sensors \
+        lmsensors-libsensors \
+        lmsensors-sensorsdetect \
+        "
+RDEPENDS:${PN} = "${LMSENSORS_PACKAGES}"
diff --git a/meta-xilinx-core/recipes-core/packagegroups/packagegroup-networking-stack.bb b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-networking-stack.bb
new file mode 100644
index 00000000..9378e372
--- /dev/null
+++ b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-networking-stack.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Packages to extend network stack"
+inherit packagegroup
+NETWORKING_STACK_PACKAGES = " \
+        ethtool \
+        phytool \
+        netcat \
+        net-tools \
+        dnsmasq \
+        iproute2 \
+        iptables \
+        rpcbind \
+        iperf2 \
+        iperf3 \
+        "
+RDEPENDS:${PN} = "${NETWORKING_STACK_PACKAGES}"
diff --git a/meta-xilinx-core/recipes-core/packagegroups/packagegroup-opencv.bb b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-opencv.bb
new file mode 100644
index 00000000..2742b99e
--- /dev/null
+++ b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-opencv.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "PetaLinux opencv supported packages"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+inherit packagegroup
+OPENCV_PACKAGES = " \
+        opencv \
+        libopencv-core \
+        libopencv-highgui \
+        libopencv-imgproc \
+        libopencv-objdetect \
+        libopencv-ml \
+        libopencv-calib3d \
+        libopencv-ccalib \
+        "
+RDEPENDS:${PN} = "${OPENCV_PACKAGES}"
diff --git a/meta-xilinx-core/recipes-core/packagegroups/packagegroup-xilinx-audio.bb b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-xilinx-audio.bb
new file mode 100644
index 00000000..45862a87
--- /dev/null
+++ b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-xilinx-audio.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "ASLA supported packages"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+inherit packagegroup
+ALSA_PACKAGES = " \
+        libasound \
+        alsa-plugins \
+        alsa-tools \
+        alsa-utils \
+        alsa-utils-scripts \
+        sox \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-server pulseaudio-client-conf-sato pulseaudio-misc', '', d)} \
+        "
+RDEPENDS:${PN} = "${ALSA_PACKAGES}"
diff --git a/meta-xilinx-core/recipes-core/packagegroups/packagegroup-xilinx-benchmarks.bb b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-xilinx-benchmarks.bb
new file mode 100644
index 00000000..90131e32
--- /dev/null
+++ b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-xilinx-benchmarks.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Packages for Benchmarks"
+inherit packagegroup
+BENCHMARKS_EXTRAS = " \
+        hdparm \
+        iotop \
+        nicstat \
+        lmbench \
+        iptraf \
+        net-snmp \
+        lsof \
+        babeltrace \
+        sysstat \
+        dool \
+        dhrystone \
+        linpack \
+        whetstone \
+        iperf3 \
+        "
+RDEPENDS:${PN} = "${BENCHMARKS_EXTRAS}"
diff --git a/meta-xilinx-core/recipes-core/packagegroups/packagegroup-xilinx-gstreamer.bb b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-xilinx-gstreamer.bb
new file mode 100644
index 00000000..26aa26a2
--- /dev/null
+++ b/meta-xilinx-core/recipes-core/packagegroups/packagegroup-xilinx-gstreamer.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "GStreamer packages"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
+GSTREAMER_PACKAGES = " \
+        gstreamer1.0 \
+        gstreamer1.0-python \
+        gstreamer1.0-meta-base \
+        gstreamer1.0-plugins-base \
+        gstreamer1.0-plugins-good \
+        gstreamer1.0-plugins-bad \
+        gstreamer1.0-rtsp-server \
+        gst-shark \
+        gstd \
+        gst-perf \
+        gstreamer1.0-omx \
+        "
+RDEPENDS:${PN} = "${GSTREAMER_PACKAGES}"
diff --git a/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.1.bb b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.2.bb
index 3c68f10d..ba6d829d 100644
--- a/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.1.bb
+++ b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.2.bb
@@ -10,8 +10,8 @@ DEPENDS += "openssl"
 RDEPENDS:${PN} += "openssl"
 REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
-BRANCH = "xlnx_rel_v2024.1"
+BRANCH = "xlnx_rel_v2024.2"
-SRCREV = "92e09bf37ea17d7b1f0e102a2548f27fb768651c"
+SRCREV = "6f448fece5d999985128fd454ae047e065a5e45d"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-bokeh_3.5.1.bb b/meta-xilinx-core/recipes-devtools/python/python3-bokeh_3.5.1.bb
new file mode 100644
index 00000000..75295dec
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/python/python3-bokeh_3.5.1.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Interactive plots and applications in the browser from Python"
+HOMEPAGE = "https://bokeh.org"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4d2241e774601133cb2c58ae1277f9a5"
+DEPENDS += " \
+        python3-colorama-native \
+        python3-setuptools-git-versioning-native \
+        "
+SRC_URI[sha256sum] = "21dbe86842b24d83c73a1aef2de346a1a7c11c437015d6e9d180a1637e6e8197"
+inherit pypi python_setuptools_build_meta
+RDEPENDS:${PN} = " \
+        python3-colorama \
+        python3-contourpy \
+        python3-jinja2 \
+        python3-numpy \
+        python3-packaging \
+        python3-pandas \
+        python3-pillow \
+        python3-pyyaml \
+        python3-tornado \
+        python3-typing-extensions \
+        python3-xyzservices \
+        "
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-contourpy_1.2.1.bb b/meta-xilinx-core/recipes-devtools/python/python3-contourpy_1.2.1.bb
new file mode 100644
index 00000000..5f21b002
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/python/python3-contourpy_1.2.1.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Python library for calculating contours of 2D quadrilateral grids"
+HOMEPAGE = "https://github.com/contourpy/contourpy"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a051d5dfc6ccbc7bbe3e626d65156784"
+DEPENDS += " \
+        meson-native \
+        python3-pybind11-native \
+        "
+SRC_URI[sha256sum] = "4d8908b3bee1c889e547867ca4cdc54e5ab6be6d3e078556814a22457f49423c"
+inherit pypi python_mesonpy
+RDEPENDS:${PN} = "python3-numpy"
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-mercantile_1.2.1.bb b/meta-xilinx-core/recipes-devtools/python/python3-mercantile_1.2.1.bb
new file mode 100644
index 00000000..33987e68
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/python/python3-mercantile_1.2.1.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Web mercator XYZ tile utilities"
+HOMEPAGE = "https://github.com/mapbox/mercantile"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=11e1a3a1ec3801b170b9152c135e8f74 \
+                    file://docs/license.rst;md5=083a4719b463be5b728fd0e3f47db7e7"
+SRC_URI[sha256sum] = "fa3c6db15daffd58454ac198b31887519a19caccee3f9d63d17ae7ff61b3b56b"
+inherit pypi setuptools3
+RDEPENDS:${PN} += " \
+        python3-click \
+        python3-core \
+        python3-json \
+        python3-logging \
+        "
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-pybind11_2.13.1.bb b/meta-xilinx-core/recipes-devtools/python/python3-pybind11_2.13.1.bb
new file mode 100644
index 00000000..3c03069b
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/python/python3-pybind11_2.13.1.bb
@@ -0,0 +1,9 @@
+SUMMARY = "Seamless operability between C++11 and Python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f"
+SRC_URI[sha256sum] = "65be498b1cac516161add1508e65375674916bebf2570d057dc9c3c7bcbbc7b0"
+inherit pypi python_setuptools_build_meta
+BBCLASSEXTEND += "native"
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-setuptools-git-versioning_2.0.0.bb b/meta-xilinx-core/recipes-devtools/python/python3-setuptools-git-versioning_2.0.0.bb
new file mode 100644
index 00000000..53f04b77
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/python/python3-setuptools-git-versioning_2.0.0.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Use git repo data for building a version number according PEP-440"
+HOMEPAGE = "https://setuptools-git-versioning.readthedocs.io"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=92e79e3a844e66731724600f3ac9c0d8"
+SRC_URI[sha256sum] = "85b5fbe7bda8e9c24bbd9e587a9d4b91129417f4dd3e11e3c0d5f3f835fc4d4d"
+inherit pypi setuptools3
+RDEPENDS:${PN} += " \
+        python3-core \
+        python3-datetime \
+        python3-logging \
+        python3-packaging \
+        python3-pprint \
+        python3-setuptools \
+        python3-tomllib \
+        "
+BBCLASSEXTEND += "native"
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-xyzservices_2024.6.0.bb b/meta-xilinx-core/recipes-devtools/python/python3-xyzservices_2024.6.0.bb
new file mode 100644
index 00000000..3e9b7ee1
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/python/python3-xyzservices_2024.6.0.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Source of XYZ tiles providers"
+HOMEPAGE = "https://github.com/geopandas/xyzservices"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6a3e440ffacb99f21fa410467c048574"
+DEPENDS += "python3-setuptools-scm-native"
+SRC_URI[sha256sum] = "58c1bdab4257d2551b9ef91cd48571f77b7c4d2bc45bf5e3c05ac97b3a4d7282"
+inherit pypi python_setuptools_build_meta
+FILES:${PN} += "${prefix}"
+RDEPENDS:${PN} += " \
+        python3-core \
+        python3-json \
+        python3-mercantile \
+        python3-netclient \
+        python3-requests \
+        "
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 f310edfa..77b13aa2 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
@@ -35,14 +35,45 @@ if '-bootbin' in APU_args:
 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):
+help_options = ['-h', '-help', '--help']
-    print("AMD FPGA QEMU multiarch wrapper\nVersion 2024.1\n\nUsage:")
+def help(status):
+    print("AMD FPGA QEMU multiarch wrapper\nVersion 2024.2\n\nUsage:")
    print(f"  {sys.argv[0]} <APU options> [-pmu-args <pmu options>]")
    print(f"  {sys.argv[0]} <APU options> [-plm-args <plm options>]\n")
-    sys.exit(1)
+    if status == 0:
+        print(f"\n")
+        if set(PMU_args).intersection(set(help_options)):
+            print(f"PMU Options:\n")
+            pmu_args_s = ' '.join(PMU_args)
+            help_cmd = f'{binpath}/qemu-system-microblazeel {pmu_args_s}'
+        elif set(PLM_args).intersection(set(help_options)):
+            print(f"PLM Options:\n")
+            plm_args_s = ' '.join(PLM_args)
+            help_cmd = f'{binpath}/qemu-system-microblazeel {plm_args_s}'
+        else:
+            if not set(APU_args).intersection(set(help_options)):
+                APU_args.append('-help')
+            print(f"APU Options:\n")
+            print(f"    -bootbin <boot.bin> - Use a boot.bin instead of individual firmware, device trees and bootloader\n")
+            apu_args_s = ' '.join(APU_args)
+            help_cmd = f'{binpath}/qemu-system-aarch64 {apu_args_s}'
+        print(f"{help_cmd}\n")
+        process = subprocess.Popen(help_cmd, shell=True, stderr=subprocess.PIPE)
+        status = process.wait()
+    sys.exit(status)
+if set(APU_args).intersection(set(help_options)) or set(PMU_args).intersection(set(help_options)) or set(PLM_args).intersection(set(help_options)):
+    help(0)
+if not PMU_args and not PLM_args:
+    help(1)
 if PMU_args:
-    PMU_rom = PMU_args[PMU_args.index('-kernel')+1]
+    try:
+        PMU_rom = PMU_args[PMU_args.index('-kernel')+1]
+    except:
+        PMU_rom = ""
    if not os.path.exists(PMU_rom):
        sys.exit(f'\nERROR: Missing PMU ROM: {PMU_rom}'
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-python-rename-QEMUMonitorProtocol.cmd-to-cmd_raw.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-python-rename-QEMUMonitorProtocol.cmd-to-cmd_raw.patch
new file mode 100644
index 00000000..ff7f64ad
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-python-rename-QEMUMonitorProtocol.cmd-to-cmd_raw.patch
@@ -0,0 +1,81 @@
+From 84986d94277de2ac853cb613c37dbafe485f0981 Mon Sep 17 00:00:00 2001
+From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Date: Fri, 6 Oct 2023 18:41:14 +0300
+Subject: [PATCH 1/2] python: rename QEMUMonitorProtocol.cmd() to cmd_raw()
+Having cmd() and command() methods in one class doesn't look good.
+Rename cmd() to cmd_raw(), to show its meaning better.
+We also want to rename command() to cmd() in future, so this commit is
+a necessary step.
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Message-id: 20231006154125.1068348-5-vsementsov@yandex-team.ru
+Signed-off-by: John Snow <jsnow@redhat.com>
+Upstream-Status: Backport (37274707f6f3868fae7e0055d9a703006fc142d0)
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ python/qemu/machine/machine.py | 2 +-
+ python/qemu/qmp/legacy.py      | 8 ++------
+ tests/qemu-iotests/iotests.py  | 2 +-
+ 3 files changed, 4 insertions(+), 8 deletions(-)
+diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
+index c16a0b6fed..82fa8cdddf 100644
+--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
+@@ -686,7 +686,7 @@ def qmp(self, cmd: str,
+             conv_keys = True
+ 
+         qmp_args = self._qmp_args(conv_keys, args)
+-        ret = self._qmp.cmd(cmd, args=qmp_args)
+        ret = self._qmp.cmd_raw(cmd, args=qmp_args)
+         if cmd == 'quit' and 'error' not in ret and 'return' in ret:
+             self._quit_issued = True
+         return ret
+diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py
+index e1e9383978..e5fa1ce9c4 100644
+--- a/python/qemu/qmp/legacy.py
+++ b/python/qemu/qmp/legacy.py
+@@ -194,21 +194,17 @@ def cmd_obj(self, qmp_cmd: QMPMessage) -> QMPMessage:
+             )
+         )
+ 
+-    def cmd(self, name: str,
+-            args: Optional[Dict[str, object]] = None,
+-            cmd_id: Optional[object] = None) -> QMPMessage:
+    def cmd_raw(self, name: str,
+                args: Optional[Dict[str, object]] = None) -> QMPMessage:
+         """
+         Build a QMP command and send it to the QMP Monitor.
+ 
+         :param name: command name (string)
+         :param args: command arguments (dict)
+-        :param cmd_id: command id (dict, list, string or int)
+         """
+         qmp_cmd: QMPMessage = {'execute': name}
+         if args:
+             qmp_cmd['arguments'] = args
+-        if cmd_id:
+-            qmp_cmd['id'] = cmd_id
+         return self.cmd_obj(qmp_cmd)
+ 
+     def command(self, cmd: str, **kwds: object) -> QMPReturnValue:
+diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
+index ef66fbd62b..8ffd9fb660 100644
+--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
+@@ -460,7 +460,7 @@ def __init__(self, *args: str, instance_id: str = 'a', qmp: bool = False):
+     def qmp(self, cmd: str, args: Optional[Dict[str, object]] = None) \
+             -> QMPMessage:
+         assert self._qmp is not None
+-        return self._qmp.cmd(cmd, args)
+        return self._qmp.cmd_raw(cmd, args)
+ 
+     def get_qmp(self) -> QEMUMonitorProtocol:
+         assert self._qmp is not None
+-- 
+2.34.1
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-python-qemu-rename-command-to-cmd.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-python-qemu-rename-command-to-cmd.patch
new file mode 100644
index 00000000..e776a537
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-python-qemu-rename-command-to-cmd.patch
@@ -0,0 +1,1011 @@
+From a7037d9661d40351b15d8c8bf209b512a7b5047e Mon Sep 17 00:00:00 2001
+From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Date: Fri, 6 Oct 2023 18:41:15 +0300
+Subject: [PATCH 2/2] python/qemu: rename command() to cmd()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Use a shorter name. We are going to move in iotests from qmp() to
+command() where possible. But command() is longer than qmp() and don't
+look better. Let's rename.
+You can simply grep for '\.command(' and for 'def command(' to check
+that everything is updated (command() in tests/docker/docker.py is
+unrelated).
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Reviewed-by: Cédric Le Goater <clg@kaod.org>
+Reviewed-by: Juan Quintela <quintela@redhat.com>
+Message-id: 20231006154125.1068348-6-vsementsov@yandex-team.ru
+[vsementsov: also update three occurrences in
+   tests/avocado/machine_aspeed.py and keep r-b]
+Signed-off-by: John Snow <jsnow@redhat.com>
+Upstream-status: Backport (684750ab4f8a3ad69512b71532408be3ac2547d4)
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ docs/devel/testing.rst                    |  10 +-
+ python/qemu/machine/machine.py            |   8 +-
+ python/qemu/qmp/legacy.py                 |   2 +-
+ python/qemu/qmp/qmp_shell.py              |  11 +-
+ python/qemu/utils/qemu_ga_client.py       |   2 +-
+ python/qemu/utils/qom.py                  |   8 +-
+ python/qemu/utils/qom_common.py           |   2 +-
+ python/qemu/utils/qom_fuse.py             |   6 +-
+ scripts/cpu-x86-uarch-abi.py              |   4 +-
+ scripts/device-crash-test                 |   8 +-
+ scripts/render_block_graph.py             |   8 +-
+ tests/avocado/avocado_qemu/__init__.py    |   4 +-
+ tests/avocado/cpu_queries.py              |   5 +-
+ tests/avocado/hotplug_cpu.py              |  10 +-
+ tests/avocado/info_usernet.py             |   4 +-
+ tests/avocado/machine_arm_integratorcp.py |   6 +-
+ tests/avocado/machine_aspeed.py           |  12 +-
+ tests/avocado/machine_m68k_nextcube.py    |   4 +-
+ tests/avocado/machine_mips_malta.py       |   6 +-
+ tests/avocado/machine_s390_ccw_virtio.py  |  28 ++--
+ tests/avocado/migration.py                |  10 +-
+ tests/avocado/pc_cpu_hotplug_props.py     |   2 +-
+ tests/avocado/version.py                  |   4 +-
+ tests/avocado/virtio_check_params.py      |   6 +-
+ tests/avocado/virtio_version.py           |   5 +-
+ tests/avocado/x86_cpu_model_versions.py   |  13 +-
+ tests/migration/guestperf/engine.py       | 150 +++++++++++-----------
+ tests/qemu-iotests/256                    |  34 ++---
+ tests/qemu-iotests/257                    |  36 +++---
+ 29 files changed, 207 insertions(+), 201 deletions(-)
+diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
+index b6ad21bed1..dddf1d6140 100644
+--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
+@@ -1014,8 +1014,8 @@ class.  Here's a simple usage example:
+       """
+       def test_qmp_human_info_version(self):
+           self.vm.launch()
+-          res = self.vm.command('human-monitor-command',
+-                                command_line='info version')
+          res = self.vm.cmd('human-monitor-command',
+                            command_line='info version')
+           self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)')
+ 
+ To execute your test, run:
+@@ -1065,15 +1065,15 @@ and hypothetical example follows:
+           first_machine.launch()
+           second_machine.launch()
+ 
+-          first_res = first_machine.command(
+          first_res = first_machine.cmd(
+               'human-monitor-command',
+               command_line='info version')
+ 
+-          second_res = second_machine.command(
+          second_res = second_machine.cmd(
+               'human-monitor-command',
+               command_line='info version')
+ 
+-          third_res = self.get_vm(name='third_machine').command(
+          third_res = self.get_vm(name='third_machine').cmd(
+               'human-monitor-command',
+               command_line='info version')
+ 
+diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
+index 82fa8cdddf..0c48b76731 100644
+--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
+@@ -691,16 +691,16 @@ def qmp(self, cmd: str,
+             self._quit_issued = True
+         return ret
+ 
+-    def command(self, cmd: str,
+-                conv_keys: bool = True,
+-                **args: Any) -> QMPReturnValue:
+    def cmd(self, cmd: str,
+            conv_keys: bool = True,
+            **args: Any) -> QMPReturnValue:
+         """
+         Invoke a QMP command.
+         On success return the response dict.
+         On failure raise an exception.
+         """
+         qmp_args = self._qmp_args(conv_keys, args)
+-        ret = self._qmp.command(cmd, **qmp_args)
+        ret = self._qmp.cmd(cmd, **qmp_args)
+         if cmd == 'quit':
+             self._quit_issued = True
+         return ret
+diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py
+index e5fa1ce9c4..22a2b5616e 100644
+--- a/python/qemu/qmp/legacy.py
+++ b/python/qemu/qmp/legacy.py
+@@ -207,7 +207,7 @@ def cmd_raw(self, name: str,
+             qmp_cmd['arguments'] = args
+         return self.cmd_obj(qmp_cmd)
+ 
+-    def command(self, cmd: str, **kwds: object) -> QMPReturnValue:
+    def cmd(self, cmd: str, **kwds: object) -> QMPReturnValue:
+         """
+         Build and send a QMP command to the monitor, report errors if any
+         """
+diff --git a/python/qemu/qmp/qmp_shell.py b/python/qemu/qmp/qmp_shell.py
+index 619ab42ced..08240c16f8 100644
+--- a/python/qemu/qmp/qmp_shell.py
+++ b/python/qemu/qmp/qmp_shell.py
+@@ -194,11 +194,12 @@ def close(self) -> None:
+         super().close()
+ 
+     def _fill_completion(self) -> None:
+-        cmds = self.cmd('query-commands')
+-        if 'error' in cmds:
+-            return
+-        for cmd in cmds['return']:
+-            self._completer.append(cmd['name'])
+        try:
+            cmds = cast(List[Dict[str, str]], self.cmd('query-commands'))
+            for cmd in cmds:
+                self._completer.append(cmd['name'])
+        except ExecuteError:
+            pass
+ 
+     def _completer_setup(self) -> None:
+         self._completer = QMPCompleter()
+diff --git a/python/qemu/utils/qemu_ga_client.py b/python/qemu/utils/qemu_ga_client.py
+index d8411bb2d0..9a665e6e99 100644
+--- a/python/qemu/utils/qemu_ga_client.py
+++ b/python/qemu/utils/qemu_ga_client.py
+@@ -64,7 +64,7 @@
+ class QemuGuestAgent(QEMUMonitorProtocol):
+     def __getattr__(self, name: str) -> Callable[..., Any]:
+         def wrapper(**kwds: object) -> object:
+-            return self.command('guest-' + name.replace('_', '-'), **kwds)
+            return self.cmd('guest-' + name.replace('_', '-'), **kwds)
+         return wrapper
+ 
+ 
+diff --git a/python/qemu/utils/qom.py b/python/qemu/utils/qom.py
+index bcf192f477..426a0f245f 100644
+--- a/python/qemu/utils/qom.py
+++ b/python/qemu/utils/qom.py
+@@ -84,7 +84,7 @@ def __init__(self, args: argparse.Namespace):
+         self.value = args.value
+ 
+     def run(self) -> int:
+-        rsp = self.qmp.command(
+        rsp = self.qmp.cmd(
+             'qom-set',
+             path=self.path,
+             property=self.prop,
+@@ -129,7 +129,7 @@ def __init__(self, args: argparse.Namespace):
+         self.prop = tmp[1]
+ 
+     def run(self) -> int:
+-        rsp = self.qmp.command(
+        rsp = self.qmp.cmd(
+             'qom-get',
+             path=self.path,
+             property=self.prop
+@@ -231,8 +231,8 @@ def _list_node(self, path: str) -> None:
+             if item.child:
+                 continue
+             try:
+-                rsp = self.qmp.command('qom-get', path=path,
+-                                       property=item.name)
+                rsp = self.qmp.cmd('qom-get', path=path,
+                                   property=item.name)
+                 print(f"  {item.name}: {rsp} ({item.type})")
+             except ExecuteError as err:
+                 print(f"  {item.name}: <EXCEPTION: {err!s}> ({item.type})")
+diff --git a/python/qemu/utils/qom_common.py b/python/qemu/utils/qom_common.py
+index 80da1b2304..dd2c8b1908 100644
+--- a/python/qemu/utils/qom_common.py
+++ b/python/qemu/utils/qom_common.py
+@@ -140,7 +140,7 @@ def qom_list(self, path: str) -> List[ObjectPropertyInfo]:
+         """
+         :return: a strongly typed list from the 'qom-list' command.
+         """
+-        rsp = self.qmp.command('qom-list', path=path)
+        rsp = self.qmp.cmd('qom-list', path=path)
+         # qom-list returns List[ObjectPropertyInfo]
+         assert isinstance(rsp, list)
+         return [ObjectPropertyInfo.make(x) for x in rsp]
+diff --git a/python/qemu/utils/qom_fuse.py b/python/qemu/utils/qom_fuse.py
+index 8dcd59fcde..cf7e344bd5 100644
+--- a/python/qemu/utils/qom_fuse.py
+++ b/python/qemu/utils/qom_fuse.py
+@@ -137,7 +137,7 @@ def read(self, path: str, size: int, offset: int, fh: IO[bytes]) -> bytes:
+         if path == '':
+             path = '/'
+         try:
+-            data = str(self.qmp.command('qom-get', path=path, property=prop))
+            data = str(self.qmp.cmd('qom-get', path=path, property=prop))
+             data += '\n'  # make values shell friendly
+         except ExecuteError as err:
+             raise FuseOSError(EPERM) from err
+@@ -152,8 +152,8 @@ def readlink(self, path: str) -> Union[bool, str]:
+             return False
+         path, prop = path.rsplit('/', 1)
+         prefix = '/'.join(['..'] * (len(path.split('/')) - 1))
+-        return prefix + str(self.qmp.command('qom-get', path=path,
+-                                             property=prop))
+        return prefix + str(self.qmp.cmd('qom-get', path=path,
+                                         property=prop))
+ 
+     def getattr(self, path: str,
+                 fh: Optional[IO[bytes]] = None) -> Mapping[str, object]:
+diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py
+index 82ff07582f..379a3c64bd 100644
+--- a/scripts/cpu-x86-uarch-abi.py
+++ b/scripts/cpu-x86-uarch-abi.py
+@@ -94,8 +94,8 @@
+ 
+ for name in sorted(names):
+     cpu = shell.cmd("query-cpu-model-expansion",
+-                     { "type": "static",
+-                       "model": { "name": name }})
+                    { "type": "static",
+                      "model": { "name": name }})
+ 
+     got = {}
+     for (feature, present) in cpu["return"]["model"]["props"].items():
+diff --git a/scripts/device-crash-test b/scripts/device-crash-test
+index b74d887331..9bf9d0d6e6 100755
+--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
+@@ -269,14 +269,14 @@ def formatTestCase(t):
+ 
+ def qomListTypeNames(vm, **kwargs):
+     """Run qom-list-types QMP command, return type names"""
+-    types = vm.command('qom-list-types', **kwargs)
+    types = vm.cmd('qom-list-types', **kwargs)
+     return [t['name'] for t in types]
+ 
+ 
+ def infoQDM(vm):
+     """Parse 'info qdm' output"""
+     args = {'command-line': 'info qdm'}
+-    devhelp = vm.command('human-monitor-command', **args)
+    devhelp = vm.cmd('human-monitor-command', **args)
+     for l in devhelp.split('\n'):
+         l = l.strip()
+         if l == '' or l.endswith(':'):
+@@ -304,9 +304,9 @@ class QemuBinaryInfo(object):
+             # there's no way to query DeviceClass::user_creatable using QMP,
+             # so use 'info qdm':
+             self.no_user_devs = set([d['name'] for d in infoQDM(vm, ) if d['no-user']])
+-            self.machines = list(m['name'] for m in vm.command('query-machines'))
+            self.machines = list(m['name'] for m in vm.cmd('query-machines'))
+             self.user_devs = self.alldevs.difference(self.no_user_devs)
+-            self.kvm_available = vm.command('query-kvm')['enabled']
+            self.kvm_available = vm.cmd('query-kvm')['enabled']
+         finally:
+             vm.shutdown()
+ 
+diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py
+index 8f731a5cfe..3e1a2e3fa7 100755
+--- a/scripts/render_block_graph.py
+++ b/scripts/render_block_graph.py
+@@ -43,13 +43,13 @@ def render_block_graph(qmp, filename, format='png'):
+     representation in @format into "@filename.@format"
+     '''
+ 
+-    bds_nodes = qmp.command('query-named-block-nodes')
+    bds_nodes = qmp.cmd('query-named-block-nodes')
+     bds_nodes = {n['node-name']: n for n in bds_nodes}
+ 
+-    job_nodes = qmp.command('query-block-jobs')
+    job_nodes = qmp.cmd('query-block-jobs')
+     job_nodes = {n['device']: n for n in job_nodes}
+ 
+-    block_graph = qmp.command('x-debug-query-block-graph')
+    block_graph = qmp.cmd('x-debug-query-block-graph')
+ 
+     graph = Digraph(comment='Block Nodes Graph')
+     graph.format = format
+@@ -94,7 +94,7 @@ class LibvirtGuest():
+     def __init__(self, name):
+         self.name = name
+ 
+-    def command(self, cmd):
+    def cmd(self, cmd):
+         # only supports qmp commands without parameters
+         m = {'execute': cmd}
+         ar = ['virsh', 'qemu-monitor-command', self.name, json.dumps(m)]
+diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py
+index 33090903f1..1a4d40a46f 100644
+--- a/tests/avocado/avocado_qemu/__init__.py
+++ b/tests/avocado/avocado_qemu/__init__.py
+@@ -408,8 +408,8 @@ class LinuxSSHMixIn:
+ 
+     def ssh_connect(self, username, credential, credential_is_key=True):
+         self.ssh_logger = logging.getLogger('ssh')
+-        res = self.vm.command('human-monitor-command',
+-                              command_line='info usernet')
+        res = self.vm.cmd('human-monitor-command',
+                          command_line='info usernet')
+         port = get_info_usernet_hostfwd_port(res)
+         self.assertIsNotNone(port)
+         self.assertGreater(port, 0)
+diff --git a/tests/avocado/cpu_queries.py b/tests/avocado/cpu_queries.py
+index cf69f69b11..86c2d5c92d 100644
+--- a/tests/avocado/cpu_queries.py
+++ b/tests/avocado/cpu_queries.py
+@@ -23,12 +23,13 @@ def test(self):
+         self.vm.add_args('-S')
+         self.vm.launch()
+ 
+-        cpus = self.vm.command('query-cpu-definitions')
+        cpus = self.vm.cmd('query-cpu-definitions')
+         for c in cpus:
+             self.log.info("Checking CPU: %s", c)
+             self.assertNotIn('', c['unavailable-features'], c['name'])
+ 
+         for c in cpus:
+             model = {'name': c['name']}
+-            e = self.vm.command('query-cpu-model-expansion', model=model, type='full')
+            e = self.vm.cmd('query-cpu-model-expansion', model=model,
+                            type='full')
+             self.assertEquals(e['model']['name'], c['name'])
+diff --git a/tests/avocado/hotplug_cpu.py b/tests/avocado/hotplug_cpu.py
+index 6374bf1b54..292bb43e4d 100644
+--- a/tests/avocado/hotplug_cpu.py
+++ b/tests/avocado/hotplug_cpu.py
+@@ -29,9 +29,9 @@ def test(self):
+         with self.assertRaises(AssertionError):
+             self.ssh_command('test -e /sys/devices/system/cpu/cpu1')
+ 
+-        self.vm.command('device_add',
+-                        driver='Haswell-x86_64-cpu',
+-                        socket_id=0,
+-                        core_id=1,
+-                        thread_id=0)
+        self.vm.cmd('device_add',
+                    driver='Haswell-x86_64-cpu',
+                    socket_id=0,
+                    core_id=1,
+                    thread_id=0)
+         self.ssh_command('test -e /sys/devices/system/cpu/cpu1')
+diff --git a/tests/avocado/info_usernet.py b/tests/avocado/info_usernet.py
+index fdc4d90c42..e1aa7a6e0a 100644
+--- a/tests/avocado/info_usernet.py
+++ b/tests/avocado/info_usernet.py
+@@ -22,8 +22,8 @@ def test_hostfwd(self):
+         self.require_netdev('user')
+         self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22')
+         self.vm.launch()
+-        res = self.vm.command('human-monitor-command',
+-                              command_line='info usernet')
+        res = self.vm.cmd('human-monitor-command',
+                          command_line='info usernet')
+         port = get_info_usernet_hostfwd_port(res)
+         self.assertIsNotNone(port,
+                              ('"info usernet" output content does not seem to '
+diff --git a/tests/avocado/machine_arm_integratorcp.py b/tests/avocado/machine_arm_integratorcp.py
+index 1ffe1073ef..87f5cf3953 100644
+--- a/tests/avocado/machine_arm_integratorcp.py
+++ b/tests/avocado/machine_arm_integratorcp.py
+@@ -81,9 +81,9 @@ def test_framebuffer_tux_logo(self):
+         self.boot_integratorcp()
+         framebuffer_ready = 'Console: switching to colour frame buffer device'
+         wait_for_console_pattern(self, framebuffer_ready)
+-        self.vm.command('human-monitor-command', command_line='stop')
+-        self.vm.command('human-monitor-command',
+-                        command_line='screendump %s' % screendump_path)
+        self.vm.cmd('human-monitor-command', command_line='stop')
+        self.vm.cmd('human-monitor-command',
+                    command_line='screendump %s' % screendump_path)
+         logger = logging.getLogger('framebuffer')
+ 
+         cpu_count = 1
+diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py
+index 724ee72c02..68619bbbdc 100644
+--- a/tests/avocado/machine_aspeed.py
+++ b/tests/avocado/machine_aspeed.py
+@@ -181,8 +181,8 @@ def test_arm_ast2500_evb_buildroot(self):
+              'i2c i2c-3: new_device: Instantiated device lm75 at 0x4d');
+         exec_command_and_wait_for_pattern(self,
+                              'cat /sys/class/hwmon/hwmon1/temp1_input', '0')
+-        self.vm.command('qom-set', path='/machine/peripheral/tmp-test',
+-                        property='temperature', value=18000);
+        self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
+                    property='temperature', value=18000);
+         exec_command_and_wait_for_pattern(self,
+                              'cat /sys/class/hwmon/hwmon1/temp1_input', '18000')
+ 
+@@ -213,8 +213,8 @@ def test_arm_ast2600_evb_buildroot(self):
+              'i2c i2c-3: new_device: Instantiated device lm75 at 0x4d');
+         exec_command_and_wait_for_pattern(self,
+                              'cat /sys/class/hwmon/hwmon0/temp1_input', '0')
+-        self.vm.command('qom-set', path='/machine/peripheral/tmp-test',
+-                        property='temperature', value=18000);
+        self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
+                    property='temperature', value=18000);
+         exec_command_and_wait_for_pattern(self,
+                              'cat /sys/class/hwmon/hwmon0/temp1_input', '18000')
+ 
+@@ -357,8 +357,8 @@ def test_arm_ast2600_evb_sdk(self):
+              'i2c i2c-5: new_device: Instantiated device lm75 at 0x4d');
+         self.ssh_command_output_contains(
+                              'cat /sys/class/hwmon/hwmon19/temp1_input', '0')
+-        self.vm.command('qom-set', path='/machine/peripheral/tmp-test',
+-                        property='temperature', value=18000);
+        self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
+                    property='temperature', value=18000);
+         self.ssh_command_output_contains(
+                              'cat /sys/class/hwmon/hwmon19/temp1_input', '18000')
+ 
+diff --git a/tests/avocado/machine_m68k_nextcube.py b/tests/avocado/machine_m68k_nextcube.py
+index 6790e7d9cd..d6da2fbb01 100644
+--- a/tests/avocado/machine_m68k_nextcube.py
+++ b/tests/avocado/machine_m68k_nextcube.py
+@@ -43,8 +43,8 @@ def check_bootrom_framebuffer(self, screenshot_path):
+         #       'displaysurface_create 1120x832' trace-event.
+         time.sleep(2)
+ 
+-        self.vm.command('human-monitor-command',
+-                        command_line='screendump %s' % screenshot_path)
+        self.vm.cmd('human-monitor-command',
+                    command_line='screendump %s' % screenshot_path)
+ 
+     @skipUnless(PIL_AVAILABLE, 'Python PIL not installed')
+     def test_bootrom_framebuffer_size(self):
+diff --git a/tests/avocado/machine_mips_malta.py b/tests/avocado/machine_mips_malta.py
+index 92233451c5..9bd54518bf 100644
+--- a/tests/avocado/machine_mips_malta.py
+++ b/tests/avocado/machine_mips_malta.py
+@@ -71,9 +71,9 @@ def do_test_i6400_framebuffer_logo(self, cpu_cores_count):
+         framebuffer_ready = 'Console: switching to colour frame buffer device'
+         wait_for_console_pattern(self, framebuffer_ready,
+                                  failure_message='Kernel panic - not syncing')
+-        self.vm.command('human-monitor-command', command_line='stop')
+-        self.vm.command('human-monitor-command',
+-                        command_line='screendump %s' % screendump_path)
+        self.vm.cmd('human-monitor-command', command_line='stop')
+        self.vm.cmd('human-monitor-command',
+                    command_line='screendump %s' % screendump_path)
+         logger = logging.getLogger('framebuffer')
+ 
+         match_threshold = 0.95
+diff --git a/tests/avocado/machine_s390_ccw_virtio.py b/tests/avocado/machine_s390_ccw_virtio.py
+index e7a2a20ba6..e1f493bc44 100644
+--- a/tests/avocado/machine_s390_ccw_virtio.py
+++ b/tests/avocado/machine_s390_ccw_virtio.py
+@@ -107,10 +107,10 @@ def test_s390x_devices(self):
+                         'dd if=/dev/hwrng of=/dev/null bs=1k count=10',
+                         '10+0 records out')
+         self.clear_guest_dmesg()
+-        self.vm.command('device_del', id='rn1')
+        self.vm.cmd('device_del', id='rn1')
+         self.wait_for_crw_reports()
+         self.clear_guest_dmesg()
+-        self.vm.command('device_del', id='rn2')
+        self.vm.cmd('device_del', id='rn2')
+         self.wait_for_crw_reports()
+         exec_command_and_wait_for_pattern(self,
+                         'dd if=/dev/hwrng of=/dev/null bs=1k count=10',
+@@ -132,8 +132,8 @@ def test_s390x_devices(self):
+                         '0x0000000c')
+         # add another device
+         self.clear_guest_dmesg()
+-        self.vm.command('device_add', driver='virtio-net-ccw',
+-                        devno='fe.0.4711', id='net_4711')
+        self.vm.cmd('device_add', driver='virtio-net-ccw',
+                    devno='fe.0.4711', id='net_4711')
+         self.wait_for_crw_reports()
+         exec_command_and_wait_for_pattern(self, 'for i in 1 2 3 4 5 6 7 ; do '
+                     'if [ -e /sys/bus/ccw/devices/*4711 ]; then break; fi ;'
+@@ -141,7 +141,7 @@ def test_s390x_devices(self):
+                     '0.0.4711')
+         # and detach it again
+         self.clear_guest_dmesg()
+-        self.vm.command('device_del', id='net_4711')
+        self.vm.cmd('device_del', id='net_4711')
+         self.vm.event_wait(name='DEVICE_DELETED',
+                            match={'data': {'device': 'net_4711'}})
+         self.wait_for_crw_reports()
+@@ -151,10 +151,10 @@ def test_s390x_devices(self):
+         # test the virtio-balloon device
+         exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo',
+                                           'MemTotal:         115640 kB')
+-        self.vm.command('human-monitor-command', command_line='balloon 96')
+        self.vm.cmd('human-monitor-command', command_line='balloon 96')
+         exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo',
+                                           'MemTotal:          82872 kB')
+-        self.vm.command('human-monitor-command', command_line='balloon 128')
+        self.vm.cmd('human-monitor-command', command_line='balloon 128')
+         exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo',
+                                           'MemTotal:         115640 kB')
+ 
+@@ -245,7 +245,7 @@ def test_s390x_fedora(self):
+                 '12+0 records out')
+             with tempfile.NamedTemporaryFile(suffix='.ppm',
+                                              prefix='qemu-scrdump-') as ppmfile:
+-                self.vm.command('screendump', filename=ppmfile.name)
+                self.vm.cmd('screendump', filename=ppmfile.name)
+                 ppmfile.seek(0)
+                 line = ppmfile.readline()
+                 self.assertEqual(line, b"P6\n")
+@@ -261,16 +261,16 @@ def test_s390x_fedora(self):
+         # Hot-plug a virtio-crypto device and see whether it gets accepted
+         self.log.info("Test hot-plug virtio-crypto device")
+         self.clear_guest_dmesg()
+-        self.vm.command('object-add', qom_type='cryptodev-backend-builtin',
+-                        id='cbe0')
+-        self.vm.command('device_add', driver='virtio-crypto-ccw', id='crypdev0',
+-                        cryptodev='cbe0', devno='fe.0.2342')
+        self.vm.cmd('object-add', qom_type='cryptodev-backend-builtin',
+                    id='cbe0')
+        self.vm.cmd('device_add', driver='virtio-crypto-ccw', id='crypdev0',
+                    cryptodev='cbe0', devno='fe.0.2342')
+         exec_command_and_wait_for_pattern(self,
+                         'while ! (dmesg -c | grep Accelerator.device) ; do'
+                         ' sleep 1 ; done', 'Accelerator device is ready')
+         exec_command_and_wait_for_pattern(self, 'lscss', '0.0.2342')
+-        self.vm.command('device_del', id='crypdev0')
+-        self.vm.command('object-del', id='cbe0')
+        self.vm.cmd('device_del', id='crypdev0')
+        self.vm.cmd('object-del', id='cbe0')
+         exec_command_and_wait_for_pattern(self,
+                         'while ! (dmesg -c | grep Start.virtcrypto_remove) ; do'
+                         ' sleep 1 ; done', 'Start virtcrypto_remove.')
+diff --git a/tests/avocado/migration.py b/tests/avocado/migration.py
+index fdc1d234fb..09b62f813e 100644
+--- a/tests/avocado/migration.py
+++ b/tests/avocado/migration.py
+@@ -30,7 +30,7 @@ class MigrationTest(QemuSystemTest):
+ 
+     @staticmethod
+     def migration_finished(vm):
+-        return vm.command('query-migrate')['status'] in ('completed', 'failed')
+        return vm.cmd('query-migrate')['status'] in ('completed', 'failed')
+ 
+     def assert_migration(self, src_vm, dst_vm):
+         wait.wait_for(self.migration_finished,
+@@ -41,10 +41,10 @@ def assert_migration(self, src_vm, dst_vm):
+                       timeout=self.timeout,
+                       step=0.1,
+                       args=(dst_vm,))
+-        self.assertEqual(src_vm.command('query-migrate')['status'], 'completed')
+-        self.assertEqual(dst_vm.command('query-migrate')['status'], 'completed')
+-        self.assertEqual(dst_vm.command('query-status')['status'], 'running')
+-        self.assertEqual(src_vm.command('query-status')['status'],'postmigrate')
+        self.assertEqual(src_vm.cmd('query-migrate')['status'], 'completed')
+        self.assertEqual(dst_vm.cmd('query-migrate')['status'], 'completed')
+        self.assertEqual(dst_vm.cmd('query-status')['status'], 'running')
+        self.assertEqual(src_vm.cmd('query-status')['status'],'postmigrate')
+ 
+     def do_migrate(self, dest_uri, src_uri=None):
+         dest_vm = self.get_vm('-incoming', dest_uri)
+diff --git a/tests/avocado/pc_cpu_hotplug_props.py b/tests/avocado/pc_cpu_hotplug_props.py
+index 52b878188e..b56f51d02a 100644
+--- a/tests/avocado/pc_cpu_hotplug_props.py
+++ b/tests/avocado/pc_cpu_hotplug_props.py
+@@ -32,4 +32,4 @@ def test_no_die_id(self):
+         self.vm.add_args('-smp', '1,sockets=2,cores=2,threads=2,maxcpus=8')
+         self.vm.add_args('-device', 'qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0')
+         self.vm.launch()
+-        self.assertEquals(len(self.vm.command('query-cpus-fast')), 2)
+        self.assertEquals(len(self.vm.cmd('query-cpus-fast')), 2)
+diff --git a/tests/avocado/version.py b/tests/avocado/version.py
+index dd775955eb..93ffdf3d97 100644
+--- a/tests/avocado/version.py
+++ b/tests/avocado/version.py
+@@ -20,6 +20,6 @@ class Version(QemuSystemTest):
+     def test_qmp_human_info_version(self):
+         self.vm.add_args('-nodefaults')
+         self.vm.launch()
+-        res = self.vm.command('human-monitor-command',
+-                              command_line='info version')
+        res = self.vm.cmd('human-monitor-command',
+                          command_line='info version')
+         self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)')
+diff --git a/tests/avocado/virtio_check_params.py b/tests/avocado/virtio_check_params.py
+index 4093da8a67..f4314ef824 100644
+--- a/tests/avocado/virtio_check_params.py
+++ b/tests/avocado/virtio_check_params.py
+@@ -51,8 +51,8 @@ def query_virtqueue(self, vm, dev_type_name):
+         error = None
+         props = None
+ 
+-        output = vm.command('human-monitor-command',
+-                            command_line = 'info qtree')
+        output = vm.cmd('human-monitor-command',
+                        command_line = 'info qtree')
+         props_list = DEV_TYPES[dev_type_name].values();
+         pattern = self.make_pattern(props_list)
+         res = re.findall(pattern, output)
+@@ -121,7 +121,7 @@ def test_machine_types(self):
+         # collect all machine types except 'none', 'isapc', 'microvm'
+         with QEMUMachine(self.qemu_bin) as vm:
+             vm.launch()
+-            machines = [m['name'] for m in vm.command('query-machines')]
+            machines = [m['name'] for m in vm.cmd('query-machines')]
+             vm.shutdown()
+         machines.remove('none')
+         machines.remove('isapc')
+diff --git a/tests/avocado/virtio_version.py b/tests/avocado/virtio_version.py
+index c84e48813a..afe5e828b5 100644
+--- a/tests/avocado/virtio_version.py
+++ b/tests/avocado/virtio_version.py
+@@ -48,7 +48,8 @@ def pci_modern_device_id(virtio_devid):
+     return virtio_devid + 0x1040
+ 
+ def devtype_implements(vm, devtype, implements):
+-    return devtype in [d['name'] for d in vm.command('qom-list-types', implements=implements)]
+    return devtype in [d['name'] for d in
+                       vm.cmd('qom-list-types', implements=implements)]
+ 
+ def get_pci_interfaces(vm, devtype):
+     interfaces = ('pci-express-device', 'conventional-pci-device')
+@@ -78,7 +79,7 @@ def run_device(self, devtype, opts=None, machine='pc'):
+             vm.add_args('-S')
+             vm.launch()
+ 
+-            pcibuses = vm.command('query-pci')
+            pcibuses = vm.cmd('query-pci')
+             alldevs = [dev for bus in pcibuses for dev in bus['devices']]
+             devfortest = [dev for dev in alldevs
+                           if dev['qdev_id'] == 'devfortest']
+diff --git a/tests/avocado/x86_cpu_model_versions.py b/tests/avocado/x86_cpu_model_versions.py
+index a6edf74c1c..9e07b8a55d 100644
+--- a/tests/avocado/x86_cpu_model_versions.py
+++ b/tests/avocado/x86_cpu_model_versions.py
+@@ -84,7 +84,8 @@ def test_4_0_alias_compatibility(self):
+         # with older QEMU versions that didn't have the versioned CPU model
+         self.vm.add_args('-S')
+         self.vm.launch()
+-        cpus = dict((m['name'], m) for m in self.vm.command('query-cpu-definitions'))
+        cpus = dict((m['name'], m) for m in
+                    self.vm.cmd('query-cpu-definitions'))
+ 
+         self.assertFalse(cpus['Cascadelake-Server']['static'],
+                          'unversioned Cascadelake-Server CPU model must not be static')
+@@ -115,7 +116,8 @@ def test_4_1_alias(self):
+         self.vm.add_args('-S')
+         self.vm.launch()
+ 
+-        cpus = dict((m['name'], m) for m in self.vm.command('query-cpu-definitions'))
+        cpus = dict((m['name'], m) for m in
+                    self.vm.cmd('query-cpu-definitions'))
+ 
+         self.assertFalse(cpus['Cascadelake-Server']['static'],
+                          'unversioned Cascadelake-Server CPU model must not be static')
+@@ -220,7 +222,8 @@ def test_none_alias(self):
+         self.vm.add_args('-S')
+         self.vm.launch()
+ 
+-        cpus = dict((m['name'], m) for m in self.vm.command('query-cpu-definitions'))
+        cpus = dict((m['name'], m) for m in
+                    self.vm.cmd('query-cpu-definitions'))
+ 
+         self.assertFalse(cpus['Cascadelake-Server']['static'],
+                          'unversioned Cascadelake-Server CPU model must not be static')
+@@ -246,8 +249,8 @@ class CascadelakeArchCapabilities(avocado_qemu.QemuSystemTest):
+     :avocado: tags=arch:x86_64
+     """
+     def get_cpu_prop(self, prop):
+-        cpu_path = self.vm.command('query-cpus-fast')[0].get('qom-path')
+-        return self.vm.command('qom-get', path=cpu_path, property=prop)
+        cpu_path = self.vm.cmd('query-cpus-fast')[0].get('qom-path')
+        return self.vm.cmd('qom-get', path=cpu_path, property=prop)
+ 
+     def test_4_1(self):
+         """
+diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
+index e69d16a62c..da96ca034a 100644
+--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
+@@ -77,7 +77,7 @@ def _cpu_timing(self, pid):
+             return TimingRecord(pid, now, 1000 * (stime + utime) / jiffies_per_sec)
+ 
+     def _migrate_progress(self, vm):
+-        info = vm.command("query-migrate")
+        info = vm.cmd("query-migrate")
+ 
+         if "ram" not in info:
+             info["ram"] = {}
+@@ -109,7 +109,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
+         src_vcpu_time = []
+         src_pid = src.get_pid()
+ 
+-        vcpus = src.command("query-cpus-fast")
+        vcpus = src.cmd("query-cpus-fast")
+         src_threads = []
+         for vcpu in vcpus:
+             src_threads.append(vcpu["thread-id"])
+@@ -128,82 +128,82 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
+         if self._verbose:
+             print("Starting migration")
+         if scenario._auto_converge:
+-            resp = src.command("migrate-set-capabilities",
+-                               capabilities = [
+-                                   { "capability": "auto-converge",
+-                                     "state": True }
+-                               ])
+-            resp = src.command("migrate-set-parameters",
+-                               cpu_throttle_increment=scenario._auto_converge_step)
+            resp = src.cmd("migrate-set-capabilities",
+                           capabilities = [
+                               { "capability": "auto-converge",
+                                 "state": True }
+                           ])
+            resp = src.cmd("migrate-set-parameters",
+                           cpu_throttle_increment=scenario._auto_converge_step)
+ 
+         if scenario._post_copy:
+-            resp = src.command("migrate-set-capabilities",
+-                               capabilities = [
+-                                   { "capability": "postcopy-ram",
+-                                     "state": True }
+-                               ])
+-            resp = dst.command("migrate-set-capabilities",
+-                               capabilities = [
+-                                   { "capability": "postcopy-ram",
+-                                     "state": True }
+-                               ])
+-
+-        resp = src.command("migrate-set-parameters",
+-                           max_bandwidth=scenario._bandwidth * 1024 * 1024)
+-
+-        resp = src.command("migrate-set-parameters",
+-                           downtime_limit=scenario._downtime)
+            resp = src.cmd("migrate-set-capabilities",
+                           capabilities = [
+                               { "capability": "postcopy-ram",
+                                 "state": True }
+                           ])
+            resp = dst.cmd("migrate-set-capabilities",
+                           capabilities = [
+                               { "capability": "postcopy-ram",
+                                 "state": True }
+                           ])
+
+        resp = src.cmd("migrate-set-parameters",
+                       max_bandwidth=scenario._bandwidth * 1024 * 1024)
+
+        resp = src.cmd("migrate-set-parameters",
+                       downtime_limit=scenario._downtime)
+ 
+         if scenario._compression_mt:
+-            resp = src.command("migrate-set-capabilities",
+-                               capabilities = [
+-                                   { "capability": "compress",
+-                                     "state": True }
+-                               ])
+-            resp = src.command("migrate-set-parameters",
+-                               compress_threads=scenario._compression_mt_threads)
+-            resp = dst.command("migrate-set-capabilities",
+-                               capabilities = [
+-                                   { "capability": "compress",
+-                                     "state": True }
+-                               ])
+-            resp = dst.command("migrate-set-parameters",
+-                               decompress_threads=scenario._compression_mt_threads)
+            resp = src.cmd("migrate-set-capabilities",
+                           capabilities = [
+                               { "capability": "compress",
+                                 "state": True }
+                           ])
+            resp = src.cmd("migrate-set-parameters",
+                           compress_threads=scenario._compression_mt_threads)
+            resp = dst.cmd("migrate-set-capabilities",
+                           capabilities = [
+                               { "capability": "compress",
+                                 "state": True }
+                           ])
+            resp = dst.cmd("migrate-set-parameters",
+                           decompress_threads=scenario._compression_mt_threads)
+ 
+         if scenario._compression_xbzrle:
+-            resp = src.command("migrate-set-capabilities",
+-                               capabilities = [
+-                                   { "capability": "xbzrle",
+-                                     "state": True }
+-                               ])
+-            resp = dst.command("migrate-set-capabilities",
+-                               capabilities = [
+-                                   { "capability": "xbzrle",
+-                                     "state": True }
+-                               ])
+-            resp = src.command("migrate-set-parameters",
+-                               xbzrle_cache_size=(
+-                                   hardware._mem *
+-                                   1024 * 1024 * 1024 / 100 *
+-                                   scenario._compression_xbzrle_cache))
+            resp = src.cmd("migrate-set-capabilities",
+                           capabilities = [
+                               { "capability": "xbzrle",
+                                 "state": True }
+                           ])
+            resp = dst.cmd("migrate-set-capabilities",
+                           capabilities = [
+                               { "capability": "xbzrle",
+                                 "state": True }
+                           ])
+            resp = src.cmd("migrate-set-parameters",
+                           xbzrle_cache_size=(
+                               hardware._mem *
+                               1024 * 1024 * 1024 / 100 *
+                               scenario._compression_xbzrle_cache))
+ 
+         if scenario._multifd:
+-            resp = src.command("migrate-set-capabilities",
+-                               capabilities = [
+-                                   { "capability": "multifd",
+-                                     "state": True }
+-                               ])
+-            resp = src.command("migrate-set-parameters",
+-                               multifd_channels=scenario._multifd_channels)
+-            resp = dst.command("migrate-set-capabilities",
+-                               capabilities = [
+-                                   { "capability": "multifd",
+-                                     "state": True }
+-                               ])
+-            resp = dst.command("migrate-set-parameters",
+-                               multifd_channels=scenario._multifd_channels)
+-
+-        resp = src.command("migrate", uri=connect_uri)
+            resp = src.cmd("migrate-set-capabilities",
+                           capabilities = [
+                               { "capability": "multifd",
+                                 "state": True }
+                           ])
+            resp = src.cmd("migrate-set-parameters",
+                           multifd_channels=scenario._multifd_channels)
+            resp = dst.cmd("migrate-set-capabilities",
+                           capabilities = [
+                               { "capability": "multifd",
+                                 "state": True }
+                           ])
+            resp = dst.cmd("migrate-set-parameters",
+                           multifd_channels=scenario._multifd_channels)
+
+        resp = src.cmd("migrate", uri=connect_uri)
+ 
+         post_copy = False
+         paused = False
+@@ -228,7 +228,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
+ 
+             if progress._status in ("completed", "failed", "cancelled"):
+                 if progress._status == "completed" and paused:
+-                    dst.command("cont")
+                    dst.cmd("cont")
+                 if progress_history[-1] != progress:
+                     progress_history.append(progress)
+ 
+@@ -256,13 +256,13 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
+             if progress._ram._iterations > scenario._max_iters:
+                 if self._verbose:
+                     print("No completion after %d iterations over RAM" % scenario._max_iters)
+-                src.command("migrate_cancel")
+                src.cmd("migrate_cancel")
+                 continue
+ 
+             if time.time() > (start + scenario._max_time):
+                 if self._verbose:
+                     print("No completion after %d seconds" % scenario._max_time)
+-                src.command("migrate_cancel")
+                src.cmd("migrate_cancel")
+                 continue
+ 
+             if (scenario._post_copy and
+@@ -270,7 +270,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
+                 not post_copy):
+                 if self._verbose:
+                     print("Switching to post-copy after %d iterations" % scenario._post_copy_iters)
+-                resp = src.command("migrate-start-postcopy")
+                resp = src.cmd("migrate-start-postcopy")
+                 post_copy = True
+ 
+             if (scenario._pause and
+@@ -278,7 +278,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
+                 not paused):
+                 if self._verbose:
+                     print("Pausing VM after %d iterations" % scenario._pause_iters)
+-                resp = src.command("stop")
+                resp = src.cmd("stop")
+                 paused = True
+ 
+     def _is_ppc64le(self):
+diff --git a/tests/qemu-iotests/256 b/tests/qemu-iotests/256
+index d7e67f4a05..f34af6cef7 100755
+--- a/tests/qemu-iotests/256
+++ b/tests/qemu-iotests/256
+@@ -40,25 +40,25 @@ with iotests.FilePath('img0') as img0_path, \
+     def create_target(filepath, name, size):
+         basename = os.path.basename(filepath)
+         nodename = "file_{}".format(basename)
+-        log(vm.command('blockdev-create', job_id='job1',
+-                       options={
+-                           'driver': 'file',
+-                           'filename': filepath,
+-                           'size': 0,
+-                       }))
+        log(vm.cmd('blockdev-create', job_id='job1',
+                   options={
+                       'driver': 'file',
+                       'filename': filepath,
+                       'size': 0,
+                   }))
+         vm.run_job('job1')
+-        log(vm.command('blockdev-add', driver='file',
+-                       node_name=nodename, filename=filepath))
+-        log(vm.command('blockdev-create', job_id='job2',
+-                       options={
+-                           'driver': iotests.imgfmt,
+-                           'file': nodename,
+-                           'size': size,
+-                       }))
+        log(vm.cmd('blockdev-add', driver='file',
+                   node_name=nodename, filename=filepath))
+        log(vm.cmd('blockdev-create', job_id='job2',
+                   options={
+                       'driver': iotests.imgfmt,
+                       'file': nodename,
+                       'size': size,
+                   }))
+         vm.run_job('job2')
+-        log(vm.command('blockdev-add', driver=iotests.imgfmt,
+-                       node_name=name,
+-                       file=nodename))
+        log(vm.cmd('blockdev-add', driver=iotests.imgfmt,
+                   node_name=name,
+                   file=nodename))
+ 
+     log('--- Preparing images & VM ---\n')
+     vm.add_object('iothread,id=iothread0')
+diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
+index e7e7a2317e..7d3720b8e5 100755
+--- a/tests/qemu-iotests/257
+++ b/tests/qemu-iotests/257
+@@ -160,26 +160,26 @@ class Drive:
+         file_node_name = "file_{}".format(basename)
+         vm = self.vm
+ 
+-        log(vm.command('blockdev-create', job_id='bdc-file-job',
+-                       options={
+-                           'driver': 'file',
+-                           'filename': self.path,
+-                           'size': 0,
+-                       }))
+        log(vm.cmd('blockdev-create', job_id='bdc-file-job',
+                   options={
+                       'driver': 'file',
+                       'filename': self.path,
+                       'size': 0,
+                   }))
+         vm.run_job('bdc-file-job')
+-        log(vm.command('blockdev-add', driver='file',
+-                       node_name=file_node_name, filename=self.path))
+-
+-        log(vm.command('blockdev-create', job_id='bdc-fmt-job',
+-                       options={
+-                           'driver': fmt,
+-                           'file': file_node_name,
+-                           'size': size,
+-                       }))
+        log(vm.cmd('blockdev-add', driver='file',
+                   node_name=file_node_name, filename=self.path))
+
+        log(vm.cmd('blockdev-create', job_id='bdc-fmt-job',
+                   options={
+                       'driver': fmt,
+                       'file': file_node_name,
+                       'size': size,
+                   }))
+         vm.run_job('bdc-fmt-job')
+-        log(vm.command('blockdev-add', driver=fmt,
+-                       node_name=name,
+-                       file=file_node_name))
+        log(vm.cmd('blockdev-add', driver=fmt,
+                   node_name=name,
+                   file=file_node_name))
+         self.fmt = fmt
+         self.size = size
+         self.node = name
+-- 
+2.34.1
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
index 3e56e349..26327ba3 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
@@ -14,12 +14,12 @@ REPO ?= "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
+SRC_URI += "file://0001-versal-Reorder-serial-ports.patch"
+SRC_URI += "file://0001-versal-net-Reorder-serial-port.patch"
 S = "${WORKDIR}/git"
-# Don't need to do anything
+do_install[noexec] = '1'
-do_install() {
-        :
-}
 do_deploy() {
        # single-arch dtbs
@@ -33,4 +33,7 @@ do_deploy() {
        done
 }
-addtask deploy after do_install
+addtask deploy after do_install before do_build
+COMPATIBLE_HOST:class-target = "none"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-versal-Reorder-serial-ports.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-versal-Reorder-serial-ports.patch
new file mode 100644
index 00000000..23ed3659
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-versal-Reorder-serial-ports.patch
@@ -0,0 +1,1466 @@
+From 2da2588a1dda1fd7fd2f6fc89db13cc5694d793e Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Sat, 24 Aug 2024 11:23:18 -0600
+Subject: [PATCH] versal: Reorder serial ports
+This change affects the order of the serial ports when calling qemu.
+Previously the serial ports 0 & 1 were the PMC (firmware) uartlite,
+while the standard serial pors were 2 & 3.  Reverse this order to
+ensure that the first two serial ports are the ones used by Linux.
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ board-versal-pmc-virt-alt.dts  | 230 ++++++++++++++++
+ board-versal-ps-vck190-alt.dts |  58 ++++
+ board-versal-ps-virt-alt.dts   | 354 +++++++++++++++++++++++++
+ versal-pmc-alt.dtsi            |  40 +++
+ versal-pmc-ppu-alt.dtsi        | 252 ++++++++++++++++++
+ versal-ps-iou-alt.dtsi         | 467 +++++++++++++++++++++++++++++++++
+ 6 files changed, 1401 insertions(+)
+ create mode 100644 board-versal-pmc-virt-alt.dts
+ create mode 100644 board-versal-ps-vck190-alt.dts
+ create mode 100644 board-versal-ps-virt-alt.dts
+ create mode 100644 versal-pmc-alt.dtsi
+ create mode 100644 versal-pmc-ppu-alt.dtsi
+ create mode 100644 versal-ps-iou-alt.dtsi
+diff --git a/board-versal-pmc-virt-alt.dts b/board-versal-pmc-virt-alt.dts
+new file mode 100644
+index 00000000..52d23c83
+--- /dev/null
+++ b/board-versal-pmc-virt-alt.dts
+@@ -0,0 +1,230 @@
+/*
+ * Versal Virtual PMC board device tree
+ *
+ * Copyright (c) 2016, Xilinx Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/dts-v1/;
+
+#ifndef VERSAL_NPI_OVERRIDE
+ #include "versal-npi-memmap.dtsh"
+#endif
+
+#define VERSAL_NPI_GENERIC
+
+#include "versal.dtsh"
+
+#ifndef MULTI_ARCH
+#include "versal-pmc-alt.dtsi"
+#include "versal-psm.dtsi"
+#include "versal-ddrmc.dtsi"
+#include "versal-ps-iou-alt.dtsi"
+#include "versal-pmc-ppu-cpus.dtsi"
+#include "versal-psm-cpu.dtsi"
+
+/ {
+       /* FIXME: Once we add the NOC, these should be attached to it.  */
+       MEM_REGION(ddr, 0x0, MM_TOP_DDR, 0x00000000, MM_TOP_DDR_SIZE, &ddr_mem)  // 2 GB
+       MEM_SPEC(ddr_2, MM_TOP_DDR_2_H, MM_TOP_DDR_2_L, MM_TOP_DDR_2,
+                 MM_TOP_DDR_2_SIZE_H, MM_TOP_DDR_2_SIZE_L, &ddr_2_mem) // 32 GB
+
+       /* Dummy APUs.  */
+       cpu0: apu@0 {
+       };
+       cpu1: apu@1 {
+       };
+       rpu_cpu0: rpu_cpu0 {
+       };
+       rpu_cpu1: rpu_cpu1 {
+       };
+#ifndef HAVE_DDRMC_CPUS
+       ddrmc_ub0: ddrmc_ub@0 {
+               #interrupt-cells = <1>;
+               interrupt-controller;
+       };
+       ddrmc_ub1: ddrmc_ub@1 {
+               #interrupt-cells = <1>;
+               interrupt-controller;
+       };
+#endif
+       /* Dummy GIC.  */
+       gic: apu_gic@0 {
+               #interrupt-cells = <3>;
+               interrupt-controller;
+       };
+};
+
+&pmc_qspi_0 {
+       SPI_FLASH(qspi_flash_lcs_lb,"m25qu02gcbb", 0x02000000, 0x0 0x0)
+       SPI_FLASH(qspi_flash_lcs_ub,"m25qu02gcbb", 0x02000000, 0x2 0x1)
+       SPI_FLASH(qspi_flash_ucs_lb,"m25qu02gcbb", 0x02000000, 0x1 0x0)
+       SPI_FLASH(qspi_flash_ucs_ub,"m25qu02gcbb", 0x02000000, 0x3 0x1)
+};
+
+&ospi {
+       SPI_FLASH(ospi_flash_lcs_lb, "mt35xu01gbba", 0x02000000, 0x0 0x0)
+       SPI_FLASH(ospi_flash_lcs_ub, "mt35xu01gbba", 0x02000000, 0x1 0x0)
+       SPI_FLASH(ospi_flash_ucs_lb, "mt35xu01gbba", 0x02000000, 0x2 0x0)
+       SPI_FLASH(ospi_flash_ucs_ub, "mt35xu01gbba", 0x02000000, 0x3 0x0)
+};
+
+#else
+#include "versal-icnt.dtsi"
+#include "versal-rams.dtsi"
+#include "versal-pmc-ppu-cpus.dtsi"
+#include "versal-psm-cpu.dtsi"
+
+/ {
+       /* FIXME: Once we add the NOC, these should be attached to it.  */
+       MEM_REGION(ddr, 0x0, 0x00000000, 0x00000000, 0x80000000, &ddr_mem)
+
+       ps_pmc_rp: ps_pmc_rp@0 {
+               doc-name = "Remote-port PMC-PS";
+               compatible = "remote-port";
+               chrdev-id = "ps-pmc-rp";
+       };
+       rp_pmc_ppu0: rp_pmc_ppu0@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 1>;
+               interrupts-extended = < &pmc_ppu0 0 >;
+       };
+       rp_pmc_ppu1: rp_pmc_ppu1@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 2>;
+               interrupts-extended = < &pmc_ppu1 0 >;
+       };
+       pmc_global: rp_pmc_global@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 3>;
+               #gpio-cells = <1>;
+               num-gpios = <16>;
+       };
+       lmb_pmc_ppu0: lmb_pmc_ppu0@0 {
+               rp_lmb_pmc_ppu0@0 {
+                       compatible = "remote-port-memory-master";
+                       remote-ports = <&ps_pmc_rp 4>;
+                       reg = < 0x0 0x0 0xFFFFFFFF 0xFFFFFFFF 0xFFFFFFFF /* -1 */ >;
+               };
+       };
+       lmb_pmc_ppu1: lmb_pmc_ppu1@0 {
+               rp_lmb_pmc_ppu1@0 {
+                       compatible = "remote-port-memory-master";
+                       remote-ports = <&ps_pmc_rp 5>;
+                       reg = < 0x0 0x0 0xFFFFFFFF 0xFFFFFFFF 0xFFFFFFFF /* -1 */ >;
+               };
+       };
+       crl: crl@MM_CRL {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 6>;
+               #gpio-cells = <1>;
+               num-gpios = <35>;
+       };
+       pmc_clk_rst: pmc_clk_rst@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 7>;
+               #gpio-cells = <1>;
+               num-gpios = <30>;
+       };
+       rp_psm0: rp_psm0@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 8>;
+               interrupts-extended = < &psm0 0 >;
+       };
+#ifdef MM_NPI_DDRMC_MAIN_0
+       rp_ddrmc_ub0: rp_ddrmc_ub@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 9>;
+# ifdef HAVE_DDRMC_CPUS
+               interrupts-extended = < &ddrmc_ub0 0 >;
+# endif
+       };
+
+       npi_ddrmc_ub0: rp_npi_ddrmc_ub@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 11>;
+               #gpio-cells = <1>;
+       };
+#endif
+#ifdef MM_NPI_DDRMC_MAIN_1
+       rp_ddrmc_ub1: rp_ddrmc_ub@1 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 10>;
+ # ifdef HAVE_DDRMC_CPUS
+               interrupts-extended = < &ddrmc_ub1 0 >;
+ # endif
+       };
+
+       npi_ddrmc_ub1: rp_npi_ddrmc_ub@1 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 12>;
+               #gpio-cells = <1>;
+       };
+#endif
+       lmb_psm: lmb_psm@0 {
+               rp_lmb_psm@0 {
+                       compatible = "remote-port-memory-master";
+                       remote-ports = <&ps_pmc_rp 13>;
+                       reg = < 0x0 0x0 0xFFFFFFFF 0xFFFFFFFF 0xFFFFFFFF /* -1 */ >;
+               };
+       };
+
+       /* Dummy stub to avoid ifdefs in the interrupt-map.  */
+       pmc_gic_proxy: pmc_gic_proxy {
+               doc-ignore = <1>;
+               #interrupt-cells = <3>;
+               interrupt-controller;
+       };
+       psm_gic_proxy: psm_gic_proxy {
+               doc-ignore = <1>;
+               #interrupt-cells = <3>;
+               interrupt-controller;
+       };
+       psm0_io_intc: psm0_io_intc {
+               doc-ignore = <1>;
+               #interrupt-cells = <1>;
+               interrupt-controller;
+       };
+       pmc_ppu1_io_intc: pmc_ppu1_io_intc {
+               doc-ignore = <1>;
+               #interrupt-cells = <1>;
+               interrupt-controller;
+       };
+};
+#endif
+
+/ {
+       /*
+        * FIXME: This legacy hook will reset the entire PMC instance
+        * meaning PSM and PMC MicroBlazes for multi-arch and all
+        * devices for single-arch.
+        * Once the CPU reset infrastructure is improved, we should
+        * remove this.
+        */
+       pmc_reset: pmc_reset@ {
+               compatible = "qemu,reset-device";
+               gpios = <&pmc_clk_rst CRP_RST_PS_PMC_SRST>;
+       };
+};
+diff --git a/board-versal-ps-vck190-alt.dts b/board-versal-ps-vck190-alt.dts
+new file mode 100644
+index 00000000..b61d3d5c
+--- /dev/null
+++ b/board-versal-ps-vck190-alt.dts
+@@ -0,0 +1,58 @@
+/*
+ * Versal Virtual vck190 board device tree
+ *
+ * Copyright (c) 2020, Xilinx Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "board-versal-ps-virt-alt.dts"
+#include "versal-silicon-freq.dtsi"
+
+/{
+       MEM_REGION64(ddr_3, MM_TOP_DDR_CH1_H, MM_TOP_DDR_CH1_L, MM_TOP_DDR_CH1,
+                 0x2, 0x0, &ddr_3_mem) // 8 GB
+};
+
+&ps_i2c1 {
+       i2cswitch@74 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "nxp,pca9548";
+               reg = <0x74>;
+               chip-enable = <0x1>;
+               i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+                       eeprom@54 {
+                               compatible = "at,24c08";
+                               reg = <0x54>;
+                       };
+               };
+       };
+};
+
+&ospi_flash_lcs_lb {
+       compatible = "mt35xu02gbba";
+};
+diff --git a/board-versal-ps-virt-alt.dts b/board-versal-ps-virt-alt.dts
+new file mode 100644
+index 00000000..7585d196
+--- /dev/null
+++ b/board-versal-ps-virt-alt.dts
+@@ -0,0 +1,354 @@
+/*
+ * Versal Virtual PS board device tree
+ *
+ * Copyright (c) 2016-2022, Xilinx Inc.
+ * Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __BOARD_VERSAL_PS_VIRT__
+#define __BOARD_VERSAL_PS_VIRT__
+
+/dts-v1/;
+#ifndef VERSAL_NPI_OVERRIDE
+ #include "versal-npi-memmap.dtsh"
+#endif
+
+#ifndef NUM_APUS
+/* Base platform has 2 APUs.  */
+#define NUM_APUS 2
+#endif
+
+#define HAS_SMMU
+#define HAVE_APU_GIC
+
+#ifndef RPU_GIC_INTERRUPT_TARGET_STEM
+#ifdef MULTI_ARCH
+       #define RPU_GIC_INTERRUPT_TARGET_STEM rpu_intc_redirect_
+#else
+       #define RPU_GIC_INTERRUPT_TARGET_STEM rpu_cpu
+#endif
+#endif
+
+#define VERSAL_NPI_GENERIC
+
+#include "versal.dtsh"
+
+#include "versal-pmc.dtsi"
+#include "versal-psm.dtsi"
+#include "versal-ddrmc.dtsi"
+#ifdef VERSAL_PSX
+#include "versal-psx-apu.dtsi"
+#else
+#include "versal-ps-apu.dtsi"
+#include "versal-ps-rpu.dtsi"
+#include "versal-boot-init.dtsi"
+#endif
+#include "versal-ps-iou-alt.dtsi"
+#include "versal-virtio-mmio.dtsi"
+#include "versal-boot-init.dtsi"
+#include "versal-gty.dtsi"
+#include "versal-silicon-freq.dtsi"
+
+/ {
+#ifdef MULTI_ARCH
+       ps_pmc_rp: ps_pmc_rp@0 {
+               doc-status = "complete";
+               doc-name = "Remote-port PMC";
+               doc-subdtb = "board-versal-pmc-virt.dtb";
+               compatible = "remote-port";
+               chrdev-id = "ps-pmc-rp";
+       };
+       pmc_ppu0: rp_pmc_ppu0@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 1>;
+               #interrupt-cells = <1>;
+               interrupt-controller;
+       };
+       pmc_ppu1: rp_pmc_ppu1@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 2>;
+               #interrupt-cells = <1>;
+               interrupt-controller;
+       };
+       rp_pmc_global: rp_pmc_global@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 3>;
+               gpio-controller;
+               #gpio-cells = <1>;
+               num-gpios = <16>;
+
+               /* We only need to proxy GPIO 1 and 2 (PPU1 RST and WAKE).  */
+               gpios = < &dummy1 0
+                         &pmc_global 1
+                         &pmc_global 2 >;
+       };
+       rp_lmb_pmc_ppu0: rp_lmb_pmc_ppu0@0 {
+               compatible = "remote-port-memory-slave";
+               remote-ports = <&ps_pmc_rp 4>;
+               mr = <&lmb_pmc_ppu0>;
+       };
+       rp_lmb_pmc_ppu1: rp_lmb_pmc_ppu1@0 {
+               compatible = "remote-port-memory-slave";
+               remote-ports = <&ps_pmc_rp 5>;
+               mr = <&lmb_pmc_ppu1>;
+       };
+       rp_crl: rp_crl@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 6>;
+               gpio-controller;
+               #gpio-cells = <1>;
+               num-gpios = <35>;
+
+               gpios = <
+                         &crl 0
+                         &crl 1
+                         &crl 2
+                         &crl 3
+                         &crl 4
+                         &crl 5
+                         &crl 6
+                         &crl 7
+                         &crl 8
+                         &crl 9
+                         &crl 10
+                         &crl 11
+                         &crl 12
+                         &crl 13
+                         &crl 14
+                         &crl 15
+                         &crl 16
+                         &crl 17
+                         &crl 18
+                         &crl 19
+                         &crl 20
+                         &crl 21
+                         &crl 22
+                         &crl 23
+                         &crl 24
+                         &crl 25
+                         &crl 26
+                         &crl 27
+                         &crl 28
+                         &crl 29
+                         &crl 30
+                         &crl 31
+                         &dummy1 0
+                         &dummy1 0
+                         &crl 34 >;
+       };
+       rp_pmc_clk_rst: rp_pmc_clk_rst@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 7>;
+               gpio-controller;
+               #gpio-cells = <1>;
+               num-gpios = <30>;
+
+               gpios = < &pmc_clk_rst 0 &pmc_clk_rst 1
+                         &pmc_clk_rst 2 &pmc_clk_rst 3
+                         &pmc_clk_rst 4 &pmc_clk_rst 5
+                         &pmc_clk_rst 6 &pmc_clk_rst 7
+                         &pmc_clk_rst 8 &pmc_clk_rst 9
+                         &pmc_clk_rst 10 &pmc_clk_rst 11
+                         &pmc_clk_rst 12 &pmc_clk_rst 13
+                         &pmc_clk_rst 14 &pmc_clk_rst 15
+                         &pmc_clk_rst 16 &pmc_clk_rst 17
+                         &pmc_clk_rst 18 &pmc_clk_rst 19
+                         &pmc_clk_rst 20 &pmc_clk_rst 21
+                         &pmc_clk_rst 22 &pmc_clk_rst 23
+                         &pmc_clk_rst 24 &pmc_clk_rst 25
+                         &pmc_clk_rst 26 &pmc_clk_rst 27
+                         &pmc_clk_rst 28 &pmc_clk_rst 29
+                       >;
+       };
+       psm0: rp_psm0@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 8>;
+               #interrupt-cells = <1>;
+               interrupt-controller;
+       };
+#ifdef MM_NPI_DDRMC_MAIN_0
+       ddrmc_ub0: rp_ddrmc@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 9>;
+               #interrupt-cells = <1>;
+               interrupt-controller;
+       };
+       rp_npi_ddrmc_ub0: rp_npi_ddrmc_ub@0 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 11>;
+               gpios = < &npi_ddrmc_ub0 0 >;
+       };
+#endif
+#ifdef MM_NPI_DDRMC_MAIN_1
+       ddrmc_ub1: rp_ddrmc@1 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 10>;
+               #interrupt-cells = <1>;
+               interrupt-controller;
+       };
+       rp_npi_ddrmc_ub1: rp_npi_ddrmc_ub@1 {
+               compatible = "remote-port-gpio";
+               remote-ports = <&ps_pmc_rp 12>;
+               gpios = < &npi_ddrmc_ub1 0 >;
+       };
+#endif
+       rp_lmb_psm: rp_lmb_psm@0 {
+               compatible = "remote-port-memory-slave";
+               remote-ports = <&ps_pmc_rp 13>;
+               mr = <&lmb_psm>;
+       };
+
+#define RPU_INTC_REDIRECT(NCPU, PSMOUT, RPUN)                                                  \
+glue(rpu_intc_redirect_, NCPU): glue(rpu_intc_redirect, NCPU)@NCPU {   \
+       #interrupt-cells = <1>;                                                                 \
+       compatible = "xlnx,zynqmp-intc-redirect";                                               \
+       interrupt-controller;                                                                   \
+       interrupts-extended = <glue(&rpu_cpu,NCPU) 0>;                                          \
+       gpios = <&psm_global PSMOUT &rpu_ctrl RPUN>;                                            \
+};
+
+       amba_rpu: amba_rpu@0 {
+               RPU_INTC_REDIRECT(0, 4, 6)
+               RPU_INTC_REDIRECT(1, 5, 7)
+       };
+
+#else
+       /* Single ARCH PS board has no PPU MicroBlazes.  */
+       pmc_ppu0: dummy_ppu0@0 {
+               #interrupt-cells = <1>;
+       };
+       pmc_ppu1: dummy_ppu1@0 {
+               #interrupt-cells = <1>;
+       };
+       psm0: dummy_ppu0@0 {
+               #interrupt-cells = <1>;
+       };
+       ddrmc_ub0: dummy_ddrmc0@0 {
+               #interrupt-cells = <1>;
+       };
+       ddrmc_ub1: dummy_ddrmc1@0 {
+               #interrupt-cells = <1>;
+       };
+#endif
+
+       /* FIXME: Once we add the NOC, these should be attached to it.  */
+       MEM_REGION(ddr, 0x0, MM_TOP_DDR, 0x00000000, MM_TOP_DDR_SIZE, &ddr_mem)  // 2 GB
+       MEM_SPEC(ddr_2, MM_TOP_DDR_2_H, MM_TOP_DDR_2_L, MM_TOP_DDR_2,
+                 MM_TOP_DDR_2_SIZE_H, MM_TOP_DDR_2_SIZE_L, &ddr_2_mem) // 32 GB
+       mdio0: mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               #priority-cells = <0>;
+               compatible="mdio";
+               phy0: phy@1 {
+                       compatible = "dp83867";
+                       device_type = "ethernet-phy";
+                       reg = <1>;
+               };
+               phy1: phy@2 {
+                       compatible = "88e1118r";
+                       device_type = "ethernet-phy";
+                       reg = <2>;
+               };
+       };
+};
+
+/*
+ * One flash for each SPI-master to match prebuilt system.dtb in BSP
+ * xilinx-versal-virt-2019.1
+ */
+#define BDEV_SPI_FLASH(_NAME, _COMPAT, _SIZEM, _REGVAL)        \
+_NAME: _NAME@0 {                                                       \
+       #address-cells = <1>;                                           \
+       #size-cells = <1>;                                              \
+       #priority-cells = <0>;                                          \
+       #bus-cells = <1>;                                               \
+       compatible = _COMPAT, "st,m25p80";                              \
+       spi-max-frequency = <50000000>;                                 \
+       reg = <_REGVAL>;                                                \
+       blockdev-node-name = #_NAME;                                    \
+       _NAME@0x00000000 {                                              \
+               label = #_NAME;                                         \
+               reg = <0x00000000 _SIZEM>;                              \
+       };                                                              \
+};
+
+&spi0 {
+       BDEV_SPI_FLASH(spi0_flash0, "m25p80", 0x00100000, 0x0 0x0)
+};
+
+&spi1 {
+       BDEV_SPI_FLASH(spi1_flash0, "m25p80", 0x00100000, 0x0 0x0)
+};
+
+/*
+ * Use 2Gbit QSPI flashes to allow verification of Image-searching
+ * in ROM upto 256MB.
+ */
+#define DI_SPI_FLASH(_DI, _NAME, _COMPAT, _SIZEM, _REGVAL) \
+_NAME: _NAME@0 {                                                       \
+       #address-cells = <1>;                                           \
+       #size-cells = <1>;                                              \
+       #priority-cells = <0>;                                          \
+       #bus-cells = <1>;                                               \
+       compatible = _COMPAT, "st,m25p80";                              \
+       spi-max-frequency = <50000000>;                                 \
+       reg = <_REGVAL>;                                                \
+       drive-index = <_DI>;                                            \
+       _NAME@0x00000000 {                                              \
+               label = #_NAME;                                         \
+               reg = <0x00000000 _SIZEM>;                              \
+       };                                                              \
+};
+
+&pmc_qspi_0 {
+       DI_SPI_FLASH(0, qspi_flash_lcs_lb, "m25qu02gcbb", 0x02000000, 0x0 0x0)
+       DI_SPI_FLASH(1, qspi_flash_lcs_ub, "m25qu02gcbb", 0x02000000, 0x2 0x1)
+       DI_SPI_FLASH(2, qspi_flash_ucs_lb, "m25qu02gcbb", 0x02000000, 0x1 0x0)
+       DI_SPI_FLASH(3, qspi_flash_ucs_ub, "m25qu02gcbb", 0x02000000, 0x3 0x1)
+};
+
+&ospi {
+       DI_SPI_FLASH(4, ospi_flash_lcs_lb, "mt35xu01gbba", 0x02000000, 0x0 0x0)
+       DI_SPI_FLASH(5, ospi_flash_lcs_ub, "mt35xu01gbba", 0x02000000, 0x1 0x0)
+       DI_SPI_FLASH(6, ospi_flash_ucs_lb, "mt35xu01gbba", 0x02000000, 0x2 0x0)
+       DI_SPI_FLASH(7, ospi_flash_ucs_ub, "mt35xu01gbba", 0x02000000, 0x3 0x0)
+};
+
+&gem0 {
+       mdio = <&mdio0>;
+};
+
+&gem1 {
+       mdio = <&mdio0>;
+};
+
+&pmc_tap {
+       /*
+        * Default device: xcvc1902
+        */
+       idcode = <0x14CA8093>;
+};
+#endif
+diff --git a/versal-pmc-alt.dtsi b/versal-pmc-alt.dtsi
+new file mode 100644
+index 00000000..8236911b
+--- /dev/null
+++ b/versal-pmc-alt.dtsi
+@@ -0,0 +1,40 @@
+/*
+ * Versal PMC
+ *
+ * Copyright (c) 2016, Xilinx Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "versal.dtsh"
+
+#include "versal-icnt.dtsi"
+#include "versal-rams.dtsi"
+#include "versal-pmc-ppu-alt.dtsi"
+#include "versal-pmc-iou.dtsi"
+#include "versal-pmc-sys.dtsi"
+#include "versal-pmc-sec.dtsi"
+#include "versal-pmc-npi.dtsi"
+#include "versal-pmc-pl.dtsi"
+#include "versal-pmc-bat.dtsi"
+diff --git a/versal-pmc-ppu-alt.dtsi b/versal-pmc-ppu-alt.dtsi
+new file mode 100644
+index 00000000..726413f4
+--- /dev/null
+++ b/versal-pmc-ppu-alt.dtsi
+@@ -0,0 +1,252 @@
+/*
+ * Versal PMC PPU block
+ *
+ * Copyright (c) 2016, Xilinx Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "versal.dtsh"
+
+#define CREATE_PPU_IOMOD(X)                                            \
+       pmc_ppu ## X ## _io_module: io-module@00 {                      \
+               doc-status = "complete";                                \
+               #address-cells = <2>;                                   \
+               #size-cells = <1>;                                      \
+               #priority-cells = <0>;                                  \
+               compatible = "xlnx,iomodule-1.02.a", "syscon", "simple-bus"; \
+               container = <&lmb_pmc_ppu ## X>;                        \
+               priority = <0xffffffff>;                                \
+               xlnx,freq = <0x47868c0>;                                \
+               xlnx,instance = "iomodule_1";                           \
+               xlnx,io-mask = <0xfffe0000>;                            \
+               xlnx,lmb-awidth = <0x20>;                               \
+               xlnx,lmb-dwidth = <0x20>;                               \
+               xlnx,mask = <0xffffff80>;                               \
+               xlnx,use-io-bus = <0x1>;                                \
+                                                                       \
+               pmc_ppu ## X ## _io_intc: pmc_ppu ## X ## _intc@0C {    \
+                       #interrupt-cells = <1>;                         \
+                       compatible = "xlnx,io-intc-1.02.a", "xlnx,io_intc"; \
+                       interrupt-controller ;                          \
+                       interrupts-extended = <&pmc_ppu ## X 0>;        \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(0C) 0x4 0x0 MM_PMC_PPU ## X ## _IOM(30) 0x10 0x0 MM_PMC_PPU ## X ## _IOM(80) 0x7C>; \
+                       xlnx,intc-addr-width = <0x20>;                  \
+                       xlnx,intc-base-vectors = <0x0>;                 \
+                       xlnx,intc-has-fast = <0x0>;                     \
+                       xlnx,intc-intr-size = <0x10>;                   \
+                       xlnx,intc-level-edge = <0x0>;                   \
+                       xlnx,intc-positive = <0xffff>;                  \
+                       xlnx,intc-use-ext-intr = <0x1>;                 \
+               };                                                      \
+                                                                       \
+               pmc_ppu ## X ## _io_gpi1: pmc_ppu ## X ## _gpi@20 {     \
+                       #gpio-cells = <1>;                              \
+                       gpio-controller;                                \
+                       compatible = "xlnx,io-gpi-1.02.a", "xlnx,io_gpi"; \
+                       interrupt-parent = <&pmc_ppu ## X ## _io_intc>; \
+                       interrupts = <11>;                              \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(20) 0x4>;    \
+                       xlnx,gpi-interrupt = <0x1>;                     \
+                       xlnx,gpi-size = <0x20>;                         \
+                       xlnx,use-gpi = <0x1>;                           \
+               };                                                      \
+               pmc_ppu ## X ## _io_gpi2: pmc_ppu ## X ## _gpi@24 {     \
+                       #gpio-cells = <1>;                              \
+                       gpio-controller;                                \
+                       compatible = "xlnx,io-gpi-1.02.a", "xlnx,io_gpi"; \
+                       interrupt-parent = <&pmc_ppu ## X ## _io_intc>; \
+                       interrupts = <12>;                              \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(24) 0x4>;    \
+                       xlnx,gpi-interrupt = <0x1>;                     \
+                       xlnx,gpi-size = <0x20>;                         \
+                       xlnx,use-gpi = <0x1>;                           \
+               };                                                      \
+               pmc_ppu ## X ## _io_gpi3: pmc_ppu ## X ## _gpi@28 {     \
+                       #gpio-cells = <1>;                              \
+                       gpio-controller;                                \
+                       compatible = "xlnx,io-gpi-1.02.a", "xlnx,io_gpi"; \
+                       interrupt-parent = <&pmc_ppu ## X ## _io_intc>; \
+                       interrupts = <13>;                              \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(28) 0x4>;    \
+                       xlnx,gpi-interrupt = <0x1>;                     \
+                       xlnx,gpi-size = <0x20>;                         \
+                       xlnx,use-gpi = <0x1>;                           \
+               };                                                      \
+               pmc_ppu ## X ## _io_gpi4: pmc_ppu ## X ## _gpi@2c {     \
+                       #gpio-cells = <1>;                              \
+                       gpio-controller;                                \
+                       compatible = "xlnx,io-gpi-1.02.a", "xlnx,io_gpi"; \
+                       interrupt-parent = <&pmc_ppu ## X ## _io_intc>; \
+                       interrupts = <14>;                              \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(2c) 0x4>;    \
+                       xlnx,gpi-interrupt = <0x1>;                     \
+                       xlnx,gpi-size = <0x20>;                         \
+                       xlnx,use-gpi = <0x1>;                           \
+               };                                                      \
+                                                                       \
+               pmc_ppu ## X ## _io_gpo1: pmc_ppu ## X ## _gpo@10 {     \
+                       #gpio-cells = <1>;                              \
+                       gpio-controller;                                \
+                       compatible = "xlnx,io-gpo-1.02.a", "xlnx,io_gpo"; \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(10) 0x4>;    \
+                       xlnx,gpo-init = <0x0>;                          \
+                       xlnx,gpo-size = <0x9>;                          \
+                       xlnx,use-gpo = <0x1>;                           \
+               };                                                      \
+               pmc_ppu ## X ## _io_gpo2: pmc_ppu ## X ## _gpo@14 {     \
+                       #gpio-cells = <1>;                              \
+                       gpio-controller;                                \
+                       compatible = "xlnx,io-gpo-1.02.a", "xlnx,io_gpo"; \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(14) 0x4>;    \
+                       xlnx,gpo-init = <0x0>;                          \
+                       xlnx,gpo-size = <0x20>;                         \
+                       xlnx,use-gpo = <0x1>;                           \
+               };                                                      \
+               pmc_ppu ## X ## _io_gpo3: pmc_ppu ## X ## _gpo@18 {     \
+                       #gpio-cells = <1>;                              \
+                       gpio-controller;                                \
+                       compatible = "xlnx,io-gpo-1.02.a", "xlnx,io_gpo"; \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(18) 0x4>;    \
+                       xlnx,gpo-init = <0x0>;                          \
+                       xlnx,gpo-size = <0x20>;                         \
+                       xlnx,use-gpo = <0x1>;                           \
+               };                                                      \
+               pmc_ppu ## X ## _io_gpo4: pmc_ppu ## X ## _gpo@1c {     \
+                       #gpio-cells = <1>;                              \
+                       gpio-controller;                                \
+                       compatible = "xlnx,io-gpo-1.02.a", "xlnx,io_gpo"; \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(1c) 0x4>;    \
+                       xlnx,gpo-init = <0x0>;                          \
+                       xlnx,gpo-size = <0x20>;                         \
+                       xlnx,use-gpo = <0x1>;                           \
+               };                                                      \
+                                                                       \
+               pmc_ppu ## X ## _io_pit1: pmc_ppu ## X ## _pit@40 {     \
+                       compatible = "xlnx,io-pit-1.02.a", "xlnx,io_pit"; \
+                       interrupt-parent = <&pmc_ppu ## X ## _io_intc>; \
+                       interrupts = <3>;                               \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(40) 0xc>;    \
+                       xlnx,pit-interrupt = <0x1>;                     \
+                       xlnx,pit-prescaler = <0x9>;                     \
+                       xlnx,pit-readable = <0x1>;                      \
+                       xlnx,pit-size = <0x20>;                         \
+                       xlnx,use-pit = <0x1>;                           \
+                       frequency = <460000000>;                        \
+                       gpios = <&pmc_ppu ## X ## _io_gpo1 1 &pmc_ppu ## X ## _io_pit2 0>; \
+                       gpio-names = "ps_config","ps_hit_in";           \
+                       gpio-controller;                                \
+                       #gpio-cells = <1>;                              \
+               };                                                      \
+               pmc_ppu ## X ## _io_pit2: pmc_ppu ## X ## _pit@50 {     \
+                       compatible = "xlnx,io-pit-1.02.a", "xlnx,io_pit"; \
+                       interrupt-parent = <&pmc_ppu ## X ## _io_intc>; \
+                       interrupts = <4>;                               \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(50) 0xc>;    \
+                       xlnx,pit-interrupt = <0x1>;                     \
+                       xlnx,pit-prescaler = <0x9>;                     \
+                       xlnx,pit-readable = <0x1>;                      \
+                       xlnx,pit-size = <0x20>;                         \
+                       xlnx,use-pit = <0x1>;                           \
+                       frequency = <460000000>;                        \
+                       gpio-controller;                                \
+                       #gpio-cells = <1>;                              \
+               };                                                      \
+               pmc_ppu ## X ## _io_pit3: pmc_ppu ## X ## _pit@60 {     \
+                       compatible = "xlnx,io-pit-1.02.a", "xlnx,io_pit"; \
+                       interrupt-parent = <&pmc_ppu ## X ## _io_intc>; \
+                       interrupts = <5>;                               \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(60) 0xc>;    \
+                       xlnx,pit-interrupt = <0x1>;                     \
+                       xlnx,pit-prescaler = <0x9>;                     \
+                       xlnx,pit-readable = <0x1>;                      \
+                       xlnx,pit-size = <0x20>;                         \
+                       xlnx,use-pit = <0x1>;                           \
+                       frequency = <460000000>;                        \
+                       gpios = <&pmc_ppu ## X ## _io_gpo1 6 &pmc_ppu ## X ## _io_pit4 0>; \
+                       gpio-names = "ps_config","ps_hit_in";           \
+                       gpio-controller;                                \
+                       #gpio-cells = <1>;                              \
+               };                                                      \
+               pmc_ppu ## X ## _io_pit4: pmc_ppu ## X ## _pit@70 {     \
+                       compatible = "xlnx,io-pit-1.02.a", "xlnx,io_pit"; \
+                       interrupt-parent = <&pmc_ppu ## X ## _io_intc>; \
+                       interrupts = <6>;                               \
+                       reg = <0x0 MM_PMC_PPU ## X ## _IOM(70) 0xc>;    \
+                       xlnx,pit-interrupt = <0x1>;                     \
+                       xlnx,pit-prescaler = <0x9>;                     \
+                       xlnx,pit-readable = <0x1>;                      \
+                       xlnx,pit-size = <0x20>;                         \
+                       xlnx,use-pit = <0x1>;                           \
+                       frequency = <460000000>;                        \
+                       gpio-controller;                                \
+                       #gpio-cells = <1>;                              \
+               };                                                      \
+       }
+
+/ {
+       /* MDM UARTs. We put them here for instantiation ordering purposes
+         * making sure that -serial command line options refer to these
+        * first.
+         */
+       ppu0_mdm_uart@MM_PMC_PPU0_MDM_HSD {
+               doc-status = "complete";
+               compatible = "xlnx,xps-uartlite";
+               reg-extended = <&lmb_pmc_ppu0 0x0 MM_PMC_PPU0_MDM_HSD 0x0 0x10 0x1>;
+               chardev = "serial2";
+       };
+
+       ppu1_mdm_uart@MM_PMC_PPU1_MDM_HSD {
+               doc-status = "complete";
+               compatible = "xlnx,xps-uartlite";
+               reg-extended = <&lmb_pmc_ppu1 0x0 MM_PMC_PPU1_MDM_HSD 0x0 0x10 0x1>;
+               chardev = "serial3";
+       };
+};
+
+&lmb_pmc_ppu0 {
+       doc-name = "LMB PPU0";
+       doc-status = "complete";
+       CREATE_PPU_IOMOD(0);
+};
+
+&lmb_pmc_ppu1 {
+       doc-name = "LMB PPU1";
+       doc-status = "complete";
+       CREATE_PPU_IOMOD(1);
+};
+
+&amba_pmc_ppu {
+       pmc_gic_proxy: pmc_gic_proxy@0 {
+               doc-status = "complete";
+               #interrupt-cells = <3>;
+               interrupt-controller;
+
+               compatible = "xlnx,zynqmp-gicp";
+               reg = <0x0 MM_PMC_GIC_PROXY 0x0 MM_PMC_GIC_PROXY_SIZE 0x0>;
+               interrupt-parent = <&pmc_ppu1_io_intc>;
+               interrupts = <IRQ_PPU1_INTC_PMC_GICP>;
+       };
+};
+
+diff --git a/versal-ps-iou-alt.dtsi b/versal-ps-iou-alt.dtsi
+new file mode 100644
+index 00000000..a6c22b86
+--- /dev/null
+++ b/versal-ps-iou-alt.dtsi
+@@ -0,0 +1,467 @@
+/*
+ * Versal PS IOU
+ *
+ * Copyright (C) 2016-2022, Xilinx, Inc.
+ * Copyright (C) 2023, Advanced Micro Devices, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "versal.dtsh"
+
+#define GEM(g_name, g_base, g_size, g_dma, g_irq, rst_idx, pwr_idx)    \
+g_name: ethernet@g_base {                                              \
+       #address-cells = <1>;                                           \
+       #size-cells = <0>;                                              \
+       #priority-cells = <0>;                                          \
+       compatible = "cdns,gem";                                        \
+       interrupts = <g_irq g_irq>;                                     \
+       dma = <g_dma>;                                                  \
+       memattr = <& ## g_name ## _memattr_smid>;                               \
+       memattr-write = <& ## g_name ## _w_memattr_smid>;                       \
+       reg = <0x0 g_base 0x0 g_size 0x0>;                              \
+       num-priority-queues = <2>;                                      \
+       reset-gpios = <&crl rst_idx>;                                   \
+       power-gpios = <&psm_local pwr_idx>;                             \
+}
+
+// FIXME: Add support for SMIDs
+#define ZDMA_CHANNEL(zname, zdomain, zbase, zirq, zbuswidth, zdma, mid, num)   \
+zname ## _mattr: zname ## mattr {                                      \
+       compatible = "qemu:memory-transaction-attr";                    \
+       requester-id = <mid>;                                           \
+};                                                                     \
+                                                                       \
+zname: dma-controller@zbase {                                                  \
+       compatible = "xlnx,zdma";                                       \
+       reg = <0x0 zbase 0x0 MM_ADMA_CH0_SIZE 0x0>;                     \
+       bus-width = <zbuswidth>;                                        \
+       has-parity = <1>;                                                       \
+       interrupts = <zirq>;                                            \
+       #stream-id-cells = <0x1>;                                       \
+       dma = <zdma>;                                                   \
+       memattr = <& ## zname ## _mattr>;                               \
+       reset-gpios = < &crl CRL_RST_ADMA >;                            \
+       #gpio-cells = <1>;      \
+       gpio-names = "memattr-secure";  \
+       gpios = <&lpd_slcr_secure num>; \
+}
+
+/*
+ * Our XRAM model only has the correctable interrupt line.
+ * All instances connect to a single line in the GIC.
+ *
+ * To support shared memories for co-sim, we provide the
+ * actual RAMs externally and not from the XRAMC model.
+ */
+#define XRAM_CTRL(n) xram_ctrl_ ## n { \
+       compatible = "xlnx,versal-xramc";               \
+       reg = <0x0 (MM_XRAM + 0x## n ##0000) 0 0x10000 0x0 >;   \
+       interrupts = <XRAM_IRQ_0>;                      \
+       alloc-ram = <0>;                                \
+}
+
+&amba_fpd {
+#ifdef MM_FPD_FPD_APU
+       apu_ctrl: apu_ctrl@MM_FPD_FPD_APU {
+               compatible = "xlnx,versal-apu-ctrl";
+               reg = <0x0 MM_FPD_FPD_APU 0x0 MM_FPD_FPD_APU_SIZE 0x0>;
+               cpu0 = <&cpu0>;
+               cpu1 = <&cpu1>;
+               #gpio-cells = <1>;
+       };
+#endif
+
+       afi_fm@MM_FPD_FPD_AFIFM0 {
+               compatible = "xlnx,versal-afi-fm";
+               reg = <0x0 MM_FPD_FPD_AFIFM0 0x0 MM_FPD_FPD_AFIFM0_SIZE 0x0>;
+       };
+
+       afi_fm@MM_FPD_FPD_AFIFM2 {
+               compatible = "xlnx,versal-afi-fm";
+               reg = <0x0 MM_FPD_FPD_AFIFM2 0x0 MM_FPD_FPD_AFIFM2_SIZE 0x0>;
+       };
+
+#ifdef MM_FPD_FPD_GPCCI
+       cci_reg@MM_FPD_FPD_GPCCI {
+               compatible = "xlnx,cci_reg";
+               reg = <0x0 MM_FPD_FPD_GPCCI 0x0 MM_FPD_FPD_MAINCCI_SIZE 0x0>;
+       };
+#endif
+
+#ifdef MM_FPD_FPD_MAINCCI
+       cci500@MM_FPD_FPD_MAINCCI {
+               compatible = "xlnx,cci500";
+               reg = <0x0 MM_FPD_FPD_MAINCCI 0x0 MM_FPD_FPD_MAINCCI_SIZE 0x0>;
+       };
+#endif
+
+       cpm_crcpm@MM_CPM_CPM_CRCPM {
+               compatible = "xlnx,versal_cpm_crcpm";
+               reg = <0x0 MM_CPM_CPM_CRCPM 0x0 MM_CPM_CPM_CRCPM_SIZE 0x0>;
+       };
+
+       cpm_pcsr@MM_CPM_CPM_PCSR {
+               compatible = "xlnx,versal_cpm_pcsr";
+               reg = <0x0 MM_CPM_CPM_PCSR 0x0 MM_CPM_CPM_PCSR_SIZE 0x0>;
+       };
+
+       cpm_slcr_secure@MM_CPM_CPM_SLCR_SECURE {
+               compatible = "xlnx.cpm_slcr_secure";
+               reg = <0x0 MM_CPM_CPM_SLCR_SECURE 0x0 MM_CPM_CPM_SLCR_SECURE_SIZE 0x0>;
+       };
+
+       fpd_slcr@MM_FPD_FPD_SLCR {
+               compatible = "xlnx,versal-fpd-slcr";
+               interrupts = <SLCR_FPD_APB_IRQ_0>;
+               reg = <0x0 MM_FPD_FPD_SLCR 0x0 MM_FPD_FPD_SLCR_SIZE 0x0>;
+       };
+
+       fpd_slcr_secure@MM_FPD_FPD_SLCR {
+               compatible = "xlnx,versal-fpd-slcr-secure";
+               interrupts = <SLCR_SECURE_FPD_APB_IRQ_0>;
+               reg = <0x0 MM_FPD_FPD_SLCR_SECURE 0x0 MM_FPD_FPD_SLCR_SECURE_SIZE 0x0>;
+       };
+
+#ifdef MM_FPD_FPD_WWDT
+       wwdt0: watchdog@MM_FPD_FPD_WWDT {
+               compatible = "xlnx,versal-wwdt";
+               reg = <0x0 MM_FPD_FPD_WWDT 0x0 MM_FPD_FPD_WWDT_SIZE 0x0>;
+               /* IRQ order must match the QEMU model */
+               interrupts = <FP_WDT_IRQ_0
+                                       FPD_WWDT_RST_PENDING_IRQ_0
+                                       FPD_GWDT_WS0_IRQ_0
+                                       FPD_GWDT_WS1_IRQ_0>;
+               pclk = <100000000>;
+               reset-gpios = <&crf 27>;
+       };
+#endif
+#ifdef MM_FPD_INTFPD_CONFIG
+       intfpd: intfpd@MM_FPD_INTFPD_CONFIG {
+               compatible = "xlnx-intfpd-config";
+               reg = <0x0 MM_FPD_INTFPD_CONFIG 0x0 MM_FPD_INTFPD_CONFIG_SIZE 0x0>;
+               interrupts = <
+               #if FPD_APB_INT_IRQ_0
+                               FPD_APB_INT_IRQ_0
+               #elif  INT_FPD_IRQ_0
+                               INT_FPD_IRQ_0
+               #endif
+               >;
+       };
+#endif
+};
+
+&amba_lpd {
+       GEM(gem0, MM_GEM0, MM_GEM0_SIZE, &smmu_tbu0, GEM0_IRQ_0, CRL_RST_GEM0, PLR_PWR_GEM0);
+       GEM(gem1, MM_GEM1, MM_GEM1_SIZE, &smmu_tbu0, GEM1_IRQ_0, CRL_RST_GEM1, PLR_PWR_GEM1);
+
+       serial0: serial@MM_UART0 {
+               compatible = "pl011";
+               interrupts = <UART0_IRQ_0>;
+               reg = <0x0 MM_UART0 0x0 MM_UART0_SIZE 0x0 >;
+               reset-gpios = < &crl CRL_RST_UART0 >;
+               chardev = "serial0";
+       };
+       serial1: serial@MM_UART1 {
+               compatible = "pl011";
+               interrupts = <UART1_IRQ_0>;
+               reg = <0x0 MM_UART1 0x0 MM_UART1_SIZE 0x0 >;
+               reset-gpios = < &crl CRL_RST_UART1 >;
+               chardev = "serial1";
+       };
+
+       canfdbus0: canfdbus@0 {
+               compatible = "can-bus";
+       };
+
+       can0: can@MM_CANFD0 {
+               compatible = "xlnx,versal-canfd";
+               rx-fifo0 = <0x40>;
+               rx-fifo1 = <0x40>;
+               enable-rx-fifo1 = <0x1>;
+               canfdbus = <&canfdbus0>;
+               interrupts = <CAN0_IRQ_0>;
+               reg = <0x0 MM_CANFD0 0x0 MM_CANFD0_SIZE 0x0>;
+               reset-gpios = <&crl CRL_RST_CAN0>;
+       };
+       can1: can@MM_CANFD1 {
+               compatible = "xlnx,versal-canfd";
+               rx-fifo0 = <0x40>;
+               rx-fifo1 = <0x40>;
+               enable-rx-fifo1 = <0x1>;
+               canfdbus = <&canfdbus0>;
+               interrupts = <CAN1_IRQ_0>;
+               reg = <0x0 MM_CANFD1 0x0 MM_CANFD1_SIZE 0x0>;
+               reset-gpios = <&crl CRL_RST_CAN1>;
+       };
+
+       crl: crl@MM_CRL {
+               compatible = "xlnx,versal-crl";
+               reg = <0x0 MM_CRL 0x0 MM_CRL_SIZE 0x0>;
+               gpio-controller;
+               #gpio-cells = <1>;
+       };
+
+       lpd_iou_slcr: slcr@MM_LPD_IOU_SLCR {
+               compatible = "xlnx,versal-lpd-iou-slcr";
+               reg = <0x0 MM_LPD_IOU_SLCR 0x0 MM_LPD_IOU_SLCR_SIZE 0x0>;
+       };
+
+#ifdef MM_RPU
+       rpu_ctrl: rpu_ctrl@MM_RPU {
+               compatible = "xlnx,versal-rpu";
+               reg-extended = <&amba_lpd 0x0 MM_RPU 0x0 MM_RPU_SIZE 0x0
+                                &amba_r5_0 0x0 0x0 0x0 0x80000 0x0
+                                &amba 0x0 MM_R5_0_ATCM 0x0 0x60000 0x0
+                                &amba_r5_1 0x0 0x0 0x0 0x80000 0x0
+                                &amba 0x0 0xFFE90000 0x0 0x50000 0x0>;
+               rpu0 = <&rpu_cpu0>;
+               rpu1 = <&rpu_cpu1>;
+
+               gpio-controller;
+               #gpio-cells = <1>;
+
+               gpios = < &crl CRL_RST_CPU_R5_0 &crl CRL_RST_CPU_R5_1
+                         &psm_local 42 &psm_local 43
+                       >;
+       };
+#endif
+
+       ipi: ipi@MM_IPI {
+               compatible = "xlnx,versal-ipi";
+               reg = <0x0 MM_IPI 0x0 MM_IPI_SIZE 0x0>;
+
+               /* Interrupt ordering here needs to match
+                * QEMU's sysbus-irq output order.  */
+               interrupts = <IPI_PSM_IRQ_0
+                             IPI_PMC_IRQ_0
+                             IPI0_IRQ_0 IPI1_IRQ_0
+                             IPI2_IRQ_0 IPI3_IRQ_0
+                             IPI4_IRQ_0 IPI5_IRQ_0
+                             IPI6_IRQ_0
+                             IPI_PMC_NOBUF_IRQ_0
+                             IPI_APB_IRQ_0>;
+               reset-gpios = <&crl CRL_RST_IPI>;
+       };
+
+       spi0: spi@MM_SPI0 {
+               compatible = "cdns,spi-r1p6";
+               interrupts = <SPI0_IRQ_0>;
+               num-ss-bits = <4>;
+               reg = <0x0 MM_SPI0 0x0 MM_SPI0_SIZE 0x0 >;
+
+               #address-cells = <1>; /* For child; must match SPI_FLASH() */
+               #size-cells = <0>;
+               #bus-cells = <1>;
+               reset-gpios = <&crl CRL_RST_SPI0>;
+       };
+       spi1: spi@MM_SPI1 {
+               compatible = "cdns,spi-r1p6";
+               interrupts = <SPI1_IRQ_0>;
+               num-ss-bits = <4>;
+               reg = <0x0 MM_SPI1 0x0 MM_SPI1_SIZE 0x0 >;
+
+               #address-cells = <1>; /* For child; must match SPI_FLASH() */
+               #size-cells = <0>;
+               #bus-cells = <1>;
+               reset-gpios = <&crl CRL_RST_SPI1>;
+       };
+
+       dwc3_0: usb2@USB2_0_XHCI {
+               compatible = "usb_dwc3";
+               reg = <0x0 MM_USB_DWC3_0 0x0 MM_USB_DWC3_0_SIZE 0x0 0x0 MM_USB_XHCI 0x0 MM_USB_XHCI_SIZE 0x0>;
+               interrupts = <USB2_IRQ_0 USB2_IRQ_1 USB2_IRQ_2 USB2_IRQ_3>;
+               dma = <&smmu_tbu0>;
+               memattr = <&usb0_memattr>;
+               reset-gpios = <&crl CRL_RST_USB0>;
+               intrs = <4>;
+               slots = <2>;
+       };
+
+       ttc0: timer@MM_TTC0 {
+               compatible = "xlnx,ps7-ttc-1.00.a";
+               interrupts = <TTC0_IRQ_0 TTC0_IRQ_1 TTC0_IRQ_2>;
+               reg = <0x0 MM_TTC0 0x0 MM_TTC0_SIZE 0x0>;
+               width = <32>;
+               reset-gpios = < &crl CRL_RST_TTC0 >;
+       };
+       ttc1: timer@MM_TTC1 {
+               compatible = "xlnx,ps7-ttc-1.00.a";
+               interrupts = <TTC1_IRQ_0 TTC1_IRQ_1 TTC1_IRQ_2>;
+               reg = <0x0 MM_TTC1 0x0 MM_TTC1_SIZE 0x0>;
+               width = <32>;
+               reset-gpios = < &crl CRL_RST_TTC1 >;
+       };
+       ttc2: timer@MM_TTC2 {
+               compatible = "xlnx,ps7-ttc-1.00.a";
+               interrupts = <TTC2_IRQ_0 TTC2_IRQ_1 TTC2_IRQ_2>;
+               reg = <0x0 MM_TTC2 0x0 MM_TTC2_SIZE 0x0>;
+               width = <32>;
+               reset-gpios = < &crl CRL_RST_TTC2 >;
+       };
+       ttc3: timer@MM_TTC3 {
+               compatible = "xlnx,ps7-ttc-1.00.a";
+               interrupts = <TTC3_IRQ_0 TTC3_IRQ_1 TTC3_IRQ_2>;
+               reg = <0x0 MM_TTC3 0x0 MM_TTC3_SIZE 0x0>;
+               width = <32>;
+               reset-gpios = < &crl CRL_RST_TTC3 >;
+       };
+
+       ZDMA_CHANNEL(adma0, adma, MM_ADMA_CH0, ADMA_IRQ_0, 128, &smmu_tbu0, SMID_DMA0_CH0, 0x0);
+       ZDMA_CHANNEL(adma1, adma, MM_ADMA_CH1, ADMA_IRQ_1, 128, &smmu_tbu0, SMID_DMA0_CH1, 0x1);
+       ZDMA_CHANNEL(adma2, adma, MM_ADMA_CH2, ADMA_IRQ_2, 128, &smmu_tbu0, SMID_DMA0_CH2, 0x2);
+       ZDMA_CHANNEL(adma3, adma, MM_ADMA_CH3, ADMA_IRQ_3, 128, &smmu_tbu0, SMID_DMA0_CH3, 0x3);
+       ZDMA_CHANNEL(adma4, adma, MM_ADMA_CH4, ADMA_IRQ_4, 128, &smmu_tbu0, SMID_DMA0_CH4, 0x4);
+       ZDMA_CHANNEL(adma5, adma, MM_ADMA_CH5, ADMA_IRQ_5, 128, &smmu_tbu0, SMID_DMA0_CH5, 0x5);
+       ZDMA_CHANNEL(adma6, adma, MM_ADMA_CH6, ADMA_IRQ_6, 128, &smmu_tbu0, SMID_DMA0_CH6, 0x6);
+       ZDMA_CHANNEL(adma7, adma, MM_ADMA_CH7, ADMA_IRQ_7, 128, &smmu_tbu0, SMID_DMA0_CH7, 0x7);
+
+       afi_fm@MM_LPD_AFIFM4 {
+               compatible = "xlnx,versal-afi-fm";
+               reg = <0x0 MM_LPD_AFIFM4 0x0 MM_LPD_AFIFM4_SIZE 0x0>;
+       };
+
+       lpd_i2c_wrapper {
+#ifdef MM_PS_I2C0
+               ps_i2c0: ps_i2c0@MM_PS_I2C0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "xlnx,ps7-i2c-1.00.a", "cdns,i2c-r1p10";
+                       interrupts = <I2C0_IRQ_0>;
+                       reg-extended = <&amba_lpd 0x0 MM_PS_I2C0 0x0 MM_PS_I2C0_SIZE 0x0>;
+                       reset-gpios = <&crl CRL_RST_I2C0>;
+               };
+               ps_i2c1: ps_i2c0@MM_PS_I2C1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "xlnx,ps7-i2c-1.00.a", "cdns,i2c-r1p10";
+                       interrupts = <I2C1_IRQ_0>;
+                       reg-extended = <&amba_lpd 0x0 MM_PS_I2C1 0x0 MM_PS_I2C1_SIZE 0x0>;
+                       reset-gpios = <&crl CRL_RST_I2C1>;
+               };
+#endif
+       };
+
+       ocm_ctrl0: ocm_ctrl@OCM {
+               compatible = "xlnx,zynqmp-ocmc";
+               interrupts = <OCMINTR_IRQ_0>;
+               memsize = <MM_OCM_MEM_SIZE>;
+               reg = <0x0 MM_OCM 0x0 MM_OCM_SIZE 0x0>;
+               reset-gpios = <&crl CRL_RST_OCM>;
+       };
+
+#ifdef MM_XRAM_SLCR
+       xram_slcr@MM_XRAM_SLCR {
+               compatible = "xlnx,xram_slcr";
+               reg = <0x0 MM_XRAM_SLCR 0x0 MM_XRAM_SLCR_SIZE 0x0>;
+       };
+#endif
+
+       lpd_slcr@MM_LPD_SLCR {
+               compatible = "xlnx,versal-lpd-slcr";
+               reg = <0x0 MM_LPD_SLCR 0x0 MM_LPD_SLCR_SIZE 0x0>;
+       };
+
+       lpd_slcr_secure: lpd_slcr_secure@MM_LPD_SLCR_SECURE {
+               compatible = "xlnx,versal-lpd-slcr-secure";
+               reg = <0x0 MM_LPD_SLCR_SECURE 0x0 MM_LPD_SLCR_SECURE_SIZE 0x0>;
+               gpio-controller;
+               #gpio-cells = <1>;
+       };
+
+       lpd_iou_slcr_secure: lpd_iou_slcr_secure@MM_LPD_IOU_SECURE_SLCR {
+               compatible = "xlnx,versal-lpd-iou-slcr-secure";
+               reg = <0x0 MM_LPD_IOU_SECURE_SLCR 0x0 MM_LPD_IOU_SECURE_SLCR_SIZE 0x0>;
+               memattr-gem0 = <&gem0_memattr_smid>;
+               memattr-write-gem0 = <&gem0_w_memattr_smid>;
+               memattr-gem1 = <&gem1_memattr_smid>;
+               memattr-write-gem1 = <&gem1_w_memattr_smid>;
+       };
+
+#ifdef MM_WWDT
+       lpd_wwdt: wwdt@MM_WWDT {
+               compatible = "xlnx,versal-wwdt";
+               reg = <0x0 MM_WWDT 0x0 MM_WWDT_SIZE 0x0>;
+               /* IRQ order must match the QEMU model */
+               interrupts = <WWDT_IRQ_0
+                                       WWDT_RST_PENDING_IRQ_0
+                                       GWDT_WS0_IRQ_0
+                                       GWDT_WS1_IRQ_0>;
+               pclk = <100000000>;
+               reset-gpios = <&crl CRL_RST_SWDT>;
+       };
+#endif
+
+       lpd_gpio: lpd_gpio@MM_PS_GPIO {
+               #gpio-cells = <1>;
+               compatible = "xlnx,zynqmp-gpio";
+               gpio-controller;
+               interrupts = <GPIO_IRQ_0>;
+               reg = <0x0 MM_PS_GPIO 0x0 MM_PS_GPIO_SIZE 0x0>;
+               reset-gpios = < &crl CRL_RST_GPIO >;
+       };
+#ifdef MM_INTLPD_CONFIG
+       intlpd: intlpd@MM_INTLPD_CONFIG {
+               compatible = "xlnx-intlpd-config";
+               reg = <0x0 MM_INTLPD_CONFIG 0x0 MM_INTLPD_CONFIG_SIZE 0x0>;
+               interrupts = <INT_LPD_IRQ_0>;
+       };
+#endif
+};
+
+&amba_xram {
+       XRAM_CTRL(0);
+       XRAM_CTRL(1);
+       XRAM_CTRL(2);
+       XRAM_CTRL(3);
+};
+
+&amba_root {
+       /* These devices need to be created before the CPUs.  */
+       crf: crf@MM_FPD_CRF {
+               compatible = "xlnx,versal-crf";
+               reg-extended = <&amba_fpd 0x0 MM_FPD_CRF 0x0 MM_FPD_CRF_SIZE 0x0>;
+               gpio-controller;
+               #gpio-cells = <1>;
+       };
+};
+
+/ {
+       /* Reset domains.  */
+       lpd_reset_domain@0 {
+               compatible = "qemu,reset-domain";
+               mr0 = <&amba_lpd>;
+               reset-gpios = < &pmc_clk_rst CRP_RST_PS_PS_SRST
+                               &pmc_clk_rst CRP_RST_PS_PS_POR >;
+       };
+
+       fpd_reset_domain@0 {
+               compatible = "qemu,reset-domain";
+               mr0 = <&amba_fpd>;
+               reset-gpios = < &pmc_clk_rst CRP_RST_PS_PS_SRST
+                               &pmc_clk_rst CRP_RST_PS_PS_POR
+                               &crl CRL_RST_FPD_POR
+                               &crl CRL_RST_FPD_SRST >;
+       };
+};
+-- 
+2.34.1
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-versal-net-Reorder-serial-port.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-versal-net-Reorder-serial-port.patch
new file mode 100644
index 00000000..97262ae4
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-versal-net-Reorder-serial-port.patch
@@ -0,0 +1,291 @@
+From 58fdfde013dfabf3a9f2c83525c00a6f057768f1 Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Fri, 4 Oct 2024 15:49:46 -0600
+Subject: [PATCH] versal-net: Reorder serial port
+This commit requires the corresponding "versal: Reorder serial ports"
+This change affects the order of the serial ports when calling qemu.
+Previously the serial ports 0 & 1 were the PMC (firmware) uartlite,
+while the standard serial pors were 2 & 3.  Reverse this order to
+ensure that the first two serial ports are the ones used by Linux.
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ board-versal-net-psx-spp-1.4-alt.dts |  36 ++++++++
+ board-versal-net-psx-virt-alt.dts    | 130 +++++++++++++++++++++++++++
+ board-versal-pmx-virt-alt.dts        |  82 +++++++++++++++++
+ 3 files changed, 248 insertions(+)
+ create mode 100644 board-versal-net-psx-spp-1.4-alt.dts
+ create mode 100644 board-versal-net-psx-virt-alt.dts
+ create mode 100644 board-versal-pmx-virt-alt.dts
+diff --git a/board-versal-net-psx-spp-1.4-alt.dts b/board-versal-net-psx-spp-1.4-alt.dts
+new file mode 100644
+index 00000000..770a388e
+--- /dev/null
+++ b/board-versal-net-psx-spp-1.4-alt.dts
+@@ -0,0 +1,36 @@
+/*
+ * Versal Net PSX device tree.
+ *
+ * Copyright (c) 2022, Xilinx Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define VERSAL_NET_APU_CPU_FREQ 100000000
+
+#include "board-versal-net-psx-virt-alt.dts"
+
+&pmc_tap {
+       platform-ver = <0x5>;
+};
+diff --git a/board-versal-net-psx-virt-alt.dts b/board-versal-net-psx-virt-alt.dts
+new file mode 100644
+index 00000000..7ee4ad9d
+--- /dev/null
+++ b/board-versal-net-psx-virt-alt.dts
+@@ -0,0 +1,130 @@
+/*
+ * Versal-Net Virtual PSX board device tree.
+ *
+ * Copyright (c) 2021-2022, Xilinx Inc.
+ * Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef NUM_APUS
+#define NUM_APUS 16
+#endif
+#define VERSAL_NET_APU_CPU_FREQ 100000000
+
+#define NUM_APUS_PER_CLUSTER 4
+
+#define VERSAL_NPI_GENERIC
+#define VERSAL_PSX
+#define VERSAL_NET
+#define VERSAL_NPI_OVERRIDE
+
+/* TODO: Add GIC interrupt redirection support.  */
+#define RPU_GIC_INTERRUPT_TARGET_STEM rpu_cpu
+
+#define APU_CPU_MODEL "cortex-a78-arm-cpu"
+#define RPU_CPU_MODEL "cortex-r52-arm-cpu"
+
+#include "include/versal-net/npi-memmap.dtsh"
+#include "include/versal-net/fpd-memmap.dtsh"
+#include "board-versal-ps-virt-alt.dts"
+#include "versal-psx.dtsi"
+#include "versal-net-psmx.dtsi"
+#include "versal-psx-rpu.dtsi"
+#include "versal-net-boot-init.dtsi"
+#include "versal-net-hnic.dtsi"
+#include "versal-pmx-shared-overlay.dtsi"
+#include "versal-pmx-system-overlay.dtsi"
+#include "versal-psx-shared-overlay.dtsi"
+
+#ifndef VERSAL_NET_APU_CPU_FREQ
+ #define VERSAL_NET_APU_CPU_FREQ 2720000
+#endif
+
+#define SET_CPU_FREQ(n, f)                                     \
+&cpu ## n {                                                    \
+       generic-timer-frequency = <f>;                          \
+}
+
+SET_CPU_FREQ(0, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(1, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(2, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(3, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(4, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(5, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(6, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(7, VERSAL_NET_APU_CPU_FREQ);
+#if (NUM_APUS >= 16)
+SET_CPU_FREQ(8, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(9, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(10,VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(11,VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(12,VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(13,VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(14,VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(15,VERSAL_NET_APU_CPU_FREQ);
+#endif
+#if (NUM_APUS >= 32)
+SET_CPU_FREQ(16, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(17, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(18, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(19, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(20, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(21, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(22, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(23, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(24, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(25, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(26, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(27, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(28, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(29, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(30, VERSAL_NET_APU_CPU_FREQ);
+SET_CPU_FREQ(31, VERSAL_NET_APU_CPU_FREQ);
+#endif
+
+&rpu_ctrl_a {
+       tcm-mr = <&s_axi_tcm_a>;
+};
+&rpu_ctrl_a0 {
+       core = <&rpu_cpu0>;
+};
+&rpu_ctrl_a1 {
+       core = <&rpu_cpu1>;
+};
+
+&rpu_ctrl_b {
+       tcm-mr = <&s_axi_tcm_b>;
+};
+&rpu_ctrl_b0 {
+       core = <&rpu_cpu2>;
+};
+&rpu_ctrl_b1 {
+       core = <&rpu_cpu3>;
+};
+
+&pmc_tap {
+       idcode = <0x14D80093>;
+       platform-ver = <0x5>;
+};
+diff --git a/board-versal-pmx-virt-alt.dts b/board-versal-pmx-virt-alt.dts
+new file mode 100644
+index 00000000..7a4679d0
+--- /dev/null
+++ b/board-versal-pmx-virt-alt.dts
+@@ -0,0 +1,82 @@
+/*
+ * Versal Virtual PMC board device tree
+ *
+ * Copyright (c) 2016, Xilinx Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define VERSAL_PMX
+#define VERSAL_NET
+#define NUM_APUS 16
+#define NUM_APUS_PER_CLUSTER 4
+#define VERSAL_NPI_OVERRIDE
+
+#include "include/versal-net/npi-memmap.dtsh"
+#include "include/versal-net/fpd-memmap.dtsh"
+#include "board-versal-pmc-virt-alt.dts"
+#include "versal-pmx-shared-overlay.dtsi"
+
+#ifndef MULTI_ARCH
+/*
+ * The single-arch setup has the entire system except
+ * the ARM cores. So we need to add the missing dummy
+ * ARM cores (pmc-virt.dts already has 0 - 1) and include
+ * the PSX and PMX system overlays.
+ */
+#include "versal-pmx-system-overlay.dtsi"
+#include "versal-psx.dtsi"
+#include "versal-psx-shared-overlay.dtsi"
+#include "versal-net-psmx.dtsi"
+
+/ {
+       /* Dummy APUs.  */
+       cpu2: apu@2 { };
+       cpu3: apu@3 { };
+       cpu4: apu@4 { };
+       cpu5: apu@5 { };
+       cpu6: apu@6 { };
+       cpu7: apu@7 { };
+#if (NUM_APUS >= 16)
+       cpu8: apu@8 { };
+       cpu9: apu@9 { };
+       cpu10: apu@10 { };
+       cpu11: apu@11 { };
+       cpu12: apu@12 { };
+       cpu13: apu@13 { };
+       cpu14: apu@14 { };
+       cpu15: apu@15 { };
+#endif
+       /* Dummy GICs.  */
+       rpu_gic_a: rpu_gic_a@0 {
+               gpio_controller ;
+               #gpio-cells = <1>;
+       };
+
+       rpu_gic_b: rpu_gic_b@0 {
+               gpio_controller ;
+               #gpio-cells = <1>;
+       };
+};
+#endif
+-- 
+2.34.1
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
deleted file mode 100644
index d10504d3..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2024.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require qemu-devicetrees.inc
-BRANCH ?= "xlnx_rel_v2024.1"
-SRCREV ?= "b9c88cbfaaa0c8b8be70ea3c74f4cb69fb02a080"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2024.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2024.2.bb
new file mode 100644
index 00000000..5780aed1
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2024.2.bb
@@ -0,0 +1,6 @@
+require qemu-devicetrees.inc
+BRANCH ?= "xlnx_rel_v2024.2"
+SRCREV ?= "a6eeb7ec0fdb765ab0057d95eb6201d97359eff9"
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
index 179903c5..da62c8b7 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
@@ -8,8 +8,8 @@ COMPATIBLE_HOST:arm = "null"
 # x86_64 is needed to build nativesdks
 QEMU_TARGETS = "aarch64 arm microblaze microblazeel riscv32 x86_64"
-BRANCH = "xlnx_rel_v2024.1"
+BRANCH = "xlnx_rel_v2024.2"
-SRCREV = "2319c870e754148ec3b9d40be0d3dbee959c3251"
+SRCREV = "01482fa113dcbfa785feb7d513df50d15ec4c5df"
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                    file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
@@ -72,6 +72,13 @@ SRC_URI += "\
 # Patch doesn't apply to 8.1.0
 #           file://fixmips.patch 
+# Additional patches to match Scarthgap, which requires a slightly newer qmp interface
+SRC_URI += "\
+           file://0001-python-rename-QEMUMonitorProtocol.cmd-to-cmd_raw.patch \
+           file://0002-python-qemu-rename-command-to-cmd.patch \
+           "
 S = "${WORKDIR}/git"
 # Based on qemu settings in poky/meta/conf/distro/include/no-static-libs.inc
diff --git a/meta-xilinx-core/recipes-devtools/tcf-agent/tcf-agent_%.bbappend b/meta-xilinx-core/recipes-devtools/tcf-agent/tcf-agent_%.bbappend
new file mode 100644
index 00000000..d0bbaa0a
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/tcf-agent/tcf-agent_%.bbappend
@@ -0,0 +1,2 @@
+# On a Zynq system hardware breakpoints are limited, so used software
+CFLAGS:append:zynq = " -DENABLE_HardwareBreakpoints=0"
diff --git a/meta-xilinx-core/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in b/meta-xilinx-core/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
new file mode 100644
index 00000000..ba8c8f21
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
@@ -0,0 +1,8 @@
+# common environment file for sysvinit and systemd
+LD_LIBRARY_PATH=/usr/lib/headless:${LD_LIBRARY_PATH}
+XSERVER=/usr/bin/Xorg
+DISPLAY=:0
+ARGS=" -br -pn @BLANK_ARGS@ @NO_CURSOR_ARG@ "
+HOME=@HOME@
+USER=@USER@
diff --git a/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86Rotate.c-Add-required-NULL-check.patch b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86Rotate.c-Add-required-NULL-check.patch
new file mode 100644
index 00000000..8c086ddb
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86Rotate.c-Add-required-NULL-check.patch
@@ -0,0 +1,35 @@
+From e94754360160cfe4faada7b9a523e57004b39e74 Mon Sep 17 00:00:00 2001
+From: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
+Date: Thu, 15 Aug 2024 15:48:21 -0700
+Subject: [PATCH] xf86Rotate.c: Add required NULL check
+Add missing NULL check on BlockHandler callback before invoking it. There
+is no guarantee that said callback is always defined.
+Fixes xorg crash on startup when screen rotation is specified in the config
+file.
+Upstream-Status: Pending
+Signed-off-by: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
+---
+ hw/xfree86/modes/xf86Rotate.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
+index ea9c43c..43eab53 100644
+--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
+@@ -230,7 +230,8 @@ xf86RotateBlockHandler(ScreenPtr pScreen, void *pTimeout)
+ 
+     xf86RotateRedisplay(pScreen);
+ 
+-    (*pScreen->BlockHandler) (pScreen, pTimeout);
+    if (pScreen->BlockHandler)
+        (*pScreen->BlockHandler) (pScreen, pTimeout);
+ 
+     /* Re-wrap if we still need this hook */
+     if (xf86_config->rotation_damage != NULL) {
+-- 
+2.25.1
diff --git a/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index dc6a75c6..ebf7cd9e 100644
--- a/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -3,6 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI += " \
    file://monitor-hotplug.sh \
    file://99-monitor-hotplug.rules \
+    file://0001-xf86Rotate.c-Add-required-NULL-check.patch \
    "
 do_install:append() {
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
index 22f363c9..3aaac030 100644
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
+++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
@@ -23,4 +23,3 @@ EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
-COMPATIBLE_MACHINE:versal-net = "versal-net"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.40.bb
index 318a3cc0..d6b4d565 100644
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.40.bb
@@ -8,9 +8,9 @@ PV .= "+git"
 S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2024.1"
+BRANCH ?= "xlnx_rel_v2024.2"
 REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
-SRCREV = "edd297762e0bac3f4c5b64ef67244968e22020e2"
+SRCREV = "4bb89eb3f3062eac8de1aa2b7e64d7f861e18caa"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
@@ -23,4 +23,3 @@ EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
-COMPATIBLE_MACHINE:versal-net = "versal-net"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi21/kernel-module-hdmi21_2024.2.bb b/meta-xilinx-core/recipes-kernel/hdmi21/kernel-module-hdmi21_2024.2.bb
new file mode 100644
index 00000000..806d2515
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/hdmi21/kernel-module-hdmi21_2024.2.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Xilinx HDMI 2.1 FMC linux kernel module"
+DESCRIPTION = "Out-of-tree HDMI 2.1 FMC kernel modules provider for aarch64 devices"
+SECTION = "PETALINUX/modules"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
+inherit module
+SRC_BRANCH = "master"
+INHIBIT_PACKAGE_STRIP = "1"
+SRC_URI = "git://github.com/Xilinx/hdmi21-modules.git;protocol=https;branch=${SRC_BRANCH}"
+SRCREV = "26a1d40723c58783f7aedba028a208ab9410df5f"
+S = "${WORKDIR}/git"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+# The inherit of module.bbclass will automatically name module packages with
+# "kernel-module-" prefix as required by the oe-core build environment.
diff --git a/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent/meson.patch
deleted file mode 100644
index 38b61071..00000000
--- a/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent/meson.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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
deleted file mode 100644
index bee78918..00000000
--- a/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/hwmon/hwmon_modules.cfg b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/hwmon/hwmon_modules.cfg
new file mode 100644
index 00000000..b6db5f90
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/hwmon/hwmon_modules.cfg
@@ -0,0 +1,2 @@
+CONFIG_SENSORS_TPS53679=m
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/hwmon/hwmon_modules.scc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/hwmon/hwmon_modules.scc
new file mode 100644
index 00000000..25ef4034
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/hwmon/hwmon_modules.scc
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: MIT
+kconf hardware hwmon_modules.cfg
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.10-v2024.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.10-v2024.1.bb
index 71ac690e..4558101a 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.10-v2024.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.10-v2024.1.bb
@@ -9,11 +9,3 @@ 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/linux/linux-xlnx_6.6.40-v2024.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.40-v2024.2.bb
new file mode 100644
index 00000000..e862f747
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.40-v2024.2.bb
@@ -0,0 +1,11 @@
+LINUX_VERSION = "6.6.40"
+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 = "2b7f6f70a62a52a467bed030a27c2ada879106e9"
+SRCREV_meta = "5d0809d0d939c7738cb6e5391126c73fd0e4e865"
+KCONF_AUDIT_LEVEL="0"
+include linux-xlnx.inc
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-xilinx-core/recipes-kernel/perf/perf-perl.inc b/meta-xilinx-core/recipes-kernel/perf/perf-perl.inc
deleted file mode 100644
index 491f54c3..00000000
--- a/meta-xilinx-core/recipes-kernel/perf/perf-perl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 9164d93a..00000000
--- a/meta-xilinx-core/recipes-kernel/perf/perf.bb
+++ /dev/null
@@ -1,414 +0,0 @@
-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
deleted file mode 100755
index 0362f2d8..00000000
--- a/meta-xilinx-core/recipes-kernel/perf/perf/sort-pmuevents.py
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/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/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
deleted file mode 100644
index fac2d719..00000000
--- a/meta-xilinx-core/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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
deleted file mode 100644
index 3d177bce..00000000
--- a/meta-xilinx-core/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 42b108fe..00000000
--- a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0001-Add-support-for-3-planar-YUV444P-8bpc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 5dfbfa2e..00000000
--- a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 52eab13d..00000000
--- a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-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-utils/mb-realoc/files/mb-realoc b/meta-xilinx-core/recipes-utils/mb-realoc/files/mb-realoc
new file mode 100755
index 00000000..158560f1
--- /dev/null
+++ b/meta-xilinx-core/recipes-utils/mb-realoc/files/mb-realoc
@@ -0,0 +1,239 @@
+#!/bin/bash
+#
+#  FILE:
+#      mb-realoc
+#
+#  DESCRIPTION:
+#       Takes a fully linked and relocated ELF file, and turns it into an
+#       executable blob that can be run from any valid memory.  The ELF image
+#       (loadable segments only) is converted to a payload.  The blob copies
+#       the payload to the correct address in memory, and then launches it.
+#
+#  MODIFICATION:
+#
+#  LICENSING:
+#       Copyright (c) 2013 Xilinx Inc. All rights reserved.
+#
+# Default values for main variables
+BLOB_LOAD_ADDR=0x0
+INFILE=""
+BLOBNAME=""
+JUMP_OFFSET=
+# OTher useful vars
+TMP_BINFILE=$$.bin
+PAYLOAD_SECTION=.payload
+BLOBSTUB=/tmp/blobstub-$$
+function usage {
+        echo "Generate a PIC executable blob that copies the payload to its linked address and executes it."
+#       echo "Generate a PIC executable blob that copies the payload to its"
+#       echo "linked address and executes it.  The blob itself may be loaded"
+#       echo "to any physical address and executed, provided that"
+#       echo "  1) The payload's linked address is writeable"
+#       echo "  2) The blob's and payload's addresses don't overlap"
+#       echo "tGenerates blobname.[srec|elf|bin] files into the working directory"
+        echo ""
+        echo "Usage:"
+        echo "  mb-realoc [OPTIONS] -i PAYLOAD.elf -o BLOB_NAME"
+        echo ""
+        echo "Required:"
+        echo "  -i, --input PAYLOAD[.elf]  the fully relocated ELF file that will be the"
+        echo "                             payload."
+        echo "  -o, --output BLOB_NAME     basename of the resulting blob files."
+        echo ""
+        echo "Optional:"
+        echo "  -h, --help                 show function usage"
+        echo "  -j, --jump-offset OFFS     Offset from load address to jump (auto-detect)"
+        echo "  -l, --load LOAD_ADDR       address at which FS-boot will load the stub+payload"
+        echo ""
+}
+function parse_args {
+        args=$(getopt -o "j:hi:l:o:" --long "jump-offset:,help,input:,load:,output" -- "$@")
+        [ $? -ne 0 ] && usage && exit -1
+        eval set -- "${args}"
+        while true; do
+                case $1 in
+                        -h | --help) usage; exit 0; ;;
+                        -l | --load) BLOB_LOAD_ADDR=$2;
+                                shift; shift;
+                                ;;
+                        -i | --input) INFILE=$2;
+                                shift; shift;
+                                ;;
+                        -j | --jump-offset) JUMP_OFFSET=$2;
+                                shift; shift;
+                                ;;
+                        -o | --output) BLOBNAME=$2;
+                                shift; shift;
+                                ;;
+                        --) shift; break; ;;
+                        *) usage; exit -1;
+                                ;;
+                esac
+        done
+        [ ! -z "$@" ] && echo "ERROR: Extra parameters: $@" && usage && exit -1
+        if [ "${INFILE}" == "" -o "${BLOBNAME}" == "" ]; then
+                echo "Error: Required parameters not provided"
+                usage && exit -1
+        fi
+}
+function get_elf_addr_and_size {
+        # Get load address of payload ELF file
+        ELF_LMA=0x$(${CROSS_COMPILE}objdump --headers $INFILE | grep -w "\.data" | awk '{print $5}')
+        # Generate binary image of payload
+        ${CROSS_COMPILE}objcopy -R .note -R .comment -R .note.gnu.build-id  -O binary $INFILE $TMP_BINFILE
+        # Work out its size
+        ELF_SIZE=$(${CROSS_COMPILE}size --target binary ${TMP_BINFILE} | grep "${TMP_BINFILE}" | cut -f 4)
+}
+function get_elf_jump_offset {
+        entry_point=$(${CROSS_COMPILE}readelf -h ${INFILE} | awk '/Entry point/ {print $4}')
+        JUMP_OFFSET=$(printf "0x%08x" $((${entry_point} - ${ELF_LMA})))
+}
+function create_blobstub:microblaze {
+cat > ${BLOBSTUB}.s.in << __eof
+/*
+//      blobstub.s.in
+//              template for relocatable code blob mechanism
+//
+// LICENSING:
+//      Copyright (c) 2013 Xilinx Inc. All rights reserved.
+*/
+        .section .text
+        .org 0x0
+        .globl bootstub
+        .global _start
+        .func bootstub
+_start:
+bootstub:
+        brlid   r5, locator;    /* r5 gets address of bootstub */
+        nop;
+locator:
+        addi    r5, r5, 0x100;  /* Shift up to start of payload */
+        lwi     r6, r5, 0;      /* Destination of payload */
+        lwi     r7, r5, 4;      /* Length of payload */
+        lwi     r9, r5, 8;      /* boot offset */
+        addi    r5, r5, 0xc;    /* Start of payload */
+        add     r4, r6, r0;     /* Save payload destination (for jump) */
+        addi    r7, r7, 0x3;    /* Convert length to words */
+        srl     r7, r7;         /* Rounded up */
+        srl     r7, r7;
+        or      r10, r0, r0;    /* Setup r10 for incrementing address offset */
+copyloop:
+        beqi    r7, copy_done;  /* Finished copying? */
+        lw      r8, r5, r10;    /* Read word from payload */
+        sw      r8, r6, r10;    /* Write to destination */
+        addi    r10, r10, 4;    /* Increment ptr offset */
+        brid    copyloop;       /* Loop with delay slot */
+        addi    r7, r7, -1;     /* Decrement copy count */
+copy_done:
+        add     r4, r4, r9;     /* Apply any boot offset */
+        bra     r4;             /* Launch payload */
+        .align 2
+        .org 0x100
+payload:
+        .int    @destination@
+        .int    @bytecount@
+        .int    @jump_offset@
+        .end bootstub
+__eof
+}
+function build_blobstub {
+        # Substitute address and size of payload into blobstub
+        # source file
+        sed -e "s/@destination@/${ELF_LMA}/" \
+            -e "s/@bytecount@/${ELF_SIZE}/" \
+            -e "s/@jump_offset@/${JUMP_OFFSET}/" ${BLOBSTUB}.s.in > ${BLOBSTUB}.s
+        # Build the blobstub
+        ${CROSS_COMPILE}as -o ${BLOBSTUB}.o ${BLOBSTUB}.s
+        # Remove blobstub assembly file and template
+        rm ${BLOBSTUB}.s.in
+        rm ${BLOBSTUB}.s
+}
+function insert_payload {
+        # Add the payload in a new section
+        ${CROSS_COMPILE}objcopy --add-section=${PAYLOAD_SECTION}=${TMP_BINFILE}\
+                 --adjust-section-vma=${PAYLOAD_SECTION}=0x10C \
+                --set-section-flags=${PAYLOAD_SECTION}=alloc,load,data \
+                ${BLOBSTUB}.o ${BLOBNAME}.elf
+        # Remove temporary binary image and blobstub object file
+        rm ${TMP_BINFILE}
+        rm ${BLOBSTUB}.o
+}
+function relocate_blob {
+        # Relocate the entire package to the desired FS-boot load address
+        ${CROSS_COMPILE}objcopy --change-addresses=${BLOB_LOAD_ADDR} ${BLOBNAME}.elf
+}
+function generate_output_files {
+        ${CROSS_COMPILE}objcopy -O srec ${BLOBNAME}.elf ${BLOBNAME}.srec
+        ${CROSS_COMPILE}objcopy -O binary ${BLOBNAME}.elf ${BLOBNAME}.bin
+}
+function xlnx_readelf {
+        ${CROSS_COMPILE}readelf $@
+}
+parse_args "$@"
+if [ ! -f $INFILE ]; then
+        echo "Error: ${INFILE} does not exist"
+        exit -1;
+fi
+get_elf_addr_and_size
+[ -z "${JUMP_OFFSET}" ] && get_elf_jump_offset
+echo "INFO: Payload load address:$ELF_LMA"
+echo "INFO: Payload size:$ELF_SIZE"
+echo "INFO: Jump offset:$JUMP_OFFSET"
+PETALINUX_ARCH=$(xlnx_readelf -e ${INFILE} | grep "Machine:" | awk '{print $2}')
+echo "ELF ARCH is ${PETALINUX_ARCH}"
+if [ "${PETALINUX_ARCH}" == "Xilinx" ]; then
+        create_blobstub:microblaze
+        build_blobstub
+        insert_payload
+        relocate_blob
+else
+        echo "Architecture is not Microblaze"
+        rm ${TMP_BINFILE}
+        ${CROSS_COMPILE}objcopy $INFILE  ${BLOBNAME}.elf
+fi
+generate_output_files
diff --git a/meta-xilinx-core/recipes-utils/mb-realoc/mb-realoc.bb b/meta-xilinx-core/recipes-utils/mb-realoc/mb-realoc.bb
new file mode 100644
index 00000000..f3b53c25
--- /dev/null
+++ b/meta-xilinx-core/recipes-utils/mb-realoc/mb-realoc.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "mb-realoc"
+LICENSE = "CLOSED"
+PROVIDES = "virtual/elfrealloc"
+inherit deploy
+SRC_URI:append = " file://mb-realoc"
+PV = "0.1"
+ELF_LOAD_ADDR ?= "0"
+ELF_JUMP_OFFSET ?= ""
+ELF_INFILE ?= "${DEPLOY_DIR_IMAGE}/u-boot.elf"
+OUTFILE_NAME ?= "u-boot-s"
+B = "${WORKDIR}"
+PARALLEL_MAKE=""
+do_configure[noexec]="1"
+do_compile[depends] = "virtual/bootloader:do_deploy"
+do_compile() {
+        export CROSS_COMPILE="${TARGET_PREFIX}"
+        ${WORKDIR}/mb-realoc -l ${ELF_LOAD_ADDR} -i ${ELF_INFILE} -o ${OUTFILE_NAME}
+}
+do_install[noexec] = "1"
+do_deploy() {
+        install -d ${DEPLOYDIR}
+        install -m 0644 ${WORKDIR}/${OUTFILE_NAME}.bin ${DEPLOYDIR}/${OUTFILE_NAME}.bin
+}
+addtask deploy after do_compile
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb
new file mode 100644
index 00000000..6e280009
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb
@@ -0,0 +1,29 @@
+SUMMARY  = "Xilinx Runtime(XRT) - minimal native build for xclbinutil"
+DESCRIPTION = "Native build of xclbinutil using XRT codebase"
+require xrt-${PV}.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 opencl-headers-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-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc
new file mode 100644
index 00000000..27522dd8
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc
@@ -0,0 +1,6 @@
+REPO ?= "gitsm://github.com/Xilinx/XRT.git;protocol=https"
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG};name=xrt"
+BRANCH = "2024.2"
+SRCREV_xrt = "d05b18dc38cc6804ecb4b3dbe6de23f158319567"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
index cad8ccee..0ee4d137 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \
 COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 S = "${WORKDIR}/git/src"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
index 5824ae9c..946b6551 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
@@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
 COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 S = "${WORKDIR}/git/src"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb
index 7f211e6f..ff058db3 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb
@@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
 COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 S = "${WORKDIR}/git/src"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb
new file mode 100644
index 00000000..d538f947
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb
@@ -0,0 +1,60 @@
+SUMMARY  = "Xilinx Runtime(XRT) libraries"
+DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
+require xrt-${PV}.inc
+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 "
+COMPATIBLE_HOST = "^$"
+COMPATIBLE_HOST:aarch64 = ".*"
+S = "${WORKDIR}/git/src"
+inherit cmake pkgconfig
+BBCLASSEXTEND = "native nativesdk"
+PACKAGECONFIG ??= "aie"
+PACKAGECONFIG[aie] = ",,libxaiengine aiefal,libxaiengine aiefal"
+# 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 systemtap libdfx"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
+EXTRA_OECMAKE += " \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_EXPORT_COMPILE_COMANDS=ON \
+                -DXRT_LIBDFX=true \
+                "
+EXTRA_OECMAKE .= "${@bb.utils.contains('PACKAGECONFIG', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}"
+TARGET_CXXFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}"
+# Systems with AIE also require libmetal, this is implemented in the dynamic-layers
+# See: meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt_gt.bbappend
+# Note: If meta-openamp is not available, AIE will not be enabled.
+FILES_SOLIBSDEV = ""
+FILES:${PN} += "\
+    ${libdir}/lib*.so \
+    ${libdir}/lib*.so.* \
+    ${libdir}/ps_kernels_lib \
+    /lib/*.so* \
+    ${datadir}"
+INSANE_SKIP:${PN} += "dev-so"
+pkg_postinst_ontarget:${PN}() {
+  #!/bin/sh
+  if [ ! -e /etc/OpenCL/vendors/xilinx.icd ]; then
+        echo "INFO: Creating ICD entry for Xilinx Platform"
+        mkdir -p /etc/OpenCL/vendors
+        echo "libxilinxopencl.so" > /etc/OpenCL/vendors/xilinx.icd
+        chmod -R 755 /etc/OpenCL
+  fi
+}
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb
new file mode 100644
index 00000000..e5efd89c
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb
@@ -0,0 +1,28 @@
+SUMMARY  = "Xilinx Runtime(XRT) driver module"
+DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
+COMPATIBLE_MACHINE:microblaze = "none"
+PROVIDES += "zocl"
+require recipes-xrt/xrt/xrt-${PV}.inc
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
+LICENSE = "GPL-2.0-or-later & Apache-2.0"
+COMPATIBLE_MACHINE ?= "^$"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
+S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+inherit module
+pkg_postinst_ontarget:${PN}() {
+  #!/bin/sh
+  echo "Unloading old XRT Linux kernel modules"
+  ( rmmod zocl || true ) > /dev/null 2>&1
+  echo "Loading new XRT Linux kernel modules"
+  modprobe zocl
+}