397 files changed, 11249 insertions, 7246 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/xilinx-microblaze.bbclass b/meta-xilinx-core/classes-global/xilinx-microblaze.bbclass
index ed231a3a..ed231a3a 100644
--- a/meta-xilinx-core/classes/xilinx-microblaze.bbclass
+++ b/meta-xilinx-core/classes-global/xilinx-microblaze.bbclass
diff --git a/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass b/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
new file mode 100644
index 00000000..5020b02b
--- /dev/null
+++ b/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
@@ -0,0 +1,140 @@
+#
+# Copyright (C) 2023, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+
+QSPI_SIZE ?= "0x2280000"
+QSPI_VERSION ?= ""
+QSPI_IMAGE_VERSION ?= ""
+
+# Register values
+IDN_REG ?= "0x4D554241"
+VERSION_REG ?= "0x1"
+LENGTH_REG ?= "0x4"
+PERSISTENT_REG ?= "0x01010000"
+
+# QSPI Offsets
+IMAGE_SELECTOR_OFFSET ?= "0x0"
+IMAGE_SELECTOR_BACKUP_OFFSET ?= "0x80000"
+PERSISTENT_REG_OFFSET ?= "0x100000"
+PERSISTENT_REG_BACKUP_OFFSET ?= "0x120000"
+IMAGE_A_OFFSET ?= "0x200000"
+IMAGE_A_IMGSEL_OFFSET ?= "0xF00000"
+IMAGE_B_OFFSET ?= "0xF80000"
+IMAGE_B_IMGSEL_OFFSET ?= "0x1C80000"
+IMAGE_RCVRY_OFFSET ?= "0x1E00000"
+IMAGE_RCVRY_BACKUP_OFFSET ?= "0x2000000"
+VERSION_OFFSET ?= "0x2240000"
+CHECKSUM_OFFSET ?= "0x2250000"
+
+def generate_spi_image(d):
+
+    import io
+    import hashlib
+    import time
+
+    qspi_size = int(d.getVar("QSPI_SIZE") or '0', 0)
+    int(d.getVar("QSPI_SIZE") or '0', 0)
+
+    # Register values
+    idn_reg = int(d.getVar("IDN_REG") or '0', 0)
+    version_reg = int(d.getVar("VERSION_REG") or '0', 0)
+    length_reg = int(d.getVar("LENGTH_REG") or '0', 0)
+    persistent_reg = int(d.getVar("PERSISTENT_REG") or '0', 0)
+
+    # QSPI Offsets
+    image_selector_offset = int(d.getVar("IMAGE_SELECTOR_OFFSET") or '0', 0)
+    image_selector_backup_offset = int(d.getVar("IMAGE_SELECTOR_BACKUP_OFFSET") or '0', 0)
+    persistent_reg_offset = int(d.getVar("PERSISTENT_REG_OFFSET") or '0', 0)
+    persistent_reg_backup_offset = int(d.getVar("PERSISTENT_REG_BACKUP_OFFSET") or '0', 0)
+    image_a_offset = int(d.getVar("IMAGE_A_OFFSET") or '0', 0)
+    image_a_imgsel_offset = int(d.getVar("IMAGE_A_IMGSEL_OFFSET") or '0', 0)
+    image_b_offset = int(d.getVar("IMAGE_B_OFFSET") or '0', 0)
+    image_b_imgsel_offset = int(d.getVar("IMAGE_B_IMGSEL_OFFSET") or '0', 0)
+    image_rcvry_offset = int(d.getVar("IMAGE_RCVRY_OFFSET") or '0', 0)
+    image_rcvry_backup_offset = int(d.getVar("IMAGE_RCVRY_BACKUP_OFFSET") or '0', 0)
+    version_offset = int(d.getVar("VERSION_OFFSET") or '0', 0)
+    checksum_offset = int(d.getVar("CHECKSUM_OFFSET") or '0', 0)
+
+    # QSPI data
+    qspi_data = io.BytesIO()
+    qspi_data.write(b'\xFF' * qspi_size)
+
+    # Image Selector - Primary, Backup, Image A and Image B
+    imgsel_file = d.getVar("DEPLOY_DIR_IMAGE")+"/image-selector-"+d.getVar("MACHINE")+".bin"
+    try:
+        with open(imgsel_file, "rb") as il:
+            imgsel = il.read(-1)
+    except OSError as err:
+        bb.fatal("Unable to open imgsel file: " + str(err))
+
+    qspi_data.seek(image_selector_offset)
+    qspi_data.write(imgsel)
+    qspi_data.seek(image_selector_backup_offset)
+    qspi_data.write(imgsel)
+    qspi_data.seek(image_a_imgsel_offset)
+    qspi_data.write(imgsel)
+    qspi_data.seek(image_b_imgsel_offset)
+    qspi_data.write(imgsel)
+
+    # Persistent Registers - Primary and Backup
+    p_reg = [idn_reg, version_reg, length_reg, persistent_reg, \
+            image_a_offset, image_b_offset, image_rcvry_offset]
+    checksum = 0xffffffff - (0xffffffff & sum(p_reg))
+    p_reg.insert(3, checksum)
+
+    qspi_data.seek(persistent_reg_offset)
+    for value in p_reg:
+        qspi_data.write(value.to_bytes(4, byteorder="little"))
+
+    qspi_data.seek(persistent_reg_backup_offset)
+    for value in p_reg:
+        qspi_data.write(value.to_bytes(4, byteorder="little"))
+
+    # Image A and B - boot.bin
+    try:
+        with open(d.getVar("DEPLOY_DIR_IMAGE")+"/boot.bin", "rb") as bo:
+            bootbin = bo.read(-1)
+    except OSError as err:
+        bb.fatal("Unable to open boot.bin file: " + str(err))
+
+    qspi_data.seek(image_a_offset)
+    qspi_data.write(bootbin)
+    qspi_data.seek(image_b_offset)
+    qspi_data.write(bootbin)
+
+    # Recovery Image & Recovery Image Backup
+    imgrcry_file = d.getVar("DEPLOY_DIR_IMAGE")+"/image-recovery-"+d.getVar("MACHINE")+".bin"
+    try:
+        with open(imgrcry_file, "rb") as iy:
+            imgrcry = iy.read(-1)
+    except OSError as err:
+        bb.fatal("Unable to open imgrcry file: " + str(err))
+
+    qspi_data.seek(image_rcvry_offset)
+    qspi_data.write(imgrcry)
+    qspi_data.seek(image_rcvry_backup_offset)
+    qspi_data.write(imgrcry)
+
+    # Version string and checksum
+    version = d.getVar('QSPI_IMAGE_VERSION')
+    qspi_version = f"{version}\x00"
+    qspi_data.seek(version_offset)
+    qspi_data.write(qspi_version.encode())
+
+    qspi_sha = hashlib.sha256(qspi_data.getbuffer())
+    qspi_data.seek(checksum_offset)
+    qspi_data.write(qspi_sha.digest())
+
+    # Write the QSPI data to file
+    with open(d.getVar("B") + "/" + d.getVar("IMAGE_NAME") + ".bin", "wb") as sq:
+        sq.write(qspi_data.getbuffer())
+
+do_compile[depends] += "virtual/boot-bin:do_deploy virtual/imgsel:do_deploy virtual/imgrcry:do_deploy"
+
+python amd_spi_image_do_compile() {
+    generate_spi_image(d)
+}
+
+EXPORT_FUNCTIONS do_compile
diff --git a/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
new file mode 100644
index 00000000..a09c0768
--- /dev/null
+++ b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
@@ -0,0 +1,338 @@
+#
+# Copyright (C) 2023-2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This bbclass is inherited by flat, DFx Static and DFx RP firmware recipes.
+# dfx_user_dts.bbclass expects user to generate pl dtsi for flat, DFx Static
+# and DFx RP xsa outside of yocto.
+
+inherit devicetree
+
+DEPENDS = "dtc-native bootgen-native"
+
+# recipes that inherit from this class need to use an appropriate machine
+# override for COMPATIBLE_MACHINE to build successfully; don't allow building
+# for microblaze MACHINE
+COMPATIBLE_MACHINE ?= "^$"
+COMPATIBLE_MACHINE:microblaze = "^$"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PROVIDES = ""
+
+do_fetch[cleandirs] = "${B}"
+
+DT_PADDING_SIZE = "0x1000"
+BOOTGEN_FLAGS ?= " -arch ${SOC_FAMILY} -w ${@bb.utils.contains('SOC_FAMILY','zynqmp','','-process_bitstream bin',d)}"
+
+S ?= "${UNPACKDIR}"
+FW_DIR ?= ""
+DTSI_PATH ?= ""
+DTBO_PATH ?= ""
+BIT_PATH ?= ""
+BIN_PATH ?= ""
+PDI_PATH ?= ""
+JSON_PATH ?= ""
+XCl_PATH ?= ""
+DT_FILES_PATH = "${S}/${DTSI_PATH}"
+FIRMWARE_NAME_DT_FILE ?= ""
+USER_DTS_FILE ?= ""
+
+FIRMWARE_NAME_DT_FILE[doc] = "DT file which has firmware-name device-tree property"
+USER_DTS_FILE[doc] = "Final DTSI or DTS file which is used for packaging final DT overlay"
+DTSI_PATH[doc] = "Absolute '.dtsi' or ''.dts' file path as input to SRC_URI"
+DTBO_PATH[doc] = "Absolute '.dtbo' file path as input to SRC_URI"
+BIT_PATH[doc] = "Absolute '.bit' file path as input to SRC_URI"
+BIN_PATH[doc] = "Absolute '.bin' file path as input to SRC_URI"
+JSON_PATH[doc] = "Absolute '.json' file path as input to SRC_URI"
+XCL_PATH[doc] = "Absolute '.xclbin' file path as input to SRC_URI"
+
+python() {
+    import re
+    soc_family = d.getVar("SOC_FAMILY")
+    if "git://" in d.getVar("SRC_URI") or "https://" in d.getVar("SRC_URI"):
+        d.setVar("S",'${UNPACKDIR}/git/'+d.getVar("FW_DIR"))
+    else:
+        dtsi_found = False
+        dtbo_found = False
+        bit_found = False
+        bin_found = False
+        pdi_found = False
+
+        # Required Inputs
+        for s in d.getVar("SRC_URI").split():
+            if s.endswith(('.dtsi', '.dts')):
+                dtsi_found = True
+                d.setVar("DTSI_PATH",os.path.dirname(s.lstrip('file://')))
+            if s.endswith('.dtbo'):
+                if dtbo_found:
+                    bb.warn("More then one '.dtbo' file specified in SRC_URI.")
+                dtbo_found = True
+                d.setVar("DTBO_PATH",os.path.dirname(s.lstrip('file://')))
+            if soc_family == "zynq" or soc_family == "zynqmp":
+                if s.endswith('.bit'):
+                    if bit_found:
+                        bb.warn("More then one '.bit' file specified in SRC_URI.")
+                    bit_found = True
+                    d.setVar("BIT_PATH",os.path.dirname(s.lstrip('file://')))
+                if s.endswith('.bin'):
+                    if bin_found:
+                        bb.warn("More then one '.bin' file specified in SRC_URI.")
+                    bin_found = True
+                    d.setVar("BIN_PATH",os.path.dirname(s.lstrip('file://')))
+            else:
+                if s.endswith('.pdi'):
+                    if pdi_found:
+                        bb.warn("More then one '.pdi' file specified in SRC_URI.")
+                    pdi_found = True
+                    d.setVar("PDI_PATH",os.path.dirname(s.lstrip('file://')))
+
+            # Optional input
+            if s.endswith('.json'):
+                d.setVar("JSON_PATH",os.path.dirname(s.lstrip('file://')))
+
+            if s.endswith('.xclbin'):
+                d.setVar("XCL_PATH",os.path.dirname(s.lstrip('file://')))
+
+        # Check for valid combination of input files in SRC_URI
+        # Skip recipe if any of the below conditions are not satisfied.
+        # 1. At least one bit or bin or pdi should exists.
+        # 2. More than one dtbo.
+        # 3. More than one bit or bin or pdi.
+        # 4. More than one dts and zero dtsi.
+        # 5. More than one dtsi and zero dts
+        # 6. Both bit and bin exists.
+        # 7. Both bit or bin and pdi exits.
+        # 8. Both dts or dtsi and dtbo exists.
+        if bit_found or bin_found or pdi_found:
+            bb.debug(2, "dtsi or dtbo or bitstream or pdi found in SRC_URI")
+            if bit_found and pdi_found :
+                raise bb.parse.SkipRecipe("Both '.bit' and '.pdi' file found in SRC_URI, this is invalid use case.")
+
+            if bin_found and pdi_found :
+                raise bb.parse.SkipRecipe("Both '.bin' and '.pdi' file found in SRC_URI, this is invalid use case.")
+
+            if bit_found and bin_found:
+                raise bb.parse.SkipRecipe("Both '.bit' and '.bin' file found in SRC_URI, either .bit or .bin file is supported but not both.")
+
+            if dtsi_found and dtbo_found:
+                raise bb.parse.SkipRecipe("Both '.dts or dtsi' and '.dtbo' file found in SRC_URI, either .dts/dtsi or .dtbo file is supported but not both.")
+        else:
+            raise bb.parse.SkipRecipe("Need one '.bit' or '.bin' or '.pdi' file added to SRC_URI.")
+
+        # Check for valid combination of dtsi and dts files in SRC_URI
+        # Following file combinations are not supported use case.
+        # 1. More than one '.dtsi' and zero '.dts' file.
+        # 2. More than one '.dts' and zero or more than one '.dtsi'file .
+        pattern_dts = re.compile(r'[.]+dts\b')
+        pattern_dtsi = re.compile(r'[.]+dtsi\b')
+        dts_count = len([*re.finditer(pattern_dts, d.getVar('SRC_URI'))])
+        dtsi_count = len([*re.finditer(pattern_dtsi, d.getVar("SRC_URI"))])
+
+        if dtsi_count > 1 and dts_count == 0:
+            raise bb.parse.SkipRecipe("Recipe has more than one '.dtsi' and zero '.dts' found, this is an unsupported use case")
+        elif dts_count > 1:
+            raise bb.parse.SkipRecipe("Recipe has more than one '.dts' and zero or more than one '.dtsi' found, this is an unsupported use case")
+}
+
+# Function to search for dt firmware-name property in dts or dtsi file.
+python find_firmware_file() {
+    import glob
+    pattern_fw = 'firmware-name'
+    search_count = 0
+    for dt_files in glob.iglob((d.getVar('S') + '/' + (d.getVar('DTSI_PATH')) + '/*.dts*'),recursive=True):
+        with open(dt_files, "r") as f:
+            current_fd = f.read()
+            if pattern_fw in current_fd:
+                search_count += 1
+                if search_count > 1:
+                    bb.error("firmware-name dt property found in more than one dt files! Please fix the dts or dtsi file.")
+                    break
+                else:
+                    d.setVar('FIRMWARE_NAME_DT_FILE', os.path.basename(dt_files))
+}
+
+do_configure[prefuncs] += "find_firmware_file"
+
+python do_configure() {
+    import glob, re, shutil
+    soc_family = d.getVar("SOC_FAMILY")
+
+    if bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', False, True, d):
+        bb.warn("Using dfx_user_dts.bbclass requires fpga-overlay MACHINE_FEATURE to be enabled")
+
+    # Renaming firmware-name using $PN as bitstream/PDI will be renamed using
+    # $PN when generating the bin/pdi file.
+    if os.path.isfile(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
+        orig_dtsi = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE'))[0]
+        new_dtsi = d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/pl.dtsi_firmwarename'
+        with open(new_dtsi, 'w') as newdtsi:
+            with open(orig_dtsi) as olddtsi:
+                for line in olddtsi:
+                    if soc_family == 'zynq' or soc_family == 'zynqmp':
+                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.bin\"',line))
+                    else:
+                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.pdi\"',line))
+        shutil.move(new_dtsi,orig_dtsi)
+}
+
+do_compile[prefuncs] += "find_firmware_file"
+
+python devicetree_do_compile:append() {
+    import glob, subprocess, shutil
+    soc_family = d.getVar("SOC_FAMILY")
+
+    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
+    bin_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + (d.getVar('BIN_PATH') or '') + '/*.bin'),recursive=True) if os.path.isfile(f))
+    bit_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + (d.getVar('BIT_PATH') or '') + '/*.bit'),recursive=True) if os.path.isfile(f))
+    # Skip devicetree do_compile task if input file is dtbo or bin in SRC_URI
+    if not dtbo_count and not bin_count and bit_count:
+        # Convert .bit to .bin format only if dtsi is input.
+        # In case of dtbo as input, bbclass doesn't know if firmware-name is .bit
+        # or .bin format and corresponding file name. Hence we are not doing .bin
+        # conversion.
+        if soc_family == 'zynq' or soc_family == 'zynqmp' and glob.glob(d.getVar('S') + '/' +(d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
+            pn = d.getVar('PN')
+            biffile = pn + '.bif'
+            with open(biffile, 'w') as f:
+                f.write('all:\n{\n\t' + glob.glob(d.getVar('S') + '/' + (d.getVar('BIT_PATH') or '') + '/*.bit')[0] + '\n}')
+
+            bootgenargs = ["bootgen"] + (d.getVar("BOOTGEN_FLAGS") or "").split()
+            bootgenargs += ["-image", biffile, "-o", pn + ".bin"]
+            subprocess.run(bootgenargs, check = True)
+
+            # In Zynq7k using both "-process_bitstream bin" and "-o" in bootgen flag,
+            # to convert bit file to bin format, "-o" option will not be effective
+            # and generated output file name is ${S}+${BIT_PATH}/<bit_file_name>.bin
+            # file, Hence we need to rename this file from <bit_file_name>.bin to
+            # ${PN}.bin which matches the firmware name in dtbo and move
+            # ${PN}.bin to ${B} directory.
+            if soc_family == 'zynq':
+                src_bitbin_file = glob.glob(d.getVar('S') + '/' + (d.getVar('BIT_PATH') or '') + '/*.bin')[0]
+                dst_bitbin_file = d.getVar('B') + '/' + pn + '.bin'
+                shutil.move(src_bitbin_file, dst_bitbin_file)
+
+            if not os.path.isfile(pn + ".bin"):
+                bb.fatal("Couldn't find %s file, Enable '-log trace' in BOOTGEN_FLAGS" \
+                    "and check bootgen_log.txt" % (d.getVar('B') + '/' + pn + '.bin'))
+}
+
+# If user inputs both dtsi and dts files then device-tree will generate dtbo
+# files for each dt file, Hence to package the firmware pick the right user dt
+# overlay file.
+python find_user_dts_overlay_file() {
+    import glob
+    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTBO_PATH') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
+    dts_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTSI_PATH') + '/*.dts'),recursive=True) if os.path.isfile(f))
+    dtsi_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTSI_PATH') + '/*.dtsi'),recursive=True) if os.path.isfile(f))
+    # Set USER_DTS_FILE if input file is dts/dtsi in SRC_URI else skip operation.
+    if not dtbo_count and dts_count or dtsi_count:
+        if dtsi_count == 1 and dts_count == 0:
+            dts_file = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/*.dtsi')[0]
+        elif dtsi_count >=0 and dts_count == 1:
+            dts_file = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/*.dts')[0]
+        else:
+            dts_file = ''
+
+        d.setVar('USER_DTS_FILE', os.path.splitext(os.path.basename(dts_file))[0])
+    elif dtbo_count:
+        bb.debug(2, "Firmware recipe input file is dtbo in SRC_URI")
+    else:
+        bb.debug(2, "Firmware recipe input file is bit/bin/pdi in SRC_URI")
+}
+
+do_install[prefuncs] += "find_user_dts_overlay_file"
+
+do_install() {
+    install -d ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+
+    # Install dtbo
+    # In case of dtbo as input, dtbo will be copied from directly from ${S}
+    # In case of dtsi as input, dtbo will be copied from directly from ${B}
+    # If more than one dtbo file is found then fatal the task.
+    # If no dtbo file is found add warning message as in some use case if IP
+    # doesn't have any driver then user can load pdi/bit/bin file.
+    if [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
+        install -Dm 0644 ${S}/*.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+    elif [ `ls ${S}/${DTBO_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
+        bbnote "A dtbo ending '.dtbo' expected but not found in ${S} or ${B}, This means firmware can be loaded without dtbo dependency."
+    fi
+
+    # Install bit or bin if soc family is zynq-7000 or zynqmp.
+    # In case of dtbo as input or no dtbo exists in ${B}, then .bit or .bin will
+    # be copied from directly from ${S} without renaming the .bit/.bin name to
+    # ${PN}.bit/${PN}.bin.
+    # if more than one .bit/.bin file is found then fatal the task.
+    # if no .bit/.bin file is found then fatal the task.
+    if [ "${SOC_FAMILY}" = "zynq" ] || [ "${SOC_FAMILY}" = "zynqmp" ]; then
+        if [ `ls ${S}/*.bit | wc -l` -gt 1 ]; then
+            bbfatal "Multiple .bit found, use the right .bit in SRC_URI from the following:\n$(basename -a ${S}/*.bit)"
+        elif [ `ls ${S}/${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
+            bbfatal "A bitstream file with '.bit' or '.bin' expected but not found"
+        fi
+    fi
+
+    # Install pdi if soc family is versal or new silicon.
+    # In case of dtbo as input or no dtbo exists in ${B}, then .pdi will be copied
+    # from directly from ${S} without renaming the pdi name to ${PN}.pdi
+    # if more than one .pdi file is found then fail the task.
+    # In case of Versal DFx Static, only static dtbo can be loaded as BOOT.bin
+    # already contains static pdi. bbclass is not smart enough to determine
+    # whether it is static pdi or not, hence change fatal to warn if no PDI is found.
+    if [ "${SOC_FAMILY}" != "zynq" ] && [ "${SOC_FAMILY}" != "zynqmp" ]; then
+        if [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ ! -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+        elif [ `ls ${S}/${PDI_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
+    fi
+
+    # Install xclbin
+    if ls ${S}/${XCL_PATH}/*.xclbin >/dev/null 2>&1; then
+        install -Dm 0644 ${S}/${XCL_PATH}/*.xclbin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.xclbin
+    fi
+
+    # Install shell.json or accel.json
+    if [ -f ${S}/${JSON_PATH}/shell.json ] || [ -f ${S}/${JSON_PATH}/accel.json ]; then
+        install -Dm 0644 ${S}/${JSON_PATH}/*.json ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+    fi
+}
+
+do_deploy[noexec] = "1"
+
+FILES:${PN} += "${nonarch_base_libdir}/firmware/xilinx/${PN}"
diff --git a/meta-xilinx-core/classes-recipe/fw-package.bbclass b/meta-xilinx-core/classes-recipe/fw-package.bbclass
new file mode 100644
index 00000000..e9847d33
--- /dev/null
+++ b/meta-xilinx-core/classes-recipe/fw-package.bbclass
@@ -0,0 +1,94 @@
+#
+# Copyright (C) 2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This bbclass provides infrastructure to package and deploy firmware baremetal
+# or freertos application elf or bin files to linux root filesystem under
+# /lib/firmware directory.
+
+inherit deploy
+
+INHERIT_DEFAULT_DEPENDS = "1"
+
+# Since we're just copying, we can run any config.
+COMPATIBLE_HOST = ".*"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# Default expects the user to provide the fw app in the deploy directory.
+# A machine, multiconfig, or local.conf should override this.
+FW_NAME ??= ""
+TARGET_MC ??= ""
+FW_DEPENDS ??= ""
+FW_MCDEPENDS ??= ""
+FW_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+FW_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+FW_IMAGE_NAME ??= "${FW_NAME}-${MACHINE}-${TARGET_MC}"
+
+# Default is for the multilib case (without the extension .elf/.bin)
+FW_FILE ??= "${FW_DEPLOY_DIR}/${FW_IMAGE_NAME}"
+FW_FILE[vardepsexclude] = "FW_DEPLOY_DIR"
+
+do_fetch[depends] += "${FW_DEPENDS}"
+do_fetch[mcdepends] += "${FW_MCDEPENDS}"
+
+# Set default destination directory is /lib/firmware, user can change this value
+# to /boot directory depending on requirement.
+DESTDIR ??= "${nonarch_base_libdir}/firmware/xilinx"
+SYSROOT_DIRS += "/boot"
+
+INSANE_SKIP:${PN} = "arch"
+INSANE_SKIP:${PN}-dbg = "arch"
+
+# Disable buildpaths QA check warnings.
+INSANE_SKIP:${PN} += "buildpaths"
+
+do_install() {
+    if [ ! -e ${FW_FILE}.elf ]; then
+        echo "Unable to find FW_FILE (${FW_FILE}.elf)"
+        exit 1
+    fi
+
+    install -Dm 0644 ${FW_FILE}.elf ${D}${DESTDIR}/${FW_IMAGE_NAME}.elf
+}
+
+# If the item is already in OUR deploy_image_dir, nothing to deploy!
+SHOULD_DEPLOY = "${@'false' if (d.getVar('FW_FILE')).startswith(d.getVar('DEPLOY_DIR_IMAGE')) else 'true'}"
+do_deploy() {
+    # If the item is already in OUR deploy_image_dir, nothing to deploy!
+    if ${SHOULD_DEPLOY}; then
+        install -Dm 0644 ${FW_FILE}.elf ${DEPLOYDIR}/${FW_IMAGE_NAME}.elf
+        install -Dm 0644 ${FW_FILE}.bin ${DEPLOYDIR}/${FW_IMAGE_NAME}.bin
+    fi
+}
+
+FILES:${PN} += "${DESTDIR}/${FW_IMAGE_NAME}*"
+
+def check_fw_vars(d):
+    # If both are blank, the user MUST pass in the path to the firmware!
+    if not d.getVar('FW_DEPENDS') and not d.getVar('FW_MCDEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+
+        msg = ""
+        fail = False
+        if not os.path.exists(d.getVar('FW_FILE') + ".elf"):
+            msg = msg + "The expected file %s.elf is not available.  " % d.getVar('FW_FILE')
+            fail = True
+        if not os.path.exists(d.getVar('FW_FILE') + ".bin"):
+            msg = msg + "The expected file %s.bin is not available.  " % d.getVar('FW_FILE')
+            fail = True
+        if fail:
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("%s\nSee the meta-xilinx-core README." % msg)
+        else:
+            # We found the file, so be sure to track it
+            d.setVar('SRC_URI', 'file://${FW_FILE}.elf file://${FW_FILE}.bin')
+            d.setVarFlag('do_install', 'file-checksums', '${FW_FILE}.elf:True ${FW_FILE}.bin:True')
+            d.setVarFlag('do_deploy', 'file-checksums', '${FW_FILE}.elf:True ${FW_FILE}.bin:True')
+
+python() {
+    # Need to allow bbappends to change the check
+    check_fw_vars(d)
+}
diff --git a/meta-xilinx-core/classes/image-wic-utils.bbclass b/meta-xilinx-core/classes-recipe/image-wic-utils.bbclass
index 41ad8148..41ad8148 100644
--- a/meta-xilinx-core/classes/image-wic-utils.bbclass
+++ b/meta-xilinx-core/classes-recipe/image-wic-utils.bbclass
diff --git a/meta-xilinx-core/classes/kernel-simpleimage.bbclass b/meta-xilinx-core/classes-recipe/kernel-simpleimage.bbclass
index 110ee254..110ee254 100644
--- a/meta-xilinx-core/classes/kernel-simpleimage.bbclass
+++ b/meta-xilinx-core/classes-recipe/kernel-simpleimage.bbclass
diff --git a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
index 7466ab5e..df7016d4 100644
--- a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
+++ b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
@@ -23,6 +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):
@@ -46,11 +66,12 @@ def qemu_add_extra_args(data):
     deploy_dir = data.getVar('DEPLOY_DIR_IMAGE') or ""
     machine_name = data.getVar('MACHINE') or ""
     soc_family = data.getVar('SOC_FAMILY') or ""
+    boot_mode = data.getVar('QB_BOOT_MODE') or ""
     qb_extra_args = ''
     # Add kernel image and boot.scr to qemu boot command when initramfs_image supplied
     kernel_name = ''
     bootscr_image = '%s/boot.scr' % deploy_dir
-    if soc_family in ('zynqmp', 'versal'):
+    if soc_family in ('zynqmp', 'versal', 'versal-net'):
         kernel_name = 'Image'
         bootscr_loadaddr = '0x20000000'
     if initramfs_image:
@@ -61,11 +82,11 @@ def qemu_add_extra_args(data):
         if kernel_name:
             qb_extra_args = ' -device loader,file=%s,addr=%s,force-raw=on' % (kernel_image, kernel_loadaddr)
             qb_extra_args += ' -device loader,file=%s,addr=%s,force-raw=on' % (bootscr_image, bootscr_loadaddr)
-        if soc_family == 'versal':
-            qb_extra_args += ' -boot mode=5'
+        if soc_family in ('versal', 'versal-net'):
+            qb_extra_args += ' %s' % boot_mode
     else:
-        if soc_family in ('zynqmp', 'versal'):
-            qb_extra_args = ' -boot mode=5'
+        if soc_family in ('zynqmp', 'versal', 'versal-net'):
+            qb_extra_args = ' %s' % boot_mode
     return qb_extra_args
 
 def qemu_rootfs_params(data, param):
@@ -73,9 +94,9 @@ 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'
-    soc_variant = data.getVar('SOC_VARIANT') or ""
 
     if param == 'rootfs':
         return 'none' if bundle_image == "1" else ''
@@ -85,7 +106,8 @@ def qemu_rootfs_params(data, param):
             "microblaze": "cpio.gz",
             "zynq": "cpio.gz",
             "zynqmp": "cpio.gz.u-boot",
-            "versal": "cpio.gz.u-boot.qemu-sd-fatimg"
+            "versal": "cpio.gz.u-boot.qemu-sd-fatimg",
+            "versal-net": "cpio.gz.u-boot.qemu-sd-fatimg"
         }
         if not initramfs_image:
             image_fs = data.getVar('IMAGE_FSTYPES')
@@ -96,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' and soc_variant == '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-fetch-restricted.bbclass b/meta-xilinx-core/classes-recipe/xilinx-fetch-restricted.bbclass
index a778ec7d..a778ec7d 100644
--- a/meta-xilinx-core/classes/xilinx-fetch-restricted.bbclass
+++ b/meta-xilinx-core/classes-recipe/xilinx-fetch-restricted.bbclass
diff --git a/meta-xilinx-core/classes/xilinx-platform-init.bbclass b/meta-xilinx-core/classes-recipe/xilinx-platform-init.bbclass
index 99f7863a..99f7863a 100644
--- a/meta-xilinx-core/classes/xilinx-platform-init.bbclass
+++ b/meta-xilinx-core/classes-recipe/xilinx-platform-init.bbclass
diff --git a/meta-xilinx-core/classes/dfx_user_dts.bbclass b/meta-xilinx-core/classes/dfx_user_dts.bbclass
deleted file mode 100644
index 4404aa05..00000000
--- a/meta-xilinx-core/classes/dfx_user_dts.bbclass
+++ /dev/null
@@ -1,267 +0,0 @@
-# This bbclass is inherited by flat, DFx Static and DFx RP firmware recipes.
-# dfx_user_dts.bbclass expects user to generate pl dtsi for flat, DFx Static
-# and DFx RP xsa outside of yocto.
-
-inherit devicetree
-
-DEPENDS = "dtc-native bootgen-native"
-
-# recipes that inherit from this class need to use an appropriate machine
-# override for COMPATIBLE_MACHINE to build successfully; don't allow building
-# for microblaze MACHINE
-COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE:microblaze = "^$"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PROVIDES = ""
-
-do_fetch[cleandirs] = "${B}"
-
-DT_PADDING_SIZE = "0x1000"
-BOOTGEN_FLAGS ?= " -arch ${SOC_FAMILY} -w ${@bb.utils.contains('SOC_FAMILY','zynqmp','','-process_bitstream bin',d)}"
-
-S ?= "${WORKDIR}"
-FW_DIR ?= ""
-DTSI_PATH ?= ""
-DTBO_PATH ?= ""
-DT_FILES_PATH = "${S}/${DTSI_PATH}"
-FIRMWARE_NAME_DT_FILE ?= ""
-USER_DTS_FILE ?= ""
-
-FIRMWARE_NAME_DT_FILE[doc] = "DT file which has firmware-name device-tree property"
-USER_DTS_FILE[doc] = "Final DTSI or DTS file which is used for packaging final DT overlay"
-
-python() {
-    import re
-    soc_family = d.getVar("SOC_FAMILY")
-    if "git://" in d.getVar("SRC_URI") or "https://" in d.getVar("SRC_URI"):
-        d.setVar("S",'${WORKDIR}/git/'+d.getVar("FW_DIR"))
-    else:
-        dtsi_found = False
-        dtbo_found = False
-        bit_found = False
-        bin_found = False
-        pdi_found = False
-
-        # Required Inputs
-        if '.dtsi' in d.getVar("SRC_URI") or '.dts' in d.getVar("SRC_URI"):
-            dtsi_found = True
-            d.setVar("DTSI_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.dtsi' in a or '.dts' in a][0].lstrip('file://')))
-
-        if '.dtbo' in d.getVar("SRC_URI"):
-            dtbo_found = True
-            d.setVar("DTBO_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.dtbo' in a][0].lstrip('file://')))
-
-        if '.bit' in d.getVar("SRC_URI") and soc_family != "versal":
-            bit_found = True
-            d.setVar("BIT_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.bit' in a][0].lstrip('file://')))
-
-        if '.bin' in d.getVar("SRC_URI") and soc_family != "versal":
-            bin_found = True
-            d.setVar("BIT_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.bin' in a][0].lstrip('file://')))
-
-        if '.pdi' in d.getVar("SRC_URI") and soc_family == "versal":
-            pdi_found = True
-            d.setVar("PDI_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.pdi' in a][0].lstrip('file://')))
-
-        # Check for valid combination of input files in SRC_URI
-        if dtsi_found or dtbo_found:
-            bb.debug(2, "dtsi or dtbo found in SRC_URI")
-            if bit_found or pdi_found or bin_found:
-                bb.debug(2, "bitstream or pdi found in SRC_URI")
-            elif bit_found and bin_found:
-                raise bb.parse.SkipRecipe("Both '.bit' and '.bin' file found in SRC_URI, either .bit or .bin file is supported but not both.")
-            else:
-                raise bb.parse.SkipRecipe("Need one '.bit' or one '.pdi' file added to SRC_URI ")
-        else:
-            raise bb.parse.SkipRecipe("Need one '.dtsi' or one '.dtbo' file added to SRC_URI ")
-
-        # Check for valid combination of dtsi and dts files in SRC_URI
-        # Following file combinations are not supported use case.
-        # 1. More than one '.dtsi' and zero '.dts' file.
-        # 2. More than one '.dts' and zero or more than one '.dtsi'file .
-        pattern_dts = re.compile(r'[.]+dts\b')
-        pattern_dtsi = re.compile(r'[.]+dtsi\b')
-        dts_count = len([*re.finditer(pattern_dts, d.getVar('SRC_URI'))])
-        dtsi_count = len([*re.finditer(pattern_dtsi, d.getVar("SRC_URI"))])
-
-        if dtsi_count > 1 and dts_count == 0:
-            raise bb.parse.SkipRecipe("Recipe has more than one '.dtsi' and zero '.dts' found, this is an unsupported use case")
-        elif dts_count > 1:
-            raise bb.parse.SkipRecipe("Recipe has more than one '.dts' and zero or more than one '.dtsi' found, this is an unsupported use case")
-
-        # Optional input
-        if '.json' in d.getVar("SRC_URI"):
-            d.setVar("JSON_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.json' in a][0].lstrip('file://')))
-
-        if '.xclbin' in d.getVar("SRC_URI"):
-            d.setVar("XCL_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.xclbin' in a][0].lstrip('file://')))
-}
-
-# Function to get dts or dtsi file count.
-def get_dt_count(d, dt_ext):
-    import glob
-    dt_count = sum(1 for f in glob.iglob((d.getVar('S') + (d.getVar('DTSI_PATH')) + '/*.' + dt_ext),recursive=True) if os.path.isfile(f))
-    return dt_count
-
-# Function to search for dt firmware-name property in dts or dtsi file.
-python find_firmware_file() {
-    import glob
-    pattern_fw = 'firmware-name'
-    search_count = 0
-    for dt_files in glob.iglob((d.getVar('S') + (d.getVar('DTSI_PATH')) + '/*.dts*'),recursive=True):
-        with open(dt_files, "r") as f:
-            current_fd = f.read()
-            if pattern_fw in current_fd:
-                search_count += 1
-                if search_count > 1:
-                    bb.error("firmware-name dt property found in more than one dt files! Please fix the dts or dtsi file.")
-                    break
-                else:
-                    d.setVar('FIRMWARE_NAME_DT_FILE', os.path.basename(dt_files))
-}
-
-do_configure[prefuncs] += "find_firmware_file"
-
-python do_configure() {
-    import glob, re, shutil
-    soc_family = d.getVar("SOC_FAMILY")
-
-    if bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', False, True, d):
-        bb.warn("Using fpga-manager.bbclass requires fpga-overlay MACHINE_FEATURE to be enabled")
-
-    # Renaming firmware-name using $PN as bitstream/PDI will be renamed using
-    # $PN when generating the bin/pdi file.
-    if os.path.isfile(d.getVar('S') + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
-        orig_dtsi = glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE'))[0]
-        new_dtsi = d.getVar('S') + '/pl.dtsi_firmwarename'
-        with open(new_dtsi, 'w') as newdtsi:
-            with open(orig_dtsi) as olddtsi:
-                for line in olddtsi:
-                    if soc_family == 'versal':
-                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.pdi\"',line))
-                    else:
-                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.bit.bin\"',line))
-        shutil.move(new_dtsi,orig_dtsi)
-}
-
-do_compile[prefuncs] += "find_firmware_file"
-
-python devicetree_do_compile:append() {
-    import glob, subprocess, shutil
-    soc_family = d.getVar("SOC_FAMILY")
-
-    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
-
-    # Skip devicetree do_compile task if input file is dtbo in SRC_URI
-    if not dtbo_count:
-        # Convert .bit to bit.bin format only if dtsi is input.
-        # In case of dtbo as input, bbclass doesn't know if firmware-name is .bit or
-        # .bit.bin format and corresponding file name. Hence we are not doing
-        # bit.bin conversion.
-        if soc_family != 'versal' and glob.glob(d.getVar('S') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
-            pn = d.getVar('PN')
-            biffile = pn + '.bif'
-
-            with open(biffile, 'w') as f:
-                f.write('all:\n{\n\t' + glob.glob(d.getVar('S')+(d.getVar('BIT_PATH') or '') + '/*.bit')[0] + '\n}')
-
-            bootgenargs = ["bootgen"] + (d.getVar("BOOTGEN_FLAGS") or "").split()
-            bootgenargs += ["-image", biffile, "-o", pn + ".bit.bin"]
-            subprocess.run(bootgenargs, check = True)
-
-            # In Zynq7k using both "-process_bitstream bin" and "-o" in bootgen flag,
-            # to convert bit file to bin format, "-o" option will not be effective
-            # and generated output file name is ${S}+${BIT_PATH}/<bit_file_name>.bit.bin
-            # file, Hence we need to rename this file from <bit_file_name>.bit.bin to
-            # ${PN}.bit.bin which matches the firmware name in dtbo and move
-            # ${PN}.bit.bin to ${B} directory.
-            if soc_family == 'zynq':
-                src_bitbin_file = glob.glob(d.getVar('S') + (d.getVar('BIT_PATH') or '') + '/*.bit.bin')[0]
-                dst_bitbin_file = d.getVar('B') + '/' + pn + '.bit.bin'
-                shutil.move(src_bitbin_file, dst_bitbin_file)
-
-            if not os.path.isfile(pn + ".bit.bin"):
-                bb.fatal("Couldn't find %s file, Enable '-log trace' in BOOTGEN_FLAGS" \
-                    "and check bootgen_log.txt" % (d.getVar('B') + '/' + pn + '.bit.bin'))
-}
-
-# If user inputs both dtsi and dts files then device-tree will generate dtbo
-# files for each dt file, Hence to package the firmware pick the right user dt
-# overlay file.
-python find_user_dts_overlay_file() {
-    import glob
-    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
-    # Skip if input file is dtbo in SRC_URI
-    if not dtbo_count:
-        dts_count = get_dt_count(d, 'dts')
-        dtsi_count = get_dt_count(d, 'dtsi')
-        if dtsi_count == 1 and dts_count == 0:
-            dts_file =glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/*.dtsi')[0]
-        elif dtsi_count >=0 and dts_count == 1:
-            dts_file = glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/*.dts')[0]
-
-        d.setVar('USER_DTS_FILE', os.path.splitext(os.path.basename(dts_file))[0])
-}
-
-do_install[prefuncs] += "find_user_dts_overlay_file"
-
-do_install() {
-    install -d ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-
-    # In case of dtbo as input, dtbo will be copied from directly from ${S}
-    # In case of dtsi as input, dtbo will be copied from directly from ${B}
-    if [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
-        install -Dm 0644 ${S}/*.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-    elif [ `ls ${S}/*.dtbo | wc -l` -gt 1 ]; then
-        bbfatal "Multiple DTBO found, use the right DTBO in SRC_URI from the following:\n$(basename -a ${S}/*.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
-        bbfatal "A dtbo ending '.dtbo' expected but not found"
-    fi
-
-    if [ "${SOC_FAMILY}" == "versal" ]; then
-        # In case of dtbo as input, pdi will be copied from directly from ${S}
-        # without renaming the pdi name to ${PN}.pdi
-        if [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
-            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ `ls ${S}/*.pdi | wc -l` -gt 1 ]; then
-            bbfatal "Multiple PDI found, use the right PDI in SRC_URI from the following:\n$(basename -a ${S}/*.pdi)"
-        elif [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
-            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.pdi
-        else
-            bbfatal "A PDI file with '.pdi' expected but not found"
-        fi
-    else
-        # In case of dtbo as input, .bit or .bin will be copied from directly
-        # from ${S} without renaming the .bit/.bin name to ${PN}.bit/${PN}.bin
-        # if more than one .bit/.bin file is found then fail the task.
-        if [ `ls ${S}/*.bit | wc -l` -gt 1 ]; then
-            bbfatal "Multiple .bit found, use the right .bit in SRC_URI from the following:\n$(basename -a ${S}/*.bit)"
-        elif [ `ls ${S}/*.bin | wc -l` -gt 1 ]; then
-            bbfatal "Multiple .bin found, use the right .bin in SRC_URI from the following:\n$(basename -a ${S}/*.bin)"
-        elif [ `ls ${S}/*.bit | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
-            install -Dm 0644 ${S}/*.bit ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ `ls ${S}/*.bin | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
-            install -Dm 0644 ${S}/*.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ -f ${B}/${PN}.bit.bin ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
-            install -Dm 0644 ${B}/${PN}.bit.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.bit.bin
-        else
-            bbfatal "A bitstream file with '.bit' or '.bin' expected but not found"
-        fi
-    fi
-
-    if ls ${S}/${XCL_PATH}/*.xclbin >/dev/null 2>&1; then
-        install -Dm 0644 ${S}/${XCL_PATH}/*.xclbin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.xclbin
-    fi
-
-    if [ -f ${S}/${JSON_PATH}/shell.json ] || [ -f ${S}/${JSON_PATH}/accel.json ]; then
-        install -Dm 0644 ${S}/${JSON_PATH}/*.json ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-    fi
-}
-
-do_deploy[noexec] = "1"
-
-FILES:${PN} += "${nonarch_base_libdir}/firmware/xilinx/${PN}"
diff --git a/meta-xilinx-core/classes/fpgamanager_custom.bbclass b/meta-xilinx-core/classes/fpgamanager_custom.bbclass
deleted file mode 100644
index 8c8997a1..00000000
--- a/meta-xilinx-core/classes/fpgamanager_custom.bbclass
+++ /dev/null
@@ -1,24 +0,0 @@
-# This class inherits dfx_user_dts.bbclass for below use cases.
-# Zynq-7000 and ZynqMP: Full bitstream loading.
-# ZynqMP: DFx Static and Partial bitstream loading.
-# Versal: DFx Static and Parial pdi loading.
-# Versal: Full PDI loading.
-
-inherit dfx_user_dts
-
-python fpgamanager_warn_msg () {
-    if not d.getVar("FPGAMANAGER_NO_WARN"):
-        arch = d.getVar('SOC_FAMILY')
-        pn = d.getVar('PN')        
-        warn_msg = 'Users should start using dfx_user_dts bbclass for '
-        if arch == 'zynq':
-            warn_msg += 'Zynq-7000 Full bitstream loading use case.'
-        elif arch == 'zynqmp':
-            warn_msg += 'ZynqMP Full or DFx Static or DFx Partial bitstream loading use case.'
-        elif arch == 'versal':
-            warn_msg += 'Versal DFx Static or DFx Partial or Full PDI loading use case.'
-
-        bb.warn("Recipe %s has inherited fpgamanager_custom bbclass which will be deprecated in 2024.1 release. \n%s" % (pn, warn_msg))
-}
-
-do_install[postfuncs] += "fpgamanager_warn_msg"
\ No newline at end of file
diff --git a/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass b/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
index b4de5ee1..71b8b9b8 100644
--- a/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
+++ b/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
@@ -39,18 +39,18 @@ CONVERSION_CMD:qemu-sd-fatimg () {
         parted -s ${QEMU_IMG} set 1 boot on
         parted ${QEMU_IMG} print
         BOOT_BLOCKS=$(LC_ALL=C parted -s ${QEMU_IMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
-        rm -f ${WORKDIR}/${BOOT_VOLUME_ID}.img
-        mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${WORKDIR}/${BOOT_VOLUME_ID}.img $BOOT_BLOCKS
+        rm -f ${BOOT_VOLUME_ID}.img
+        mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${BOOT_VOLUME_ID}.img $BOOT_BLOCKS
         if [ -e ${DEPLOY_DIR_IMAGE}/boot.bin ]; then
-                mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.bin ::/
+                mcopy -i ${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.bin ::/
         fi
         if [ -e ${DEPLOY_DIR_IMAGE}/boot.scr ]; then
-                mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.scr ::/
+                mcopy -i ${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.scr ::/
         fi
         if [ ${INITRAMFS_IMAGE} = ${IMAGE_BASENAME} ] && [ x"${INITRAMFS_IMAGE_BUNDLE}" != "x1" ]; then
-                mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s  ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ::rootfs.cpio.gz.u-boot
+                mcopy -i ${BOOT_VOLUME_ID}.img -s  ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ::rootfs.cpio.gz.u-boot
         fi
-        dd if=${WORKDIR}/${BOOT_VOLUME_ID}.img of=${QEMU_IMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ALIGNMENT} \* 1024)
+        dd if=${BOOT_VOLUME_ID}.img of=${QEMU_IMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ALIGNMENT} \* 1024)
 }
 
 CONVERSION_DEPENDS_qemu-sd = "qemu-system-native"
diff --git a/meta-xilinx-core/classes/xilinx-deprecated.bbclass b/meta-xilinx-core/classes/xilinx-deprecated.bbclass
index 1aee2fe1..788b963e 100644
--- a/meta-xilinx-core/classes/xilinx-deprecated.bbclass
+++ b/meta-xilinx-core/classes/xilinx-deprecated.bbclass
@@ -9,10 +9,15 @@ python xilinx_deprecated_config_eventhandler () {
     if d.getVar('BOARD') or d.getVar('BOARD_VARIANT'):
         bb.error("Deprecated BOARD (%s) or BOARD_VARIANT (%s) is being used, they are no longer supported and are ignored." % (d.getVar('BOARD'), d.getVar('BOARD_VARIANT')))
 
+    # Check for 'generic' machines, warn the user this isn't what they want
+    if d.getVar('MACHINE').endswith('-generic'):
+        bb.warn('The %s machine is intended to be included by other machines, it should not be used by itself.  For a non-machine, SoC specific filesystem, please use one of the common machines defined in meta-xilinx-core.' % d.getVar('MACHINE'))
+
     msg_list = d.getVarFlags('XILINX_DEPRECATED') or []
     for msg_source in msg_list:
         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 49ed6ac8..5007761f 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -22,10 +22,10 @@ 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 = "nanbield"
+LAYERSERIES_COMPAT_xilinx = "styhead walnascar"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   *->xrt \
@@ -42,18 +42,9 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   *->xserver-xorg \
 "
 
-XILINX_RELEASE_VERSION ??= "v2023.2"
+XILINX_RELEASE_VERSION ??= "v2024.2"
 
-BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION"
-
-XILINX_QEMU_VERSION[v2022.1] = "v7.1.0-xilinx-v2022.1%"
-XILINX_QEMU_VERSION[v2022.2] = "v7.1.0-xilinx-v2022.2%"
-XILINX_QEMU_VERSION[v2023.1] = "v7.1.0-xilinx-v2023.1%"
-XILINX_QEMU_VERSION[v2023.2] = "v7.1.0-xilinx-v2023.2%"
-PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%"
+BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION"
 
 DEFAULT_XILINX_QEMU = "qemu-xilinx"
 DEFAULT_XILINX_QEMU:arm = "qemu"
@@ -61,20 +52,50 @@ PREFERRED_PROVIDER_qemu ?= "${DEFAULT_XILINX_QEMU}"
 
 XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%"
 XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%"
-PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
+XILINX_ATF_VERSION[v2024.1] = "2.10-xilinx-v2024.1%"
+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[v2023.1] = "v2023.01-xilinx-v2023.1%"
-XILINX_UBOOT_VERSION[v2023.2] = "v2023.01-xilinx-v2023.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'}"
 
-XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%"
-XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%"
-XILINX_LINUX_VERSION[v2023.1] = "6.1.30-xilinx-v2023.1%"
-XILINX_LINUX_VERSION[v2023.2] = "6.1.60-xilinx-v2023.2%"
+XILINX_LINUX_VERSION[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
+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.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'}"
+
+# AI-Engine
+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[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
 PLNX_SCRIPTS_PATH = "${LAYERDIR}/gen-machine-conf/gen-machine-scripts"
 BB_HASHEXCLUDE_COMMON:append = " PLNX_SCRIPTS_PATH"
diff --git a/meta-xilinx-core/conf/machine/README b/meta-xilinx-core/conf/machine/README
index de8cf58d..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
@@ -132,8 +129,6 @@ easiy make a local change, if allowed by the machine .conf:
 
 UBOOT_MACHINE - The defconfig for u-boot.  (Note, this may be an error TBD).
 
-SOC_VARIANT - See include/soc-*.inc (Note, most machines this is fixed).
-
 
 The following variables must be set AFTER the 'require' line, using '='
 or '+='/'=+' as required.  Using ':append', ':prepend', or ':remove' will
@@ -151,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
-HDF_EXT - Only ".xsa" externsion is supported, legacy variable.
-HDF_BASE - Download protocol (file://, git://, http:// or https://) protocol if
-    not using the default external-hdf repository.
-HDF_PATH - Path to the repository or XSA file
+XILINX_XSCT_VERSION - Version of the XSCT tool and associated ESW software
+HDF_URI - URL for the .xsa file
+HDF_URI[sha256sum] - sha256sum of the .xsa
+
+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
@@ -210,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 e99b1f0e..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"
@@ -23,31 +21,14 @@ PREFERRED_PROVIDER_u-boot-tools ??= "u-boot-tools-xlnx"
 PREFERRED_PROVIDER_u-boot-tools-native ??= "u-boot-tools-xlnx-native"
 PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-u-boot-tools-xlnx"
 
-do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}"
+# Libmetal and OpenAMP Configuration
+PREFERRED_PROVIDER_libmetal ?= "libmetal-xlnx"
+PREFERRED_PROVIDER_open-amp ?= "open-amp-xlnx"
 
 UBOOT_SUFFIX ?= "bin"
 
 UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
-UBOOT_ELF ?= "u-boot"
-UBOOT_ELF:aarch64 ?= "u-boot.elf"
-
-# libmali is selected by DISTRO_FEATURE of libmali & MACHINE_FEATURES of mali400
-# lima is selected by DISTRO_FEATURE != libmali & MACHINE_FEATURES of mali400
-# default mesa because otherwise
-def xlnx_is_libmali_enabled(d):
-    if bb.utils.contains('MACHINE_FEATURES', 'mali400', '1', '', d) == '1':
-        if bb.utils.contains('DISTRO_FEATURES', 'libmali', '1', '', d) == '1':
-            return True
-    return False
-
-# libmali requires certain preferred providers to be selected
-PREFERRED_PROVIDER_virtual/egl ?= "${@'libmali-xlnx' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/libgl ?= "${@'mesa-gl' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "${@'libmali-xlnx' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "${@'libmali-xlnx' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/libgles3 ?= "${@'NOT_SUPPORTED' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/libgbm ?= "${@'libmali-xlnx' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/mesa ?= "${@'mesa-gl' if xlnx_is_libmali_enabled(d) else 'mesa'}"
+UBOOT_ELF ?= "u-boot.elf"
 
 XSERVER ?= " \
         xserver-xorg \
@@ -76,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
@@ -89,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)}"
@@ -105,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())
@@ -118,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/")
 
@@ -130,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_OPT_APPEND += "${QB_XILINX_SERIAL}"
+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
new file mode 100644
index 00000000..f7898e0d
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/include/soc-versal-net.inc
@@ -0,0 +1,24 @@
+DEFAULTTUNE ?= "cortexa72-cortexa53"
+SOC_FAMILY ?= "versal-net"
+
+require conf/machine/include/soc-family.inc
+require soc-tune-include.inc
+
+# Linux Configuration
+KERNEL_IMAGETYPE ?= "Image"
+
+UBOOT_ELF ?= "u-boot.elf"
+
+# Default, if multiconfig is off, call plm/psm-firmware directly, otherwise call the versal-fw multiconfig version
+# The Linux compatible plm/psm-firmware though requires meta-xilinx-tools
+PLM_DEPENDS ??= ""
+PLM_MCDEPENDS ??= ""
+PLM_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+PLM_IMAGE_NAME ??= "plm-${MACHINE}"
+PLM_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+
+PSM_DEPENDS ??= ""
+PSM_MCDEPENDS ??= ""
+PSM_FIRMWARE_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-${MACHINE}"
+PSM_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
diff --git a/meta-xilinx-core/conf/machine/include/soc-versal.inc b/meta-xilinx-core/conf/machine/include/soc-versal.inc
index dcf3796e..1fcb412a 100644
--- a/meta-xilinx-core/conf/machine/include/soc-versal.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-versal.inc
@@ -1,24 +1,20 @@
 DEFAULTTUNE ?= "cortexa72-cortexa53"
 SOC_FAMILY ?= "versal"
 
-# Available SOC_VARIANT's for versal:
-# "prime"    - Versal deafult Prime Devices
-# "premium"  - Versal Premium Devices
-# "hbm"      - Versal HMB Devices
-# "ai-core"  - Versal AI-core Devices
-# "ai-edge"  - Versal AI-Edge Devices
-# "net"      - Versal Net Devices
-
-SOC_VARIANT ?= "prime"
-
-require xilinx-soc-family.inc
+# Available MACHINE_FETURES for versal processors:
+# prime   - (none)
+# premium - aie
+# hbm     - (none)
+# ai-core - aie, vdu
+# ai-edge - aie, vdu
+# net     - none
+
+require conf/machine/include/soc-family.inc
 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 eea02a6c..587a0d5a 100644
--- a/meta-xilinx-core/conf/machine/include/soc-zynq.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-zynq.inc
@@ -1,28 +1,11 @@
 DEFAULTTUNE ?= "cortexa9thf-neon"
 SOC_FAMILY ?= "zynq"
 
-# Available SOC_VARIANT's for zynq:
-# 7zs - Zynq-7000 Single A9 Core
-# 7z  - Zynq-7000 Dual A9 Core
-
-SOC_VARIANT ?= "7z"
-
-require xilinx-soc-family.inc
+require conf/machine/include/soc-family.inc
 require soc-tune-include.inc
 
 # Linux Configuration
 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 95ac54e2..aee5c19c 100644
--- a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
@@ -1,27 +1,13 @@
 DEFAULTTUNE ?= "cortexa72-cortexa53"
 SOC_FAMILY ?= "zynqmp"
 
-# Available SOC_VARIANT's for zynqmp:
-# "cg" - Zynq UltraScale+  CG Devices (default lowest common denominator)
-# "eg" - Zynq UltraScale+  EG Devices
-# "ev" - Zynq UltraScale+  EV Devices
-# "dr" - Zynq UltraScale+  DR Devices
-
-SOC_VARIANT ?= "cg"
-
-# Add VCU feature on "ev" devices
-VCU_MACHINE_FEATURE = ""
-VCU_MACHINE_FEATURE:zynqmp-ev = " vcu"
-MACHINE_FEATURES .= "${VCU_MACHINE_FEATURE}"
-
-# Add mali400 a.k.a Mali Utgard, "ev" and "eg" devices
-MALI_MACHINE_FEATURE = ""
-MALI_MACHINE_FEATURE:zynqmp-eg = " mali400"
-MALI_MACHINE_FEATURE:zynqmp-ev = " mali400"
-MACHINE_FEATURES .= "${MALI_MACHINE_FEATURE}"
-
-require xilinx-soc-family.inc
+# Available MACHINE_FETURES for zynqmp processors:
+# zynqmp-cg - (none)
+# zynqmp-eg - mali400
+# zynqmp-ev - mali400, vcu
+# zynqmp-dr - rfsoc
 
+require conf/machine/include/soc-family.inc
 require soc-tune-include.inc
 
 # Linux Configuration
@@ -30,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/include/xilinx-soc-family.inc b/meta-xilinx-core/conf/machine/include/xilinx-soc-family.inc
deleted file mode 100644
index dd54f5c6..00000000
--- a/meta-xilinx-core/conf/machine/include/xilinx-soc-family.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SOC_VARIANT ??= ""
-MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}-${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}"
-
-require conf/machine/include/soc-family.inc
-
-SOC_FAMILY_ARCH ?= "${SOC_FAMILY}"
-SOC_VARIANT_ARCH ?= "${@['${SOC_FAMILY}-${SOC_VARIANT}','${SOC_FAMILY}'][d.getVar('SOC_VARIANT')=='']}"
-
-PACKAGE_EXTRA_ARCHS:append = " ${SOC_FAMILY_ARCH}"
-PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${SOC_VARIANT_ARCH}'][d.getVar('SOC_VARIANT_ARCH') != d.getVar('SOC_FAMILY_ARCH')]}"
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_KERNEL_CMDLINE_APPEND = "console=ttyUL0,115200 root=/dev/ram0 rw"
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+QB_MEM ?= "-m 2G"
+QB_KERNEL_CMDLINE_APPEND ?= "console=ttyUL0,115200 root=/dev/ram0 rw"
+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-core-generic.conf b/meta-xilinx-core/conf/machine/versal-ai-core-generic.conf
index 34f57691..3b7218c1 100644
--- a/meta-xilinx-core/conf/machine/versal-ai-core-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-ai-core-generic.conf
@@ -4,7 +4,7 @@ MACHINEOVERRIDES =. "${@['', 'versal-ai-core-generic:']['versal-ai-core-generic'
 
 require conf/machine/versal-generic.conf
 
-SOC_VARIANT = "ai-core"
+MACHINE_FEATURES += "aie vdu"
 
 #### No additional settings should be after the Postamble
 #### Postamble
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 bf5523ed..0d7f3223 100644
--- a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
@@ -4,7 +4,13 @@ MACHINEOVERRIDES =. "${@['', 'versal-ai-edge-generic:']['versal-ai-edge-generic'
 
 require conf/machine/versal-generic.conf
 
-SOC_VARIANT = "ai-edge"
+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"
+
+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 2f35ba24..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_DEFAULT_KERNEL = "none"
+QB_MEM ?= "-m 8G"
+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_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vck190.dtb"
-QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-vc-p-a2197-00.dtb"
+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_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 
 # Four total serial ports defined in this model (according to the dts)
 #
@@ -93,26 +63,34 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-vc-p-a2197-00.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 ??= ""
 
 QB_OPT_APPEND += " \
     -hw-dtb ${QEMU_HW_DTB_PS} \
     ${@qemu_add_extra_args(d)} \
+    ${@'-bootbin ${QB_OSPI_FILE}' if d.getVar('QB_OSPI_FILE') != '' else ''} \
     "
 
 # PLM instance args
 QB_PLM_OPT = " \
     -M microblaze-fdt \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw  \
     -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \
     -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
-    -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 \
     -device loader,addr=0xF1110624,data=0x0,data-len=4 \
     -device loader,addr=0xF1110620,data=0x1,data-len=4 \
     -hw-dtb ${QEMU_HW_DTB_PMC} \
     -display none \
     "
+
+QB_FW_FILES = " \
+    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \
+    -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 += "${@d.getVar('QB_FW_FILES') if d.getVar('QB_OSPI_FILE') == '' else ''}"
+
 QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
 
 #### No additional settings should be after the Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
index 23fffcb9..805df7fc 100644
--- a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
@@ -4,7 +4,11 @@ MACHINEOVERRIDES =. "${@['', 'versal-hbm-generic:']['versal-hbm-generic' != '${M
 
 require conf/machine/versal-generic.conf
 
-SOC_VARIANT = "hbm"
+# 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"
+
+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 9945d301..b26fb5e1 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -1,5 +1,3 @@
-XILINX_DEPRECATED[versal-net] = "Versal-net is not supported in 2023.2"
-
 #@TYPE: Machine
 #@NAME: versal-net-generic
 #@DESCRIPTION: Machine configuration for the versal-net-generic devices
@@ -8,32 +6,55 @@ XILINX_DEPRECATED[versal-net] = "Versal-net is not supported in 2023.2"
 MACHINEOVERRIDES =. "${@['', 'versal-net-generic:']['versal-net-generic' != '${MACHINE}']}"
 #### Regular settings follow
 
-# Must be set first, or versal-generic will set it
+# Variables that changes based on hw design or board specific requirement must be
+# defined before calling the required inclusion file else pre-expansion value
+# defined in local.conf without machine override will not be reflected.
+
+# Yocto Versal u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig"
+BOOTMODE ?= "generic.root"
 
-# Yocto Versal Net device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
-YAML_DT_BOARD_FLAGS ?= "{BOARD versal-net-ipp-rev1.9}"
+# Yocto Versal arm-trusted-firmware(TF-A) variables
+TFA_BL33_LOAD ?= "0x8000000"
 
-# Yocto Versal Net 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/versal-generic.conf
+require conf/machine/include/soc-versal-net.inc
+require conf/machine/include/machine-xilinx-default.inc
+require conf/machine/include/machine-xilinx-qemu.inc
+
+MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
 
-SOC_VARIANT = "net"
+# 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'}"
 
-# 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 = "versal-net-generic"
+EXTRA_IMAGEDEPENDS += " \
+    u-boot-xlnx-scr \
+    "
 
-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"
+IMAGE_BOOT_FILES += " \
+    Image \
+    boot.scr \
+    "
+
+# Versal QEMU Configurations
+# This machine has a QEMU model, runqemu setup:
+QB_MEM ?= "-m 8G"
+QB_DEFAULT_KERNEL ?= "none"
+# Iteration appears to be eth0 then eth1
+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_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"
 
 # Four total serial ports defined in this model (according to the dts)
 #
@@ -41,9 +62,36 @@ 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 ??= ""
+
+QB_OPT_APPEND += " \
+    -hw-dtb ${QEMU_HW_DTB_PS} \
+    ${@qemu_add_extra_args(d)} \
+    ${@'-bootbin ${QB_OSPI_FILE}' if d.getVar('QB_OSPI_FILE') != '' else ''} \
+    "
+
+# PLM instance args
+QB_PLM_OPT = " \
+    -M microblaze-fdt \
+    -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \
+    -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
+    -device loader,addr=0xF1110624,data=0x0,data-len=4 \
+    -device loader,addr=0xF1110620,data=0x1,data-len=4 \
+    -hw-dtb ${QEMU_HW_DTB_PMC} \
+    -display none \
+    "
+
+QB_FW_FILES = " \
+    -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=on \
+    -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
+"
+QB_PLM_OPT += "${@d.getVar('QB_FW_FILES') if d.getVar('QB_OSPI_FILE') == '' else ''}"
+
+QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
 
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_net_generic']['versal-net-generic' != "${MACHINE}"]}"
-
diff --git a/meta-xilinx-core/conf/machine/versal-premium-generic.conf b/meta-xilinx-core/conf/machine/versal-premium-generic.conf
index d785edff..357e852d 100644
--- a/meta-xilinx-core/conf/machine/versal-premium-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-premium-generic.conf
@@ -4,7 +4,7 @@ MACHINEOVERRIDES =. "${@['', 'versal-premium-generic:']['versal-premium-generic'
 
 require conf/machine/versal-generic.conf
 
-SOC_VARIANT = "premium"
+MACHINE_FEATURES += "aie"
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-prime-generic.conf b/meta-xilinx-core/conf/machine/versal-prime-generic.conf
index 94e9b05e..edce3577 100644
--- a/meta-xilinx-core/conf/machine/versal-prime-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-prime-generic.conf
@@ -4,7 +4,7 @@ MACHINEOVERRIDES =. "${@['', 'versal-prime-generic:']['versal-prime-generic' !=
 
 require conf/machine/versal-generic.conf
 
-SOC_VARIANT = "prime"
+QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vmk180.dtb"
 
 #### No additional settings should be after the Postamble
 #### Postamble
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_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+QB_MEM ?= "-m 1024"
+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-cg-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf
index 38c9126f..44169186 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf
@@ -4,8 +4,6 @@ MACHINEOVERRIDES =. "${@['', 'zynqmp-cg-generic:']['zynqmp-cg-generic' != '${MAC
 
 require conf/machine/zynqmp-generic.conf
 
-SOC_VARIANT = "cg"
-
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_cg_generic']['zynqmp-cg-generic' != "${MACHINE}"]}"
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-dr-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf
index fbe445aa..316175af 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf
@@ -4,7 +4,7 @@ MACHINEOVERRIDES =. "${@['', 'zynqmp-dr-generic:']['zynqmp-dr-generic' != '${MAC
 
 require conf/machine/zynqmp-generic.conf
 
-SOC_VARIANT = "dr"
+MACHINE_FEATURES += "rfsoc"
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf
index 33375b46..239ded34 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf
@@ -4,7 +4,7 @@ MACHINEOVERRIDES =. "${@['', 'zynqmp-eg-generic:']['zynqmp-eg-generic' != '${MAC
 
 require conf/machine/zynqmp-generic.conf
 
-SOC_VARIANT = "eg"
+MACHINE_FEATURES += "mali400"
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf
index f2ffe40f..31d94f63 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf
@@ -4,7 +4,7 @@ MACHINEOVERRIDES =. "${@['', 'zynqmp-ev-generic:']['zynqmp-ev-generic' != '${MAC
 
 require conf/machine/zynqmp-generic.conf
 
-SOC_VARIANT = "ev"
+MACHINE_FEATURES += "mali400 vcu"
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index 055c7e5b..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_PS = "${QEMU_HW_DTB_PATH}/zcu102-arm.dtb"
-QEMU_HW_DTB_PMU = "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
+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_PMU ?= "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
 
 # Two total serial ports defined in this model (according to the dts)
 #
@@ -150,7 +117,7 @@ QB_PMU_OPT = " \
     -display none \
     -hw-dtb ${QEMU_HW_DTB_PMU} \
     -kernel ${PMU_ROM} \
-    -device loader,file=${PMU_FIRMWARE_DEPLOY_DIR}/${PMU_FIRMWARE_IMAGE_NAME}.elf \
+    -device loader,file=${DEPLOY_DIR_IMAGE}/${PMU_FIRMWARE_IMAGE_NAME}.elf \
     -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \
     -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \
     "
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..7959d9db 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
@@ -1,21 +1,21 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-# openamp.dtsi is in the WORKDIR
-DT_INCLUDE:append = " ${WORKDIR}"
+# openamp.dtsi is in the UNPACKDIR
+DT_INCLUDE:append = " ${UNPACKDIR}"
 
-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_OVERLAYS:zynqmp = "zynqmp-openamp.dtsi"
-OPENAMP_EXTRA_OVERLAYS:versal = "versal-openamp.dtsi"
-OPENAMP_EXTRA_OVERLAYS:versal-net = "versal-net-openamp.dtsi"
+OPENAMP_EXTRA_DT_INCLUDE_FILES ?= ""
+OPENAMP_EXTRA_DT_INCLUDE_FILES:zynqmp = "zynqmp-openamp.dtsi"
+OPENAMP_EXTRA_DT_INCLUDE_FILES:versal = "versal-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 694a2fd0..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
@@ -28,6 +28,24 @@
                         no-map;
                         reg = <0x0 0x3ed48000 0x0 0x100000>;
                 };
+
+                rproc_1_reserved: rproc@3ef00000 {
+                        no-map;
+                        reg = <0x0 0x3ef00000 0x0 0x40000>;
+                };
+                rpu1vdev0vring0: rpu1vdev0vring0@3ef40000 {
+                        no-map;
+                        reg = <0x0 0x3ef40000 0x0 0x4000>;
+                };
+                rpu1vdev0vring1: rpu1vdev0vring1@3ef44000 {
+                        no-map;
+                        reg = <0x0 0x3ef44000 0x0 0x4000>;
+                };
+                rpu1vdev0buffer: rpu1vdev0buffer@3ef48000 {
+                        no-map;
+                        compatible = "shared-dma-pool";
+                        reg = <0x0 0x3ef48000 0x0 0x100000>;
+                };
         };
 
         tcm_0a: tcm_0a@eba00000 {
@@ -35,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 {
@@ -43,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 {
@@ -51,7 +69,31 @@
                 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 {
+                no-map;
+                reg = <0x0 0xeba40000 0x0 0x10000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domains = <&versal_net_firmware 0x183180ce>;
+        };
+
+        tcm_1b: tcm_0b@eba50000 {
+                no-map;
+                reg = <0x0 0xeba50000 0x0 0x8000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domains = <&versal_net_firmware 0x183180cf>;
+        };
+
+        tcm_1c: tcm_0b@eba60000 {
+                no-map;
+                reg = <0x0 0xeba60000 0x0 0x8000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domains = <&versal_net_firmware 0x183180d0>;
         };
 
         r52ss {
@@ -68,11 +110,22 @@
                         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";
                 };
-        };
+                r52_1 {
+                        compatible = "xilinx,r52";
+                        #address-cells = <0x2>;
+                        #size-cells = <0x2>;
+                        ranges;
+                        sram = <&tcm_1a>, <&tcm_1b>, <&tcm_1c>;
+                        memory-region = <&rproc_1_reserved>, <&rpu1vdev0buffer>, <&rpu1vdev0vring0>, <&rpu1vdev0vring1>;
+                        power-domains = <&versal_net_firmware 0x181100C0>;
+                        mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>;
+                        mbox-names = "tx", "rx";
+                };
+      };
 
         zynqmp_ipi1 {
                 compatible = "xlnx,zynqmp-ipi-mailbox";
@@ -93,5 +146,15 @@
                         #mbox-cells = <0x01>;
                         xlnx,ipi-id = <0x03>;
                 };
+                /* APU<->RPU1 IPI mailbox controller */
+                ipi_mailbox_rpu1: mailbox@eb3f0b00{
+                        reg = <0xeb3f0b00 0x20 0xeb3f0b20 0x20 0xeb3f0940 0x20 0xeb3f0960 0x20>;
+                        reg-names = "local_request_region",
+                                    "local_response_region",
+                                    "remote_request_region",
+                                    "remote_response_region";
+                        #mbox-cells = <0x01>;
+                        xlnx,ipi-id = <0x04>;
+                };
         };
 };
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/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 c8a60d81..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
@@ -28,6 +28,23 @@
                         no-map;
                         reg = <0x0 0x3ed00000 0x0 0x40000>;
                 };
+                rpu1vdev0vring0: rpu0vdev0vring0@3ef40000 {
+                        no-map;
+                        reg = <0x0 0x3ef40000 0x0 0x4000>;
+                };
+                rpu1vdev0vring1: rpu0vdev0vring1@3ef44000 {
+                        no-map;
+                        reg = <0x0 0x3ef44000 0x0 0x4000>;
+                };
+                rpu1vdev0buffer: rpu0vdev0buffer@3ef48000 {
+                        no-map;
+                        reg = <0x0 0x3ef48000 0x0 0x100000>;
+                };
+                rproc_1_reserved: rproc@3ef00000 {
+                        no-map;
+                        reg = <0x0 0x3ef00000 0x0 0x40000>;
+                };
+
         };
 
         tcm_0a: tcm_0a@ffe00000 {
@@ -35,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 {
@@ -43,9 +60,23 @@
                 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-domains = <&zynqmp_firmware 17>;
         };
 
+        tcm_1b: tcm_0b@ffeb0000 {
+                no-map;
+                reg = <0x0 0xffeb0000 0x0 0x10000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domains = <&zynqmp_firmware 18>;
+        };
         rf5ss@ff9a0000 {
                 compatible = "xlnx,zynqmp-r5-remoteproc";
                 xlnx,cluster-mode = <1>;
@@ -61,10 +92,22 @@
                         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";
                 };
+                r5f_1: r5f@1 {
+                        compatible = "xilinx,r5f";
+                        #address-cells = <2>;
+                        #size-cells = <2>;
+                        ranges;
+                        sram = <&tcm_1a>, <&tcm_1b>;
+                        memory-region = <&rproc_1_reserved>, <&rpu1vdev0buffer>, <&rpu1vdev0vring0>, <&rpu1vdev0vring1>;
+                        power-domains = <&zynqmp_firmware 8>;
+                        mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>;
+                        mbox-names = "tx", "rx";
+                };
+
         };
 
         zynqmp_ipi1 {
@@ -90,4 +133,26 @@
                         xlnx,ipi-id = <1>;
                 };
         };
+        zynqmp_ipi2 {
+                compatible = "xlnx,zynqmp-ipi-mailbox";
+                interrupt-parent = <&gic>;
+                interrupts = <0 30 4>;
+                xlnx,ipi-id = <8>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                /* APU<->RPU1 IPI mailbox controller */
+                ipi_mailbox_rpu1: mailbox@ff990800 {
+                        reg = <0xff990800 0x20>,
+                              <0xff990820 0x20>,
+                              <0xff990200 0x20>,
+                              <0xff990220 0x20>;
+                        reg-names = "local_request_region",
+                                "local_response_region",
+                                "remote_request_region",
+                                "remote_response_region";
+                        #mbox-cells = <1>;
+                        xlnx,ipi-id = <2>;
+                };
+        };
 };
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-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..92b0227b 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}"
@@ -32,7 +29,7 @@ PROVIDES:remove = "virtual/dtb"
 
 DEPENDS += "python3-dtc-native"
 
-S = "${WORKDIR}/source"
+S = "${UNPACKDIR}/source"
 
 # Set a default so something resolves
 SOC_FAMILY ??= "SOC_FAMILY"
@@ -40,12 +37,12 @@ SOC_FAMILY ??= "SOC_FAMILY"
 do_configure:prepend() {
         mkdir -p source
 
-        if [ -e ${WORKDIR}/${MACHINE}-openamp-overlay.dts ]; then
-                install ${WORKDIR}/${MACHINE}-openamp.dtsi ${WORKDIR}/source/. || :
-                install ${WORKDIR}/${MACHINE}-openamp-overlay.dts ${WORKDIR}/source/openamp.dts
-        elif [ -e ${WORKDIR}/${SOC_FAMILY}-openamp-overlay.dts ]; then
-                install ${WORKDIR}/${SOC_FAMILY}-openamp.dtsi ${WORKDIR}/source/. || :
-                install ${WORKDIR}/${SOC_FAMILY}-openamp-overlay.dts ${WORKDIR}/source/openamp.dts
+        if [ -e ${UNPACKDIR}/${MACHINE}-openamp-overlay.dts ]; then
+                install ${UNPACKDIR}/${MACHINE}-openamp.dtsi ${UNPACKDIR}/source/. || :
+                install ${UNPACKDIR}/${MACHINE}-openamp-overlay.dts ${UNPACKDIR}/source/openamp.dts
+        elif [ -e ${UNPACKDIR}/${SOC_FAMILY}-openamp-overlay.dts ]; then
+                install ${UNPACKDIR}/${SOC_FAMILY}-openamp.dtsi ${UNPACKDIR}/source/. || :
+                install ${UNPACKDIR}/${SOC_FAMILY}-openamp-overlay.dts ${UNPACKDIR}/source/openamp.dts
         else
                 bbfatal "${MACHINE}-openamp-overlay.dts or ${SOC_FAMILY}-openamp-overlay.dts file is not available.  Cannot automatically add OpenAMP dtbo file."
         fi
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_v2023.2.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb
index 5618ae88..9ca9cbc1 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.2.bb
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb
@@ -1,12 +1,13 @@
-SRCBRANCH ?= "2023.2"
-SRCREV = "00fd771adc7adaed664ed6c5bc3d48d25856fe5c"
-BRANCH = "xlnx_rel_v2023.2"
+SRCBRANCH ?= "2024"
+SRCREV = "9e9997221ddd335c31cf881edf7026c762024a58"
+BRANCH = "xlnx_rel_v2024.1"
 LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
-PV = "${SRCBRANCH}+git${SRCPV}"
+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"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.2.bb
index 30ca3501..bcde904d 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.1.bb
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.2.bb
@@ -1,12 +1,13 @@
-SRCBRANCH ?= "2023.1"
-SRCREV = "be635252271de342014a146825870b64bd41d6eb"
-BRANCH = "xlnx_rel_v2023.1"
+SRCBRANCH ?= "2024"
+SRCREV = "e2fdb4fecbebe41b4cd1c0b4fbfa3496bcded485"
+BRANCH = "xlnx_rel_v2024.2"
 LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
-PV = "${SRCBRANCH}+git${SRCPV}"
+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"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend
new file mode 100644
index 00000000..33cd55c1
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend
@@ -0,0 +1,3 @@
+# Prevents parse failrues on zynq
+
+COMPATIBLE_MACHINE:zynq = "^$"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.2.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
index 8c6b4431..29d4bc4f 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.2.bb
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
@@ -1,8 +1,8 @@
-SRCBRANCH ?= "2023.2"
-SRCREV = "73a546f2b5faffe71680b1e5389f3328be60773f"
-BRANCH = "xlnx_rel_v2023.2"
+SRCBRANCH ?= "2024"
+SRCREV = "699ad2c5b9236d61aae1b89e2857361db1bfeb95"
+BRANCH = "xlnx_rel_v2024.1"
 LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
-PV = "${SRCBRANCH}+git${SRCPV}"
+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_v2023.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.2.bb
index e295b869..06c2ecbc 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.1.bb
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.2.bb
@@ -1,8 +1,8 @@
-SRCBRANCH ?= "2023.1"
-SRCREV = "c8aaf2f26d5493f492f0af09dd558d45908636da"
-BRANCH = "xlnx_rel_v2023.1"
+SRCBRANCH ?= "2024"
+SRCREV = "47caef116ccbf5d5a9778082a98fe8f3710b549c"
+BRANCH = "xlnx_rel_v2024.2"
 LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
-PV = "${SRCBRANCH}+git${SRCPV}"
+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-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
new file mode 100644
index 00000000..a7ab6bb8
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend
@@ -0,0 +1,9 @@
+# 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 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
new file mode 100644
index 00000000..a7ab6bb8
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend
@@ -0,0 +1,9 @@
+# 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 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/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend
deleted file mode 100644
index 2b96f152..00000000
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-# Use libmetal for systems with AIE
-# For vck190 kind of devices
-PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
-EXTRA_OECMAKE:append:versal-ai-core = " -DXRT_AIE_BUILD=true"
-TARGET_CXXFLAGS:append:versal-ai-core = " -DXRT_ENABLE_AIE"
-DEPENDS:append:versal-ai-core = " libmetal libxaiengine aiefal"
-RDEPENDS:${PN}:append:versal-ai-core = " libxaiengine aiefal"
-
-# For vek280 kind of devices
-PACKAGE_ARCH:versal-ai-edge = "${SOC_VARIANT_ARCH}"
-EXTRA_OECMAKE:append:versal-ai-edge = " -DXRT_AIE_BUILD=true"
-TARGET_CXXFLAGS:append:versal-ai-edge = " -DXRT_ENABLE_AIE"
-DEPENDS:append:versal-ai-edge = " libmetal libxaiengine aiefal"
-RDEPENDS:${PN}:append:versal-ai-edge = " libxaiengine aiefal"
diff --git a/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
index 81aa8e9e..0c305c78 100644
--- a/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
@@ -9,11 +9,3 @@ SRC_URI:append = " \
 PACKAGECONFIG[fbdev-glesv2] = ",,virtual/libgles2 virtual/egl"
 
 EXTRA_OECONF:append = "${@bb.utils.contains('DISTRO_FEATURES', 'fbdev', ' --with-flavors=fbdev-glesv2', '', d)}"
-
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', 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-devtools/qemu/qemu-xilinx-package-split-8.1.inc b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-8.1.inc
new file mode 100644
index 00000000..42f054e6
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-8.1.inc
@@ -0,0 +1,71 @@
+# we have our own package splitting for qemu, inhbit the oe-core
+# split by overriding the split function
+python split_qemu_packages () {
+    print( "meta-virtualization: vmsplit: inhibiting core qemu package split" )
+}
+
+PACKAGES:prepend:class-target = "${PN}-x86_64 \
+                     ${PN}-aarch64 \
+                     ${PN}-arm \
+                     ${PN}-i386 \
+                     ${PN}-system-i386 \
+                     ${PN}-microblaze \
+                     ${PN}-support \
+                     ${PN}-keymaps \
+                     ${PN}-firmware \
+                    "
+
+FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
+RDEPENDS:${PN}-x86_64:append:class-target = " ${PN}"
+RPROVIDES:${PN}-x86_64:append:class-target = " ${PN}-system-x86_64"
+RPROVIDES:${PN}-x86_64:append:class-target = " ${PN}-user-x86_64"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-x86_64"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-x86_64"
+INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps"
+
+FILES:${PN}-i386:class-target = "${bindir}/qemu-i386"
+RDEPENDS:${PN}-i386:append:class-target = " ${PN}"
+RPROVIDES:${PN}-i386:append:class-target = " ${PN}-user-i386"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-i386"
+INSANE_SKIP:${PN}-i386:class-target = "file-rdeps"
+
+FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386"
+RDEPENDS:${PN}-system-i386:append:class-target = " ${PN}"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-system-i386"
+INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps"
+
+FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
+RDEPENDS:${PN}-aarch64:append:class-target = " ${PN}"
+RPROVIDES:${PN}-aarch64:append:class-target = " ${PN}-system-aarch64"
+RPROVIDES:${PN}-aarch64:append:class-target = " ${PN}-user-aarch64"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-aarch64"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-aarch64"
+INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps"
+
+FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
+RDEPENDS:${PN}-arm:append:class-target = " ${PN}"
+RPROVIDES:${PN}-arm:append:class-target = " ${PN}-system-arm"
+RPROVIDES:${PN}-arm:append:class-target = " ${PN}-user-arm"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-arm"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-arm"
+INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
+
+FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
+RDEPENDS:${PN}-microblaze:append:class-target = " ${PN}"
+RPROVIDES:${PN}-microblaze:append:class-target = " ${PN}-system-microblaze"
+RPROVIDES:${PN}-microblaze:append:class-target = " ${PN}-user-microblaze"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-microblaze"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-microblaze"
+INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
+
+FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*"
+RDEPENDS:${PN}-support:class-target = "${PN} bash"
+
+FILES:${PN}-firmware:class-target = "${datadir}/${PN}/*.bin ${datadir}/${PN}/*.rom ${datadir}/${PN}/*.img ${datadir}/${PN}/openbios* ${datadir}/${PN}/*.dtb ${datadir}/${PN}/u-boot*"
+RDEPENDS:${PN}-firmware:class-target = "${PN}"
+INSANE_SKIP:${PN}-firmware:class-target = "arch"
+
+FILES:${PN}-keymaps:class-target = "${datadir}/${PN}/keymaps/*"
+RDEPENDS:${PN}-keymaps:class-target = "${PN}"
+
+PACKAGECONFIG:append:class-target = " virtfs"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split.inc b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split.inc
deleted file mode 100644
index 2c73d931..00000000
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-PACKAGES:prepend:class-target = "${PN}-x86_64 \
-                     ${PN}-aarch64 \
-                     ${PN}-arm \
-                     ${PN}-i386 \
-                     ${PN}-system-i386 \
-                     ${PN}-microblaze \
-                     ${PN}-support \
-                     ${PN}-keymaps \
-                     ${PN}-firmware \
-                    "
-
-FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
-RDEPENDS:${PN}-x86_64:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps"
-
-FILES:${PN}-i386:class-target = "${bindir}/qemu-i386"
-RDEPENDS:${PN}-i386:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-i386:class-target = "file-rdeps"
-
-FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386"
-RDEPENDS:${PN}-system-i386:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps"
-
-FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
-RDEPENDS:${PN}-aarch64:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps"
-
-FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
-RDEPENDS:${PN}-arm:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
-
-FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
-RDEPENDS:${PN}-microblaze:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
-
-FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*"
-RDEPENDS:${PN}-support:class-target = "${PN} bash"
-
-FILES:${PN}-firmware:class-target = "${datadir}/${PN}/*.bin ${datadir}/${PN}/*.rom ${datadir}/${PN}/*.img ${datadir}/${PN}/openbios* ${datadir}/${PN}/*.dtb ${datadir}/${PN}/u-boot*"
-RDEPENDS:${PN}-firmware:class-target = "${PN}"
-INSANE_SKIP:${PN}-firmware:class-target = "arch"
-
-FILES:${PN}-keymaps:class-target = "${datadir}/${PN}/keymaps/*"
-RDEPENDS:${PN}-keymaps:class-target = "${PN}"
-
-PACKAGECONFIG:append:class-target = " virtfs"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend
deleted file mode 100644
index 5cca9e1f..00000000
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', '${BPN}-package-split.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_8.1%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_8.1%.bbappend
new file mode 100644
index 00000000..74aa15fb
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_8.1%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-8.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend
new file mode 100644
index 00000000..74aa15fb
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-8.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper/0001-fixup-duplicates.patch b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper/0001-fixup-duplicates.patch
new file mode 100644
index 00000000..41815392
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper/0001-fixup-duplicates.patch
@@ -0,0 +1,85 @@
+Prevent duplicate and conflicting entries in generated files
+
+Generated xparameters.h file could end up with conflicting entries between
+"Canonical definitions" and regular "definitions" for various peripherals.
+
+This would result in numerous compilation warnings, and if the conflicting
+entry was used could result in the wrong value.
+
+Also fix the comments to match the generated defines, the wrong entry name
+could have previously been used.
+
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
+diff --git a/lopper/assists/baremetal_xparameters_xlnx.py b/lopper/assists/baremetal_xparameters_xlnx.py
+index 661979d..2b84a64 100644
+--- a/lopper/assists/baremetal_xparameters_xlnx.py
++++ b/lopper/assists/baremetal_xparameters_xlnx.py
+@@ -340,7 +340,7 @@ def xlnx_generate_xparams(tgt_node, sdt, options):
+                                 canondef_dict.update({prop:hex(prop_val[0])})
+                                 plat.buf(f'\n#define XPAR_{label_name}_{prop.upper()} {hex(prop_val[0])}')
+ 
+-                plat.buf(f'\n\n/* Canonical definitions for peripheral {label_name} */')
++                plat.buf(f'\n\n/* Canonical definitions for peripheral {canonical_name}_{index} */')
+                 for prop,val in sorted(canondef_dict.items(), key=lambda e: e[0][0], reverse=False):
+                     if prop == "FABRIC":
+                         plat.buf(f'\n#define XPAR_FABRIC_{canonical_name}_{index}_INTR {val}')
+@@ -359,7 +359,9 @@ def xlnx_generate_xparams(tgt_node, sdt, options):
+         node_list = bm_config.get_mapped_nodes(sdt, node_list, options)
+ 
+     node_ip_count_dict = {}
++    label_dict = {}
+     for node in node_list:
++        canonical_dict = {}
+         try:
+             label_name = bm_config.get_label(sdt, symbol_node, node)
+             if label_name != None:
+@@ -367,6 +369,14 @@ def xlnx_generate_xparams(tgt_node, sdt, options):
+             else:
+                 continue
+             val = bm_config.scan_reg_size(node, node['reg'].value, 0)
++
++            if label_name in label_dict:
++                if label_dict[label_name]['BASEADDR'] != val[0] or \
++                   label_dict[label_name]['HIGHADDR'] != val[0] + val[1] - 1:
++                   raise KeyError("Duplicate definition for {label_name}")
++            else:
++                label_dict[label_name] = { 'BASEADDR' : val[0] , 'HIGHADDR' : val[0] + val[1] - 1 }
++
+             plat.buf(f'\n/* Definitions for peripheral {label_name} */')
+             plat.buf(f'\n#define XPAR_{label_name}_BASEADDR {hex(val[0])}\n')
+             plat.buf(f'#define XPAR_{label_name}_HIGHADDR {hex(val[0] + val[1] - 1)}\n')
+@@ -379,12 +389,28 @@ def xlnx_generate_xparams(tgt_node, sdt, options):
+ 
+             canonical_name = node_ip_name.upper().replace("-", "_")
+ 
+-            plat.buf(f'\n/* Canonical definitions for peripheral {label_name} */')
+-            plat.buf(f'\n#define XPAR_{canonical_name}_{node_ip_count_dict[node_ip_name]}_BASEADDR {hex(val[0])}\n')
+-            plat.buf(f'#define XPAR_{canonical_name}_{node_ip_count_dict[node_ip_name]}_HIGHADDR {hex(val[0] + val[1] - 1)}\n')
++            if (f'{canonical_name}_{node_ip_count_dict[node_ip_name]}') in canonical_dict:
++                if canonical_dict[(f'{canonical_name}_{node_ip_count_dict[node_ip_name]}')]['BASEADDR'] != val[0] or \
++                   canonical_dict[(f'{canonical_name}_{node_ip_count_dict[node_ip_name]}')]['HIGHADDR'] != val[0] + val[1] - 1:
++                   raise KeyError("Duplicate definition for {canonical_name}")
++            else:
++                canonical_dict[(f'{canonical_name}_{node_ip_count_dict[node_ip_name]}')] = { 'BASEADDR' : val[0] , 'HIGHADDR' : val[0] + val[1] - 1 }
+         except KeyError:
+             pass
+ 
++    # Filter out anything already defined
++    for canonical_name in canonical_dict:
++        baseaddr = canonical_dict[canonical_name]['BASEADDR']
++        highaddr = canonical_dict[canonical_name]['HIGHADDR']
++
++        if canonical_name in label_dict:
++            # Already defined ... skip
++            continue
++
++        plat.buf(f'\n/* Canonical definitions for peripheral {canonical_name} */')
++        plat.buf(f'\n#define XPAR_{canonical_name}_BASEADDR {hex(baseaddr)}\n')
++        plat.buf(f'#define XPAR_{canonical_name}_HIGHADDR {hex(highaddr)}\n')
++
+     # Define for Board
+     if sdt.tree[tgt_node].propval('board') != ['']:
+         board = sdt.tree[tgt_node].propval('board', list)[0]
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
index 56cb8a45..26eda3fe 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,13 +1,16 @@
 SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master;protocol=https"
-SRCREV = "807435ae6fa0a07e8c84b458d138f3f54614eb5c"
+SRCREV = "c0facd087263a24a83f7fad917884348db03175d"
+
+SRC_URI += "file://0001-fixup-duplicates.patch"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/lopper:"
 
-BASEVERSION = "1.1.0"
+BASEVERSION = "1.2.0"
 
 RDEPENDS:${PN} += " \
     python3-ruamel-yaml \
     python3-anytree \
     python3-six \
     python3-pyyaml \
+    python3-packaging \
     "
diff --git a/meta-xilinx-core/gen-machine-conf b/meta-xilinx-core/gen-machine-conf
-Subproject 911941fc094dc0073c2f01a2b94de3cc6e993fe
+Subproject 3e691e28bf47876fb7e0c4be3c62be6b9d46bf8
diff --git a/meta-xilinx-core/lib/devtool/boot-jtag.py b/meta-xilinx-core/lib/devtool/boot-jtag.py
new file mode 100644
index 00000000..2d8a7d8f
--- /dev/null
+++ b/meta-xilinx-core/lib/devtool/boot-jtag.py
@@ -0,0 +1,274 @@
+# Copyright (C) 2021-2022, Xilinx, Inc.  All rights reserved.
+# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This script uses devtool and creates a boot-jtag.tcl script in
+# ${DEPLOY_DIR_IMAGE} directory. This script is executed by xsdb tool to boot
+# yocto generated images on HW via jtag boot mode.
+
+import os
+import glob
+import logging
+from devtool import setup_tinfoil
+
+logger = logging.getLogger('devtool')
+
+def bootjtag(args, config, basepath, workspace):
+    """Entry point for the devtool 'boot-jtag' subcommand"""
+
+    if not args.image:
+        print('\nINFO: Please specify the target image name. \n\nExample: --image core-image-minimal or petalinux-image-minimal')
+        return
+
+    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')
+        machine = rd.getVar('MACHINE')
+        arch =  rd.getVar('TARGET_ARCH')
+        soc = rd.getVar("SOC_FAMILY")
+        ddr_base_addr = rd.getVar('DDR_BASEADDR')
+        kernel_img_name = rd.getVar('KERNEL_IMAGE')
+        kernel_load_addr = rd.getVar('KERNEL_LOAD_ADDRESS')
+        dtb_load_addr = rd.getVar('DEVICETREE_ADDRESS')
+        rootfs_load_addr = rd.getVar('RAMDISK_IMAGE_ADDRESS')
+        machine_features = rd.getVar('MACHINE_FEATURES')
+        boot_mode = rd.getVar('BOOTMODE')
+        image_name_suffix = rd.getVar('IMAGE_NAME_SUFFIX')
+    finally:
+        tinfoil.shutdown()
+
+    if not args.hw_server:
+        print("\nINFO: --hw_server is null so default URL description of hw_server/TCF agent and port number is set to: " +  str(args.hw_server))
+
+    print("INFO: HW_SERVER Connected to: " + str(args.hw_server))
+    print("INFO: Using DISTRO IMAGE: " + str(args.image))
+
+    # Use arch for MB and SOC Family other devices.
+    if arch == 'microblazeel':
+        print("INFO: ARCH: " + arch)
+    else:
+        print("INFO: SOC FAMILY: " + soc)
+
+    # Load Address of boot.scr in DDR(Except for QSPI/OSPI/NAND boot)
+    # MB = (DDR base address + DDR Size) - 0xe00000
+    # Zynq 7000 = DDR base address + 0x3000000
+    # ZynqMP = DDR base address + 0x20000000
+    # Versal & Versal-net = DDR base address + 0x20000000
+    if arch == 'microblazeel':
+        # Assuming DDR size is 2GB
+        bootscr_addr = hex(int(ddr_base_addr, 16) + 0x80000000 - 0xe00000)
+    elif soc == 'zynq':
+        bootscr_addr = hex(int(ddr_base_addr, 16) + 0x3000000)
+    else:
+        bootscr_addr = hex(int(ddr_base_addr, 16) + 0x20000000)
+
+    print("INFO: MACHINE: " + machine)
+
+    if arch != 'microblazeel':
+        if "fpga-overaly" in machine_features:
+            print("INFO: fpga-overlay MACHINE_FEATURES is enabled, Hence PL bitstream or PDI will not be loaded at initial boot, User can load from u-boot or linux.")
+        else:
+            print("INFO: fpga-overlay MACHINE_FEATURES is not enabled, Hence PL bitstream or PDI will be loaded at initial boot.")
+
+    #dictionary with all required artifacts
+    data = {}
+
+    # For MB, Zynq 7000 and ZynqMP.
+    if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp':
+        if not "fpga-overaly" in machine_features:
+            data['bit'] = glob.glob(os.path.join(deploy_dir, '*' + machine + '.bit'))[0]
+        data['uboot'] = os.path.join(deploy_dir, 'u-boot.elf')
+        data['dtb'] = os.path.join(deploy_dir, machine + '-system.dtb')
+
+    if soc == 'zynq' or soc == 'zynqmp':
+        data['fsbl'] = os.path.join(deploy_dir, 'fsbl-' + machine + '.elf')
+
+    if soc == 'zynqmp':
+        data['atf'] = os.path.join(deploy_dir, 'arm-trusted-firmware.elf')
+        data['pmufw'] = os.path.join(deploy_dir, 'pmu-firmware-' + machine + '.elf')
+
+    if soc in ('versal', 'versal-net'):
+        data['bootbin'] = os.path.join(deploy_dir, 'boot.bin')
+
+    data['bootscr'] = os.path.join(deploy_dir, 'boot.scr')
+    data['kernel'] = os.path.join(deploy_dir, kernel_img_name)
+
+    if not args.norootfs:
+        data['rfs'] = os.path.join(deploy_dir, args.image + '-' + machine + image_name_suffix + '.cpio.gz.u-boot')
+
+    # Check if all the required boot images exists
+    for key in data:
+        if not os.path.isfile(data[key]):
+            print('INFO:' + key + ' does not exist.')
+            print('INFO: Please make sure you have run: \n\'MACHINE=' + machine + ' devtool build-image ' + args.image + '\'')
+            return
+
+    # Enable verbose mode
+    if args.verbose:
+        print("The following artifacts are being loaded:")
+        for key in data:
+            print('INFO: ' + key + ": " + data[key])
+
+    # Start writing xsdb script
+    lines = []
+    lines.append('# Run \'xsdb ' + deploy_dir + '/boot-jtag.tcl\' to execute this script.')
+    lines.append('connect -url ' + args.hw_server)
+
+    if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp':
+        lines.append('for {set i 0} {$i < 20} {incr i} {')
+        lines.append('    if { [ta] != "" } break;')
+        lines.append('    after 50')
+        lines.append('}')
+        if not "fpga-overaly" in machine_features:
+            lines.append('')
+            lines.append('puts stderr "INFO: Configuring the PL ..."')
+            lines.append('puts stderr "INFO: Downloading bitstream: ' + data['bit'] + '"')
+            lines.append('fpga -no-revision-check \"' + data['bit'] + '\"')
+
+    if soc == 'zynqmp':
+        # Disable Security gates to view PMU MB target
+        lines.append('')
+        lines.append('targets -set -nocase -filter {name =~ \"*PSU*\"}')
+
+        # By default, JTAG security gates are enabled. This disables security gates for DAP, PLTAP and PMU.
+        lines.append('mask_write 0xFFCA0038 0x1C0 0x1C0')
+        lines.append('targets -set -nocase -filter {name =~ \"*MicroBlaze PMU*\"}')
+        lines.append('')
+
+        # Check if the target is already stopped or cannot be stopped.
+        lines.append('catch {stop}; after 1000')
+        lines.append('')
+
+        # Download the pmufw.elf and run PMUFW
+        lines.append('puts stderr "INFO: Downloading PMUFW ELF file: ' + data['pmufw'] + '"')
+        lines.append('dow \"' + data['pmufw'] + '\"')
+        lines.append('con')
+
+        # Select A53 Core 0 to load and run FSBL
+        lines.append('targets -set -nocase -filter {name =~ \"*A53*#0\"}')
+
+        # Reset A53, If the reset is being triggered after powering on the device,
+        # write bootloop at reset vector address (0xffff0000), or use
+        # -clear-registers option, to avoid unpredictable behavior.
+        # Further warnings will be suppressed
+        lines.append('rst -processor -clear-registers')
+        lines.append('')
+    elif soc == 'versal':
+        # Download boot.bin to versal device
+        lines.append('targets -set -nocase -filter {name =~ \"*PMC*\"}')
+        lines.append('puts stderr "INFO: Downloading BOOT bin file: ' + data['bootbin'] + '"')
+        lines.append('device program \"' + data['bootbin'] + '\"')
+        lines.append('')
+        lines.append('targets -set -nocase -filter {name =~ \"*A72*#0\"}')
+        lines.append('stop')
+        lines.append('')
+        lines.append('targets -set -nocase -filter {name =~ \"*Versal*\"}')
+    elif soc == 'versal-net':
+        # Download boot.bin to versal device
+        lines.append('targets -set -nocase -filter {name =~ \"*PMC*\"}')
+        lines.append('puts stderr "INFO: Downloading BOOT bin file: ' + data['bootbin'] + '"')
+        lines.append('device program \"' + data['bootbin'] + '\"')
+        lines.append('')
+        lines.append('targets -set -nocase -filter {name =~ \"*A78*#0\"}')
+        lines.append('stop')
+        lines.append('')
+        lines.append('targets -set -nocase -filter {name =~ \"*Versal*\"}')
+    elif soc == 'zynq':
+        lines.append('targets -set -nocase -filter {name =~ \"arm*#0\"}')
+        # Check if the target is already stopped or cannot be stopped.
+        lines.append('catch {stop}; after 1000')
+        lines.append('')
+    else:
+        lines.append('targets -set -nocase -filter {name =~ \"microblaze*#0\"}')
+        # Check if the target is already stopped or cannot be stopped.
+        lines.append('catch {stop}; after 1000')
+        lines.append('')
+
+
+    if soc == 'zynq' or soc == 'zynqmp':
+        # Download FSBL for Zynq 7000 and ZynqMP
+        lines.append('puts stderr "INFO: Downloading FSBL ELF file: ' + data['fsbl'] + '"')
+        lines.append('dow \"' + data['fsbl'] + '\"')
+        lines.append('con')
+        lines.append('after 4000; stop')
+        lines.append('')
+
+    # Download U-boot and DTB for MB, Zynq 7000 and ZynqMP
+    if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp':
+        lines.append('puts stderr "INFO: Downloading U-boot ELF file: ' + data['uboot'] + '"')
+        lines.append('dow \"' + data['uboot'] + '\"')
+        lines.append('')
+        # For MB and Zynq 7000 we need to connect and stop before loading
+        # kernel images
+        if soc != 'zynqmp':
+            lines.append('con')
+            lines.append('after 1000; stop')
+        lines.append('puts stderr "INFO: Downloading DTB file: ' + data['dtb'] + ' at ' + dtb_load_addr + '"')
+        lines.append('dow -data \"' + data['dtb'] + '\" ' + dtb_load_addr)
+        lines.append('')
+
+    # Download Trusted Firmware-A(TF-A) for ZynqMP
+    # Note: TF-A elf should be loaded after u-boot elf in JTAG boot mode else
+    #       TF-A elf will not be loaded.
+    if soc == 'zynqmp':
+        lines.append('puts stderr "INFO: Downloading Trusted Firmware-A(TF-A) ELF file: ' + data['atf'] + '"')
+        lines.append('dow \"' + data['atf'] + '\"')
+        lines.append('')
+
+    # If BOOTMODE is xen then boot till u-boot only.
+    # Download Kernel Image for all architecture
+    if boot_mode != 'xen':
+        lines.append('puts stderr "INFO: Downloading Kernel Image file: ' + data['kernel'] + ' at ' + kernel_load_addr + '"')
+        lines.append('dow -data \"' + data['kernel'] + '\" ' + kernel_load_addr)
+        lines.append('')
+
+    # Download Rootfs
+    if not args.norootfs and boot_mode != 'xen':
+        lines.append('puts stderr "INFO: Downloading Rootfs file: ' + data['rfs'] + ' at ' + rootfs_load_addr + '"')
+        lines.append('dow -data \"' + data['rfs'] + '\" ' + rootfs_load_addr)
+        lines.append('')
+
+    lines.append('puts stderr "INFO: Downloading U-boot boot script: ' + data['bootscr'] + ' at ' + bootscr_addr + '"')
+    lines.append('dow -data \"' + data['bootscr'] + '\" ' + bootscr_addr)
+    lines.append('')
+
+    # Select A72 Core 0 to load and run Versal images
+    if soc == 'versal':
+        lines.append('targets -set -nocase -filter {name =~ \"*A72*#0\"}')
+
+    if soc == 'versal-net':
+        lines.append('targets -set -nocase -filter {name =~ \"*A78*#0\"}')
+
+    lines.append('con')
+    lines.append('exit\n')
+
+    script = os.path.join(deploy_dir, "boot-jtag.tcl")
+    with open(script, "w") as f:
+            f.write('\n'.join(lines))
+
+    print('INFO: HW JTAG boot tcl script written to '+ script + "\n" \
+        + 'INFO: User can run \'xsdb ' + script + '\' to execute.')
+
+    return 0
+
+def register_commands(subparsers, context):
+    """Register devtool subcommands from this plugin"""
+    parser_bootjtag = subparsers.add_parser('boot-jtag',
+                                            help='Script to deploy target images on HW via JTAG boot mode.',
+                                            description='Script to deploy target images on HW via JTAG boot mode. \
+                                                Example command: MACHINE=zcu102-zynqmp devtool boot-jtag --image ${image_name} --hw_server ${hw_server}')
+    required = parser_bootjtag.add_argument_group('required arguments')
+    required.add_argument('--image',
+                          help='Specify target image name. Example: core-image-minimal or petalinux-image-minimal')
+    parser_bootjtag.add_argument('--hw_server', nargs='?', default='TCP:localhost:3121',
+                                 help='URL description of hw_server/TCF agent and port number. (default: %(default)s) \
+                                     Example: --hw_server TCP:puffball12:3121')
+
+    parser_bootjtag.add_argument('-v', '--verbose',
+                                 help='verbose mode', action="store_true")
+    parser_bootjtag.add_argument('-n', '--norootfs',
+                                 help='Don\'t include rootfs', action='store_true')
+    parser_bootjtag.set_defaults(func=bootjtag, no_workspace=True)
diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb
new file mode 100644
index 00000000..7c402e15
--- /dev/null
+++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Image update is used to update alternate images on compatible firmware."
+SUMMARY = "Image update is used to update alternate image on compatible firmware. \
+        If the current image is ImageA, ImageB will get updated and vice versa. \
+        Usage: image_update <Input Image File>"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b"
+
+BRANCH = "master"
+SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https"
+SRCREV = "1bd7d7405b484d808176c6e711691a846c18b4f0"
+
+RDEPENDS:${PN} += "freeipmi"
+
+S = "${UNPACKDIR}/git"
+
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal-net"
+
+PACKAGE_ARCH:zynqmp = "${MACHINE_ARCH}"
+
+# Force the make system to use the flags we want!
+EXTRA_OEMAKE = 'CC="${CC} ${TARGET_CFLAGS} ${TARGET_LDFLAGS}" all'
+
+do_install () {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/image_update ${D}${bindir}/
+}
diff --git a/meta-xilinx-core/recipes-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..89a8b5a5
--- /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://LICENSE;md5=cc21c526211d34984839aa67dd16f172 \
+    file://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 = "${UNPACKDIR}/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.4.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb
index f86c5985..88d4995f 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb
@@ -1,18 +1,19 @@
 SUMMARY = "Xilinx AI Engine runtime"
 DESCRIPTION = "This library provides APIs for the runtime support of the Xilinx AI Engine IP"
 
-require aie-rt-2022.inc
+require aie-rt-2023.inc
 
 SECTION = "libs"
 
 AIEDIR ?= "${S}/driver"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 I = "${AIEDIR}/include"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "${SOC_VARIANT_ARCH}"
-PV = "3.3"
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "aie"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 IOBACKENDS ?= "Linux"
 
@@ -43,7 +44,3 @@ do_install(){
         install -d ${D}${libdir}
         cp -dr ${AIEDIR}/src/*.so* ${D}${libdir}
 }
-
-PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
-PACKAGE_ARCH:versal-ai-edge = "${SOC_VARIANT_ARCH}"
-
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
index 6a4fd880..0710a2bb 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
@@ -1,18 +1,19 @@
 SUMMARY = "Xilinx AI Engine runtime"
 DESCRIPTION = "This library provides APIs for the runtime support of the Xilinx AI Engine IP"
 
-require aie-rt.inc
+require aie-rt-2024.inc
 
 SECTION = "libs"
 
 AIEDIR ?= "${S}/driver"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 I = "${AIEDIR}/include"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "${SOC_VARIANT_ARCH}"
-PV = "3.3"
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "aie"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 IOBACKENDS ?= "Linux"
 
@@ -25,7 +26,7 @@ RPROVIDES:${PN}	= "libxaiengine"
 # The makefile isn't ready for parallel execution at the moment
 PARALLEL_MAKE = "-j 1"
 
-CFLAGS += "-Wall -Wextra -fno-thread-jumps -fno-tree-pre"
+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}'"
@@ -43,5 +44,3 @@ do_install(){
         install -d ${D}${libdir}
         cp -dr ${AIEDIR}/src/*.so* ${D}${libdir}
 }
-
-PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
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..5e825c0a
--- /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 = "${UNPACKDIR}/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-2022.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2022.inc
deleted file mode 100644
index 85121654..00000000
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2022.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "libs"
-
-REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https"
-
-BRANCH ?= "xlnx_rel_v2022.2"
-SRCREV ?= "ae24c8ede049906323510693f37e6167a963fd0e"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM ?= "file://license.txt;md5=b81abf1f508952331dd7d2ab36408f5b"
-
-SRC_URI = "${REPO};branch=${BRANCH}"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2023.inc
index 11059465..11059465 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2023.inc
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/aie-rt-2024.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc
new file mode 100644
index 00000000..98b3a049
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc
@@ -0,0 +1,11 @@
+SECTION = "libs"
+
+REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https"
+
+BRANCH ?= "xlnx_rel_v2024.1"
+SRCREV ?= "56af0110186dfd546c58d96ff1d2f4f2d91f7724"
+
+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.5.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb
index 2c6c9cd1..ab65f319 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb
@@ -1,16 +1,18 @@
 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-2022.inc
+require aie-rt-2023.inc
 
 SECTION = "devel"
 
 XAIEFAL_DIR ?= "fal"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "${SOC_VARIANT_ARCH}"
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "aie"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 IOBACKENDS ?= "Linux"
 
@@ -29,7 +31,3 @@ EXTRA_OECMAKE:append = "${@'-DWITH_EXAMPLES=ON' if d.getVar('WITH_EXAMPLES') ==
 FILES:${PN}-demos = " \
     ${bindir}/* \
 "
-
-PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
-PACKAGE_ARCH:versal-ai-edge = "${SOC_VARIANT_ARCH}"
-
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
index 641c39a9..11c88d34 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
@@ -1,16 +1,18 @@
 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.inc
+require aie-rt-2024.inc
 
 SECTION = "devel"
 
 XAIEFAL_DIR ?= "fal"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "${SOC_VARIANT_ARCH}"
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "aie"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 IOBACKENDS ?= "Linux"
 
@@ -23,11 +25,9 @@ DEPENDS = "libxaiengine"
 
 OECMAKE_SOURCEPATH = "${S}/${XAIEFAL_DIR}"
 
-EXTRA_OECMAKE = "-DWITH_TESTS=OFF "
+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}/* \
 "
-
-PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
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..ef9ff673
--- /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 = "${UNPACKDIR}/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 9249060c..09f83809 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
@@ -9,14 +9,12 @@ inherit deploy
 
 DEPENDS += "u-boot-mkimage-native"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
 
 SYSROOT_DIRS += "/boot"
 
-ATF_VERSION ?= "2.2"
-ATF_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}"
-PV = "${ATF_VERSION}${ATF_VERSION_EXTENSION}+git${SRCPV}"
+PV .= "+git"
 
 BRANCH ?= ""
 REPO ?= "git://github.com/Xilinx/arm-trusted-firmware.git;protocol=https"
@@ -30,6 +28,7 @@ ATF_BASE_NAME ?= "${PN}-${PKGE}-${PKGV}-${PKGR}${IMAGE_VERSION_SUFFIX}"
 COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -49,10 +48,12 @@ LD[unexport] = "1"
 ATF_CONSOLE_DEFAULT = ""
 ATF_CONSOLE_DEFAULT:zynqmp = "cadence"
 ATF_CONSOLE_DEFAULT:versal = "pl011"
+ATF_CONSOLE_DEFAULT:versal-net = "pl011"
 ATF_CONSOLE ?= "${ATF_CONSOLE_DEFAULT}"
 
 DEBUG_ATF_DEFAULT = ""
 DEBUG_ATF_DEFAULT:versal = "1"
+DEBUG_ATF_DEFAULT:versal-net = "1"
 DEBUG_ATF ?= "${DEBUG_ATF_DEFAULT}"
 
 EXTRA_OEMAKE:append:zynqmp = "${@' ZYNQMP_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}"
@@ -74,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 ''}"
 
@@ -127,3 +125,20 @@ 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/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.10-xilinx-v2024.1.bb
index f02bb879..683af4cf 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.10-xilinx-v2024.1.bb
@@ -1,6 +1,5 @@
-ATF_VERSION = "2.6"
-SRCREV = "67ca59c67f542322554d78820bf9ddaa736d6a84"
-BRANCH = "xlnx_rebase_v2.6"
+SRCREV = "4f82b6134e7b43722616c855e5016d42a3ea26d2"
+BRANCH = "xlnx_rebase_v2.10"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 
 
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.1.bb
index 2bcbe7d4..0246e2ff 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.1.bb
@@ -1,4 +1,3 @@
-ATF_VERSION = "2.8"
 SRCREV = "c9b71dc96f3f18ca94cad590612aae3224c8c84d"
 BRANCH = "xlnx_rebase_v2.8"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.2.bb
index 6ebd6cb5..e160f57c 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.2.bb
@@ -1,4 +1,3 @@
-ATF_VERSION = "2.8"
 SRCREV = "6be857cb66300fb21e3f61308e4197911c8ac30d"
 BRANCH = "xlnx_rebase_v2.8"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb
deleted file mode 100644
index 5ef2e6ac..00000000
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-ATF_VERSION = "2.6"
-SRCREV = "0897efd45ccad29a3dbab610578c70e3a52b2caa"
-BRANCH = "xlnx_rebase_v2.6"
-LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
-
-
-include arm-trusted-firmware.inc
-
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 deb8bb3d..28958c36 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,9 +4,12 @@ LICENSE = "CLOSED"
 
 PROVIDES = "virtual/base-pdi"
 
+INHIBIT_DEFAULT_DEPS = "1"
+
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:microblaze = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 
 PACKAGE_ARCH ?= "${MACHINE_ARCH}"
 
@@ -15,6 +18,8 @@ do_compile[noexec] = "1"
 PDI_PATH ?= ""
 SRC_URI += "${@['file://'+d.getVar('PDI_PATH'),''][d.getVar('PDI_PATH') == '']}"
 
+S = "${UNPACKDIR}"
+
 python() {
     if d.getVar('PDI_SKIP_CHECK') != "1" and not d.getVar('PDI_PATH'):
         raise bb.parse.SkipRecipe("PDI_PATH is not configured with the base design pdi")
@@ -24,9 +29,9 @@ python() {
 #will need to bbappend to this in meta-xilinx-tools to use xsct to extract pdi from xsa and install
 do_install() {
 
-    if [ -f ${WORKDIR}/${PDI_PATH} ];then
+    if [ -f ${S}/${PDI_PATH} ];then
         install -d ${D}/boot
-        install -m 0644 ${WORKDIR}/${PDI_PATH} ${D}/boot/base-design.pdi
+        install -m 0644 ${S}/${PDI_PATH} ${D}/boot/base-design.pdi
     else
         bbfatal "No base pdi supplied"
     fi
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
new file mode 100644
index 00000000..f4a96f41
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "Bootbin version string file"
+SUMMARY = "The BIF file for bootbin requires a version file in a specific format"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+COMPATIBLE_MACHINE = "^$"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BOOTBIN_VER_MAIN ?= ""
+
+BOOTBIN_VER_FILE = "bootbin-version-header.txt"
+BOOTBIN_VER_MAX_LEN = "36"
+
+BOOTBIN_MANIFEST_FILE ?= "bootbin-version-header.manifest"
+
+inherit deploy image-artifact-names
+
+IMAGE_NAME_SUFFIX = ""
+
+python do_configure() {
+
+    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.fatal("version string too long")
+
+    with open(d.expand("${B}/${BOOTBIN_VER_FILE}"), "w") as f:
+        f.write(version.encode("utf-8").hex())
+
+    with open(d.expand("${B}/${BOOTBIN_MANIFEST_FILE}"), "w") as f:
+        f.write("* %s\n" % d.getVar('PN'))
+        f.write("VERSION: %s\n" % version)
+        f.write("PV: %s\n" % d.getVar('PV'))
+        f.write("XILINX_VER_MAIN: %s\n" % d.getVar('XILINX_VER_MAIN'))
+        f.write("XILINX_VER_UPDATE: %s\n" % d.getVar('XILINX_VER_UPDATE'))
+        f.write("XILINX_VER_BUILD: %s\n\n" % d.getVar('XILINX_VER_BUILD'))
+}
+
+do_install() {
+    install -d ${D}/boot
+    install -m 0644 ${B}/${BOOTBIN_VER_FILE} ${D}/boot/
+}
+
+do_deploy() {
+    install -m 0644 ${B}/${BOOTBIN_VER_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.txt
+    ln -s ${IMAGE_NAME}.txt ${DEPLOYDIR}/${IMAGE_LINK_NAME}.txt
+    install -m 0644 ${B}/${BOOTBIN_MANIFEST_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.manifest
+    ln -s ${IMAGE_NAME}.manifest ${DEPLOYDIR}/${IMAGE_LINK_NAME}.manifest
+}
+
+addtask deploy after do_compile
+
+SYSROOT_DIRS += "/boot"
+FILES:${PN} += "/boot/${BOOTBIN_VER_FILE}"
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb
new file mode 100644
index 00000000..765d35e8
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Bootbin version file - text format"
+SUMMARY = "The BIF file for bootbin requires a version file in a text format"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+COMPATIBLE_MACHINE = "^$"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BOOTBIN_VER_MAIN ?= ""
+BOOTBIN_VER_SUFFIX ?= "${@(d.getVar('XILINX_VER_BUILD') or '')[:8] if d.getVar('XILINX_VER_UPDATE') != 'release' and not d.getVar('XILINX_VER_UPDATE').startswith('update') else ''}"
+BOOTBIN_VER_FILE = "bootbin-version-string.txt"
+
+#BOOTBIN_MANIFEST_FILE ?= "bootbin-version-header.manifest"
+
+inherit deploy image-artifact-names
+
+IMAGE_NAME_SUFFIX = ""
+
+python do_configure() {
+
+    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)
+}
+
+do_deploy() {
+     install -m 0644 ${B}/${BOOTBIN_VER_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.txt
+     ln -s ${IMAGE_NAME}.txt ${DEPLOYDIR}/${IMAGE_LINK_NAME}.txt
+#     install -m 0644 ${B}/${BOOTBIN_MANIFEST_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.manifest
+#     ln -s ${IMAGE_NAME}.manifest ${DEPLOYDIR}/${IMAGE_LINK_NAME}.manifest
+}
+
+addtask deploy after do_compile
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal-net.inc b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal-net.inc
new file mode 100644
index 00000000..46191720
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal-net.inc
@@ -0,0 +1 @@
+require machine-xilinx-versal.inc
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
index fff2c7a3..cd6adcef 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
+++ b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
@@ -4,6 +4,9 @@ BOOTGEN_EXTRA_ARGS += "-dump bh"
 # specify BIF common attribute for FSBL
 BIF_COMMON_ATTR ?= ""
 
+# specify BIF optional attributes
+BIF_OPTIONAL_DATA ?= ""
+
 #specify BIF partition attributes required for BOOT.bin
 BIF_FSBL_ATTR       ??= "base-pdi plmfw psmfw"
 BIF_ATF_ATTR        ??= "arm-trusted-firmware"
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 4c8bfa0e..2cf4606d 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
@@ -14,13 +16,15 @@ COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynq = ".*"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
+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}"
 
@@ -36,13 +40,27 @@ SRC_URI += "${@('file://' + d.getVar("BIF_FILE_PATH")) if d.getVar("BIF_FILE_PAT
 # zynqmp     : zynqmp
 # versal     : versal
 # versal-net : versalnet
-BOOTGEN_ARCH_DEFAULT = "${SOC_FAMILY}"
-BOOTGEN_ARCH_DEFAULT:versal-net = "${SOC_FAMILY}${SOC_VARIANT}"
+BOOTGEN_ARCH_DEFAULT = "undefined"
+BOOTGEN_ARCH_DEFAULT:zynq = "zynq"
+BOOTGEN_ARCH_DEFAULT:zynqmp = "zynqmp"
+BOOTGEN_ARCH_DEFAULT:versal = "versal"
+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)}"
+
+S = "${UNPACKDIR}"
+
 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))
@@ -125,13 +143,17 @@ python do_configure() {
         biffd.write("the_ROM_image:\n")
         biffd.write("{\n")
 
+        if d.getVar("BIF_OPTIONAL_DATA"):
+            opt_data = d.getVar("BIF_OPTIONAL_DATA") or ""
+            biffd.write("\toptionaldata { %s }\n" % opt_data)
+
         arch = d.getVar("SOC_FAMILY")
         bifattr = (d.getVar("BIF_COMMON_ATTR") or "").split()
         if bifattr:
             attrflags = d.getVarFlags("BIF_COMMON_ATTR") or {}
             if arch in ['zynq', 'zynqmp']:
                 create_zynq_bif(bifattr, attrflags,'','', 1, biffd, d)
-            elif arch in ['versal']:
+            elif arch in ['versal', 'versal-net']:
                 create_versal_bif(bifattr, attrflags,'','', 1, biffd, d)
             else:
                 create_bif(bifattr, attrflags,'','', 1, biffd, d)
@@ -143,7 +165,7 @@ python do_configure() {
             ids = d.getVarFlags("BIF_PARTITION_ID") or {}
             if arch in ['zynq', 'zynqmp']:
                 create_zynq_bif(bifpartition, attrflags, attrimage, ids, 0, biffd, d)
-            elif arch in ['versal']:
+            elif arch in ['versal', 'versal-net']:
                 create_versal_bif(bifpartition, attrflags, attrimage, ids, 0, biffd, d)
             else:
                 create_bif(bifpartition, attrflags, attrimage, ids, 0, biffd, d)
@@ -158,10 +180,10 @@ do_configure[vardeps] += "BIF_PARTITION_ATTR BIF_PARTITION_IMAGE BIF_COMMON_ATTR
 do_configure[vardeps] += "BIF_FSBL_ATTR BIF_BITSTREAM_ATTR BIF_ATF_ATTR BIF_DEVICETREE_ATTR BIF_SSBL_ATTR"
 
 do_compile() {
-    cd ${WORKDIR}
+    cd ${S}
     rm -f ${B}/BOOT.bin
     if [ "${BIF_FILE_PATH}" != "${B}/bootgen.bif" ];then
-        BIF_FILE_PATH="${WORKDIR}${BIF_FILE_PATH}"
+        BIF_FILE_PATH="${@os.path.join(d.getVar('S'), d.getVar('BIF_FILE_PATH'))}"
     fi
     bootgen -image ${BIF_FILE_PATH} -arch ${BOOTGEN_ARCH} ${BOOTGEN_EXTRA_ARGS} -w -o ${B}/BOOT.bin
     if [ ! -e ${B}/BOOT.bin ]; then
@@ -169,6 +191,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
@@ -176,7 +210,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}"
 
@@ -191,6 +225,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/bootgen/bootgen_1.0.bb b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb
deleted file mode 100644
index fdf28f41..00000000
--- a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Building and installing bootgen"
-DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stitch binary files together and generate device boot images"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += "openssl"
-RDEPENDS:${PN} += "openssl"
-
-REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
-BRANCH ?= "xlnx_rel_v2022.2"
-SRCREV = "cf4ba93b99644dc4429ef633471a639e1382f0e7"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-EXTRA_OEMAKE += 'CROSS_COMPILER="${CXX}" -C ${S}'
-CXXFLAGS:append = " -std=c++0x"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -Dm 0755 ${S}/bootgen ${D}${bindir}
-}
-
-FILES:${PN} = "${bindir}/bootgen"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2023.1.bb b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2023.1.bb
deleted file mode 100644
index a934230d..00000000
--- a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2023.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Building and installing bootgen"
-DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stitch binary files together and generate device boot images"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += "openssl"
-RDEPENDS:${PN} += "openssl"
-
-REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
-BRANCH = "xlnx_rel_v2023.1"
-SRCREV = "4f1e1caf2c09cdeacc35cbeedaf2550c6e44c7fd"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-EXTRA_OEMAKE += 'CROSS_COMPILER="${CXX}" -C ${S}'
-CXXFLAGS:append = " -std=c++0x"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -Dm 0755 ${S}/bootgen ${D}${bindir}
-}
-
-FILES:${PN} = "${bindir}/bootgen"
-
-BBCLASSEXTEND = "native nativesdk"
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 8b1e52ac..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
@@ -12,6 +12,7 @@ do_compile[depends] += "virtual/boot-bin:do_deploy"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal-net"
 
 PACKAGE_ARCH ?= "${MACHINE_ARCH}"
 
@@ -36,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 8d7211f5..0fc20298 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -23,7 +23,10 @@ inherit devicetree image-artifact-names
 SYSTEM_DTFILE ??= ""
 CONFIG_DTFILE ??= "${SYSTEM_DTFILE}"
 
-BASE_DTS ?= "${@os.path.basename(d.getVar('CONFIG_DTFILE') or '').rstrip('.dtb').rstrip('.dts') or 'system-top'}"
+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 ?= ""
 EXTRA_DTFILE_PREFIX ?= "system-top"
@@ -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,11 +47,12 @@ 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 = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 
 DEPENDS += "python3-dtc-native"
 
@@ -61,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.
@@ -69,20 +73,20 @@ do_configure:prepend () {
         mkdir -p ${DT_FILES_PATH}
     fi
 
-    for f in ${EXTRA_DT_FILES} ${EXTRA_OVERLAYS}; do
-        if [ "$(realpath ${WORKDIR}/${f})" != "$(realpath ${DT_FILES_PATH}/`basename ${f}`)" ]; then
-            cp ${WORKDIR}/${f} ${DT_FILES_PATH}/
+    for f in ${EXTRA_DT_FILES} ${EXTRA_DT_INCLUDE_FILES}; do
+        if [ "$(realpath ${UNPACKDIR}/${f})" != "$(realpath ${DT_FILES_PATH}/`basename ${f}`)" ]; then
+            cp ${UNPACKDIR}/${f} ${DT_FILES_PATH}/
         fi
     done
 }
 
 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
@@ -130,7 +134,7 @@ devicetree_do_install:append() {
         fi
         if [ -e "${D}/boot/devicetree/${DTB_FILE_NAME}" ]; then
             # We need the output to be system.dtb for WIC setup to match XSCT flow
-            ln -sf devicetree/${DTB_FILE_NAME} ${D}/boot/system.dtb
+            cp ${D}/boot/devicetree/${DTB_FILE_NAME} ${D}/boot/system.dtb
         else
             bberror "Expected filename ${DTB_FILE_NAME} doesn't exist in ${DEPLOYDIR}/devicetree"
         fi
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
index b4de4fe6..9e0f07ac 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
@@ -17,8 +17,9 @@ SOVERSION = "${SOMAJOR}.${SOMINOR}"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
index a4149d39..2699a55d 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
@@ -17,8 +17,9 @@ SOVERSION = "${SOMAJOR}.${SOMINOR}"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
index 0d24c9fc..da2f3e26 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
@@ -9,7 +9,7 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '
 SRC_URI = "${REPO};${BRANCHARG}"
 
 BRANCH = "xlnx_rel_v2023.2"
-SRCREV = "4dbd33accb043bd92ecbec2a3507f85a22045c51"
+SRCREV = "898fe38023d15d54402c788bcbca67a29eb2dc3d"
 SOMAJOR = "1"
 SOMINOR = "0"
 SOVERSION = "${SOMAJOR}.${SOMINOR}"
@@ -17,12 +17,13 @@ SOVERSION = "${SOMAJOR}.${SOMINOR}"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
-DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm"
+DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm systemd"
 RDEPENDS:${PN} += " freeipmi"
 EXTRA_OECMAKE += " \
                -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb
new file mode 100644
index 00000000..261156f9
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb
@@ -0,0 +1,73 @@
+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.1"
+SRCREV = "ec70363a2a878737057995f922a9460d18aafa26"
+SOMAJOR = "1"
+SOMINOR = "0"
+SOVERSION = "${SOMAJOR}.${SOMINOR}"
+
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal-net"
+
+S = "${UNPACKDIR}/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/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..8f634398
--- /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 = "${UNPACKDIR}/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/fsbl.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
index a704d3b5..ca18672b 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
@@ -4,7 +4,7 @@ LICENSE = "CLOSED"
 
 PROVIDES = "virtual/fsbl"
 
-INHERIT_DEFAULT_DEPENDS = "1"
+INHIBIT_DEFAULT_DEPS = "1"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynq = "zynq"
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/embeddedsw/plmfw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
index d398ca88..80063f85 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
@@ -5,10 +5,11 @@ LICENSE = "CLOSED"
 
 PROVIDES = "virtual/plm"
 
-INHERIT_DEFAULT_DEPENDS = "1"
+INHIBIT_DEFAULT_DEPS = "1"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 
 # Since we're just copying, we can run any config
 COMPATIBLE_HOST = ".*"
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
index 913e9088..344a6f7a 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
@@ -4,7 +4,7 @@ LICENSE = "CLOSED"
 
 PROVIDES = "virtual/pmu-firmware"
 
-INHERIT_DEFAULT_DEPENDS = "1"
+INHIBIT_DEFAULT_DEPS = "1"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
index 27f921b9..3fa6d98c 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
@@ -5,10 +5,11 @@ LICENSE = "CLOSED"
 
 PROVIDES = "virtual/psm-firmware"
 
-INHERIT_DEFAULT_DEPENDS = "1"
+INHIBIT_DEFAULT_DEPS = "1"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 
 # Since we're just copying, we can run any config
 COMPATIBLE_HOST = ".*"
diff --git a/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c b/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c
index 04777a91..281e1828 100644
--- a/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c
+++ b/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Copyright (C) 2019-2022 Xilinx, Inc.  All rights reserved.
- * Copyright (C) 2022 Advanced Micro Devices, Inc.  All rights reserved.
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc.  All rights reserved.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -75,6 +75,20 @@ int fpga_getplatform()
 
 }
 
+static bool file_exists(const char *filename)
+{
+        FILE *fp = fopen(filename, "r");
+        bool is_exist = false;
+
+        if (fp != NULL)
+        {
+                is_exist = true;
+                fclose(fp); // close the file
+        }
+
+        return is_exist;
+}
+
 void print_usage(char *prg)
 {
         int iszynqmp = fpga_getplatform();
@@ -252,6 +266,12 @@ int main(int argc, char **argv)
         struct stat sb;
         double time;
         struct timeval t1, t0;
+        uid_t euid = geteuid();
+
+        if (euid) {
+                printf("Error: This binary requires root access to execute. \n");
+                return 0;
+        }
 
         if (argc == 1) {
                 print_usage(basename(argv[0]));
@@ -262,10 +282,18 @@ int main(int argc, char **argv)
                 switch (opt) {
                 case 'o':
                         overlay = optarg;
+                        if (!file_exists(overlay)) {
+                                printf("Error: User provided Overlay file doesn't exist\r\n");
+                                return 1;
+                        }
                         flow = OVERLAY;
                         break;
                 case 'b':
                         binfile = optarg;
+                        if (!file_exists(binfile)) {
+                                printf("Error: User provided bitstream file doesn't exist\r\n");
+                                return 1;
+                        }
                         if (!(flow == OVERLAY))
                                 flow = FPGA_SYSFS;
                         break;
@@ -415,7 +443,11 @@ int main(int argc, char **argv)
                 if (binfile != NULL) {
                         if (!fpga_state()) {
                                 printf("Time taken to load BIN is %f Milli Seconds\n\r", time);
-                                printf("BIN FILE loaded through FPGA manager successfully\n\r");
+                                if (ret) {
+                                        printf("BIN FILE loaded through FPGA manager successfull but failed to apply Overlay\n\r");
+                                } else {
+                                        printf("BIN FILE loaded through FPGA manager successfully\n\r");
+                                }
                         } else {
                                 printf("BIN FILE loading through FPGA manager failed\n\r");
                         }
diff --git a/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb b/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
index d22c995c..f7eaa111 100644
--- a/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
@@ -1,12 +1,12 @@
 SUMMARY = "Install user script to support fpga-manager"
 DESCRIPTION = "Install user script that loads and unloads overlays using kernel fpga-manager"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/fpgautil.c;beginline=1;endline=24;md5=0c02eabf57dba52842c5df9b96bccfae"
+LIC_FILES_CHKSUM = "file://fpgautil.c;beginline=1;endline=24;md5=0dbf04c2c1026b3d120136e728b7a09f"
 
 SRC_URI = "\
         file://fpgautil.c \
         "
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
diff --git a/meta-xilinx-core/recipes-bsp/initramdisk/initramdisk-xilinx.bb b/meta-xilinx-core/recipes-bsp/initramdisk/initramdisk-xilinx.bb
index 2114eafd..af786e7e 100644
--- a/meta-xilinx-core/recipes-bsp/initramdisk/initramdisk-xilinx.bb
+++ b/meta-xilinx-core/recipes-bsp/initramdisk/initramdisk-xilinx.bb
@@ -18,18 +18,18 @@ do_install[vardepsexclude] += "DEPLOY_DIR_IMAGE"
 do_install[depends] += "${INITRAMFS_IMAGE}:do_image_complete"
 do_install[cleandirs] = "${D}"
 do_install() {
-        if [ -e ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.rootfs.cpio.gz.u-boot ]; then
+        if [ -e ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz.u-boot ]; then
                 install -d ${D}/boot/
-                install -m 0644 ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.rootfs.cpio.gz.u-boot ${D}/boot/.
+                install -m 0644 ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz.u-boot ${D}/boot/.
         else
-                bbfatal "Unable to find expected initramfs: ${INITRAMFS_IMAGE}-${MACHINE}.rootfs.cpio.gz.u-boot"
+                bbfatal "Unable to find expected initramfs: ${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz.u-boot"
         fi
 }
 
 PACKAGES = "${PACKAGE_BEFORE_PN} ${PN}"
 
 RPROVIDES:${PN} = "initramdisk"
-FILES:${PN} = "/boot/${INITRAMFS_IMAGE}-${MACHINE}.rootfs.cpio.gz.u-boot"
+FILES:${PN} = "/boot/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz.u-boot"
 
 python() {
     if not d.getVar('INITRAMFS_IMAGE'):
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb
index 2c180561..7727b93d 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb
@@ -13,8 +13,9 @@ SRCREV = "f2b7bbca9d6936141024becfb92266600eeefc2b"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.1.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.1.bb
index 287246c2..e64687f5 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.1.bb
@@ -13,8 +13,9 @@ SRCREV = "52c1d83c72a2b2e85d256411a199ed1baed12ae1"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.2.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.2.bb
index b3ccb884..06d991df 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.2.bb
@@ -13,8 +13,9 @@ SRCREV = "52c1d83c72a2b2e85d256411a199ed1baed12ae1"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
new file mode 100644
index 00000000..9eea4fbe
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
@@ -0,0 +1,24 @@
+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.1"
+REPO ?= "git://github.com/Xilinx/libdfx.git;protocol=https"
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+SRCREV = "c8275891ead62b3dfce68c00cf466715f0ac75f1"
+
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal-net"
+
+S = "${UNPACKDIR}/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/libdfx/libdfx_2024.2.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.2.bb
new file mode 100644
index 00000000..fcea2da7
--- /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 = "${UNPACKDIR}/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/platform-init/platform-init.bb b/meta-xilinx-core/recipes-bsp/platform-init/platform-init.bb
index 75c83ee8..a9c10d47 100644
--- a/meta-xilinx-core/recipes-bsp/platform-init/platform-init.bb
+++ b/meta-xilinx-core/recipes-bsp/platform-init/platform-init.bb
@@ -18,7 +18,7 @@ PROVIDES += "virtual/xilinx-platform-init"
 
 SRC_URI = "${@" ".join(["file://%s" % f for f in (d.getVar('PLATFORM_INIT_FILES') or "").split()])}"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 SYSROOT_DIRS += "${PLATFORM_INIT_DIR}"
 
diff --git a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb
index 44ad9368..2d36b4a8 100644
--- a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb
+++ b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://PMU_ROM-LICENSE.txt;md5=d43d49bc1eb1c907fc6f4ea75abaf
 SRC_URI = "https://www.xilinx.com/bin/public/openDownload?filename=PMU_ROM.tar.gz"
 SRC_URI[sha256sum] = "f9a450ef960979463ea0a87a35fafb4a5b62d3a741de30cbcef04c8edc22a7cf"
 
-S = "${WORKDIR}/PMU_ROM"
+S = "${UNPACKDIR}/PMU_ROM"
 
 inherit deploy native
 
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/files/0001-Remove-redundant-YYLOC-global-declaration.patch b/meta-xilinx-core/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
deleted file mode 100644
index 7091098c..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8127b19aa42ccfb3faae1173a12b3eb0cebf8941 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 30 Jan 2020 09:37:15 +0000
-Subject: [PATCH] Remove redundant YYLOC global declaration
-
-Same as the upstream fix for building dtc with gcc 10.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
-State: upstream (e33a814e772cdc36436c8c188d8c42d019fda639)
----
- scripts/dtc/dtc-lexer.l | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
-index fd825ebba6..24af549977 100644
---- a/scripts/dtc/dtc-lexer.l
-+++ b/scripts/dtc/dtc-lexer.l
-@@ -38,7 +38,6 @@ LINECOMMENT   "//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
- 
--YYLTYPE yylloc;
- extern bool treesource_error;
- 
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
--- 
-2.29.2
-
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend
index 65b6ad9d..8df497db 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend
@@ -1,5 +1,5 @@
 # Skip processing of this recipe if it is not explicitly specified as the
-# PREFERRED_PROVIDER for libmetal. This avoids network access required by
+# PREFERRED_PROVIDER for u-boot-tools. This avoids network access required by
 # the use of AUTOREV SRCREVs, which may be the default for some recipes.
 python () {
     if bb.data.inherits_class('native', d):
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.1.bb
index fe5ecf79..fe5ecf79 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.1.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.2.bb
index 43fec635..43fec635 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.2.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.1.bb
index 44636872..590d1755 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.1.bb
@@ -1,5 +1,5 @@
 require u-boot-tools-xlnx.inc
-require u-boot-xlnx-2022.2.inc
+require u-boot-xlnx-2024.1.inc
 
 # MUST clear CONFIG_VIDEO to avoid a compilation failure trying to construct
 # bmp_logo.h
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.2.bb
index eaf8d4ce..4214fdd9 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.2.bb
@@ -1,5 +1,5 @@
 require u-boot-tools-xlnx.inc
-require u-boot-xlnx-2022.1.inc
+require u-boot-xlnx-2024.2.inc
 
 # MUST clear CONFIG_VIDEO to avoid a compilation failure trying to construct
 # bmp_logo.h
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic-top.h b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic-top.h
deleted file mode 100644
index 08c1c16c..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic-top.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * This file is use for addition u-boot configurations for microblaze.
- */
-#include <configs/microblaze-generic.h>
-
-/* Core microblaze boot configurations */
-#define XILINX_USE_DCACHE       1
-#define CONFIG_CMD_IRQ
-#define CONFIG_DCACHE
-#define CONFIG_ICACHE
\ No newline at end of file
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2024.01/microblaze-generic.cfg
index 0f784f73..033fb197 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic.cfg
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2024.01/microblaze-generic.cfg
@@ -17,9 +17,9 @@
 # Definitions for Generic Microbalze machine.
 #
 CONFIG_BOOTDELAY=4
-CONFIG_SYS_TEXT_BASE=0x80100000
+CONFIG_TEXT_BASE=0x80100000
 CONFIG_SYS_PROMPT="U-Boot>"
-CONFIG_SYS_CONFIG_NAME="microblaze-generic-top"
+CONFIG_SYS_CONFIG_NAME="microblaze-generic"
 CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000
 # CONFIG_SYS_NS16550 is not set
 # CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set
@@ -79,3 +79,5 @@ CONFIG_SPI_FLASH_ISSI=y
 # CONFIG_CMD_EEPROM is not set
 # CONFIG_SYS_I2C_EEPROM_ADDR is not set
 # CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set
+CONFIG_DCACHE=y
+CONFIG_ICACHE=y
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
index 72f43f71..1fd191f0 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
@@ -1,5 +1,3 @@
-UBOOT_VERSION = "v2023.01"
-
 UBRANCH = "xlnx_rebase_v2023.01_update"
 
 SRCREV = "1689570b68dd3827e527a520805aa0bb7f58ee09"
@@ -15,3 +13,5 @@ HAS_PLATFORM_INIT ?= " \
                 "
 
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2023.01:"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
index 0cfbd846..3c8d1ed6 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
@@ -1,8 +1,6 @@
-UBOOT_VERSION = "v2023.01"
-
 UBRANCH = "xlnx_rebase_v2023.01"
 
-SRCREV = "0fc19cad5a07a09958443e7a5b6f11e420ef195c"
+SRCREV = "2b54ad6f1d278c419b927d10db2edf323d844578"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
@@ -15,3 +13,11 @@ HAS_PLATFORM_INIT ?= " \
                 "
 
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
+
+SRC_URI:append:microblaze = " file://microblaze-generic-top.h"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2023.01:"
+
+do_configure:prepend:microblaze () {
+    install ${UNPACKDIR}/microblaze-generic-top.h ${S}/include/configs/
+}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
index 6415861d..425bb029 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
@@ -1,8 +1,6 @@
-UBOOT_VERSION = "v2021.01"
+UBRANCH = "xlnx_rebase_v2024.01"
 
-UBRANCH ?= "xlnx_rebase_v2022.01"
-
-SRCREV = "b31476685debf5512ed0d4e8000fa5167a22f530"
+SRCREV = "fbed1010e50d75e7d25acc1c2d09e1c34cb7e882"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
@@ -15,3 +13,5 @@ HAS_PLATFORM_INIT ?= " \
                 "
 
 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-2022.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.2.inc
index a0c0b50d..feb9bbcd 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.2.inc
@@ -1,8 +1,6 @@
-UBOOT_VERSION = "v2021.01"
+UBRANCH = "xlnx_rebase_v2024.01"
 
-UBRANCH ?= "xlnx_rebase_v2022.01_2022.1_update"
-
-SRCREV = "91ad7924e7f59584d597353e1bb86794341e0a7e"
+SRCREV = "7f6ec94aac7eacfec07bd45c83a6d17df4b7d383"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
@@ -15,3 +13,5 @@ HAS_PLATFORM_INIT ?= " \
                 "
 
 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-common.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc
index b447c92a..387367c6 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc
@@ -1,6 +1,4 @@
-# Use the name of the .bb for the extension
-UBOOT_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}"
-PV = "${UBOOT_VERSION}${UBOOT_VERSION_EXTENSION}+git${SRCPV}"
+PV .= "+git"
 
 UBOOTURI ?= "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https"
 UBRANCH ?= ""
@@ -8,11 +6,9 @@ UBRANCHARG = "${@['nobranch=1', 'branch=${UBRANCH}'][d.getVar('UBRANCH', True) !
 
 SRC_URI = "${UBOOTURI};${UBRANCHARG}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-${UBOOT_VERSION}:"
-
 UBOOT_MB_INC = ""
 UBOOT_MB_INC:microblaze = "u-boot-xlnx-microblaze.inc"
 require ${UBOOT_MB_INC}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-dev.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
index c0005bc5..31cb420d 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
@@ -15,5 +15,5 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce
 SRCREV_DEFAULT = "aebea9d20a5aa32857f320c07ca8f9fd1b3dec1f"
 SRCREV ?= "${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/bootloader", "u-boot-xlnx-dev", "${AUTOREV}", "${SRCREV_DEFAULT}", d)}"
 
-PV = "${UBRANCH}-xilinx-dev+git${SRCPV}"
+PV = "${UBRANCH}-xilinx-dev+git"
 
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
index 2ef7b9cf..57c00c6e 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
@@ -1,11 +1,6 @@
 SRC_URI += " \
     file://microblaze-generic.cfg \
-    file://microblaze-generic-top.h \
     "
 
-do_configure:prepend () {
-    install ${WORKDIR}/microblaze-generic-top.h ${S}/include/configs/
-}
-
-# Disable buildpaths QA check warnings for u-boot-xlnx.elf.
-INSANE_SKIP:${PN}-elf += "buildpaths"
+# Disable buildpaths and arch QA check warnings for u-boot-xlnx.elf.
+INSANE_SKIP:${PN}-elf += "buildpaths arch"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
index 6410fc25..a8dfa57e 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
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 DEPENDS = "u-boot-mkimage-native"
 
+S = "${UNPACKDIR}"
+
 inherit deploy image-wic-utils
 
 INHIBIT_DEFAULT_DEPS = "1"
@@ -12,6 +14,7 @@ COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:zynq = "zynq"
 COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal-net = "versal"
 COMPATIBLE_MACHINE:microblaze = "microblaze"
 
 KERNELDT = "${@os.path.basename(d.getVar('KERNEL_DEVICETREE').split(' ')[0]) if d.getVar('KERNEL_DEVICETREE') else ''}"
@@ -25,6 +28,7 @@ PXERAMDISK_IMAGE ?= "${@'${RAMDISK_IMAGE1}' if d.getVar('INITRAMFS_IMAGE') and d
 KERNEL_BOOTCMD:zynqmp ?= "booti"
 KERNEL_BOOTCMD:zynq ?= "bootm"
 KERNEL_BOOTCMD:versal ?= "booti"
+KERNEL_BOOTCMD:versal-net ?= "booti"
 KERNEL_BOOTCMD:microblaze ?= "bootm"
 
 BOOTMODE ??= "generic"
@@ -37,6 +41,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 \
@@ -56,6 +63,7 @@ UENV_TEXTFILE ?= "uEnv.txt"
 UENV_MMC_OFFSET:zynqmp ??= "0x200000"
 UENV_MMC_OFFSET:zynq ??= "0x2080000"
 UENV_MMC_OFFSET:versal ??= "0x200000"
+UENV_MMC_OFFSET:versal-net ??= "0x200000"
 UENV_MMC_OFFSET:microblaze ??= "0x0"
 
 UENV_MMC_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('UENV_MMC_OFFSET'))}"
@@ -65,17 +73,20 @@ UBOOTPXE_CONFIG ?= "pxelinux.cfg"
 UBOOTPXE_CONFIG_NAME = "${UBOOTPXE_CONFIG}${IMAGE_VERSION_SUFFIX}"
 
 DEVICETREE_ADDRESS ?= "${@append_baseaddr(d,d.getVar('DEVICETREE_OFFSET'))}"
+DEVICETREE_ADDRESS_SD ?= "${DEVICETREE_ADDRESS}"
 
 DEVICETREE_OFFSET:microblaze ??= "0x1e00000"
 DEVICETREE_OFFSET:zynqmp ??= "0x100000"
 DEVICETREE_OFFSET:zynq ??= "0x100000"
 DEVICETREE_OFFSET:versal ??= "0x1000"
+DEVICETREE_OFFSET:versal-net ??= "0x1000"
 
 DEVICETREE_OVERLAY_OFFSET:microblaze ??= "0x1e00000"
 DEVICETREE_OVERLAY_OFFSET:zynqmp ??= "0x100000"
 DEVICETREE_OVERLAY_OFFSET:zynq ??= "0x100000"
 DEVICETREE_OVERLAY_OFFSET:versal ??= "0x1000"
-DEVICETREE_OVERLAY_PADSIZE ??= "0xf00000"
+DEVICETREE_OVERLAY_OFFSET:versal-net ??= "0x1000"
+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))}"
@@ -86,6 +97,7 @@ KERNEL_OFFSET:microblaze ??= "0x0"
 KERNEL_OFFSET:zynqmp ??= "0x200000"
 KERNEL_OFFSET:zynq ??= "0x200000"
 KERNEL_OFFSET:versal ??= "0x200000"
+KERNEL_OFFSET:versal-net ??= "0x200000"
 
 KERNEL_IMAGE ?= "${KERNEL_IMAGETYPE}"
 
@@ -95,6 +107,7 @@ RAMDISK_OFFSET:microblaze ??= "0x2e00000"
 RAMDISK_OFFSET:zynq ??= "0x4000000"
 RAMDISK_OFFSET:zynqmp ??= "0x4000000"
 RAMDISK_OFFSET:versal ??= "0x4000000"
+RAMDISK_OFFSET:versal-net ??= "0x4000000"
 
 FIT_IMAGE_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('FIT_IMAGE_OFFSET'))}"
 FIT_IMAGE_OFFSET ??= "0x10000000"
@@ -140,18 +153,25 @@ QSPI_RAMDISK_SIZE:zynqmpdr ??= "0x1D00000"
 ## For versal
 ## Load boot.scr at 0x7F80000 -> 127MB of QSPI/NAND Memory
 QSPI_KERNEL_OFFSET:versal ??= "0xF00000"
+QSPI_KERNEL_OFFSET:versal-net ??= "0xF00000"
 QSPI_RAMDISK_OFFSET:versal ??= "0x2E00000"
+QSPI_RAMDISK_OFFSET:versal-net ??= "0x2E00000"
 
 NAND_KERNEL_OFFSET:versal ??= "0x4100000"
+NAND_KERNEL_OFFSET:versal-net ??= "0x4100000"
 NAND_RAMDISK_OFFSET:versal ??= "0x8200000"
+NAND_RAMDISK_OFFSET:versal-net ??= "0x8200000"
 
 QSPI_KERNEL_SIZE:versal ??= "0x1D00000"
+QSPI_KERNEL_SIZE:versal-net ??= "0x1D00000"
 QSPI_RAMDISK_SIZE:versal ??= "0x4000000"
+QSPI_RAMDISK_SIZE:versal-net ??= "0x4000000"
 
 QSPI_KERNEL_IMAGE:microblaze ?= "image.ub"
 QSPI_KERNEL_IMAGE:zynq ?= "image.ub"
 QSPI_KERNEL_IMAGE:zynqmp ?= "image.ub"
 QSPI_KERNEL_IMAGE:versal ?= "image.ub"
+QSPI_KERNEL_IMAGE:versal-net ?= "image.ub"
 
 NAND_KERNEL_IMAGE ?= "image.ub"
 
@@ -214,6 +234,7 @@ do_compile() {
         -e 's/@@KERNEL_LOAD_ADDRESS@@/${KERNEL_LOAD_ADDRESS}/' \
         -e 's/@@DEVICE_TREE_NAME@@/${DEVICE_TREE_NAME}/' \
         -e 's/@@DEVICETREE_ADDRESS@@/${DEVICETREE_ADDRESS}/' \
+        -e 's/@@DEVICETREE_ADDRESS_SD@@/${DEVICETREE_ADDRESS_SD}/' \
         -e 's/@@DEVICETREE_OVERLAY_ADDRESS@@/${DEVICETREE_OVERLAY_ADDRESS}/' \
         -e 's/@@RAMDISK_IMAGE@@/${RAMDISK_IMAGE}/' \
         -e 's/@@RAMDISK_IMAGE_ADDRESS@@/${RAMDISK_IMAGE_ADDRESS}/' \
@@ -249,23 +270,24 @@ do_compile() {
         -e 's:@@KERNEL_ROOT_RAMDISK@@:${KERNEL_ROOT_RAMDISK}:' \
         -e 's:@@KERNEL_COMMAND_APPEND@@:${KERNEL_COMMAND_APPEND}:' \
         ${SCRIPT_SED_ADDENDUM} \
-        "${WORKDIR}/boot.cmd.${BOOTMODE}${BOOTFILE_EXT}" > "${WORKDIR}/boot.cmd"
+        "${S}/boot.cmd.${BOOTMODE}${BOOTFILE_EXT}" > boot.cmd
 
-    mkimage -A arm -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr
+    mkimage -A arm -T script -C none -n "Boot script" -d boot.cmd boot.scr
 
     sed -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \
         -e 's/@@DEVICE_TREE_NAME@@/${DEVICE_TREE_NAME}/' \
         -e 's/@@RAMDISK_IMAGE@@/${PXERAMDISK_IMAGE}/' \
-        "${WORKDIR}/pxeboot.pxe" > "pxeboot.pxe"
+        "${S}/pxeboot.pxe" > "pxeboot.pxe"
 }
 
 do_install() {
     install -d ${D}/boot
     install -m 0644 boot.scr ${D}/boot/${UBOOTSCR_BASE_NAME}.scr
-    ln -sf ${UBOOTSCR_BASE_NAME}.scr ${D}/boot/boot.scr
+    install -m 0644 boot.scr ${D}/boot/
     install -d ${D}/boot/pxeboot/${UBOOTPXE_CONFIG_NAME}
     install -m 0644 pxeboot.pxe ${D}/boot/pxeboot/${UBOOTPXE_CONFIG_NAME}/default
-    ln -sf pxeboot/${UBOOTPXE_CONFIG_NAME} ${D}/boot/${UBOOTPXE_CONFIG}
+    install -d ${D}/boot/${UBOOTPXE_CONFIG}/
+    install -m 0644 pxeboot.pxe ${D}/boot/${UBOOTPXE_CONFIG}/default
 }
 
 FILES:${PN} = "/boot/*"
@@ -273,10 +295,11 @@ FILES:${PN} = "/boot/*"
 do_deploy() {
     install -d ${DEPLOYDIR}
     install -m 0644 boot.scr ${DEPLOYDIR}/${UBOOTSCR_BASE_NAME}.scr
-    ln -sf ${UBOOTSCR_BASE_NAME}.scr ${DEPLOYDIR}/boot.scr
+    install -m 0644 boot.scr ${DEPLOYDIR}/
     install -d ${DEPLOYDIR}/pxeboot/${UBOOTPXE_CONFIG_NAME}
     install -m 0644 pxeboot.pxe ${DEPLOYDIR}/pxeboot/${UBOOTPXE_CONFIG_NAME}/default
-    ln -sf pxeboot/${UBOOTPXE_CONFIG_NAME} ${DEPLOYDIR}/${UBOOTPXE_CONFIG}
+    install -d ${DEPLOYDIR}/${UBOOTPXE_CONFIG}/
+    install -m 0644 pxeboot.pxe ${DEPLOYDIR}/${UBOOTPXE_CONFIG}/default
 }
 
 addtask do_deploy after do_compile before do_build
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic
index d99932ed..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}"
@@ -39,25 +38,25 @@ do
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@KERNEL_LOAD_ADDRESS@@ ${kernel_name};
                 fi
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /system.dtb; then
-                        fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_ADDRESS@@ system.dtb;
-                        setenv fdtcontroladdr @@DEVICETREE_ADDRESS@@
+                        fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_ADDRESS_SD@@ system.dtb;
+                        setenv fdtcontroladdr @@DEVICETREE_ADDRESS_SD@@
                 fi
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /devicetree/openamp.dtbo; then
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_OVERLAY_ADDRESS@@ devicetree/openamp.dtbo;
-                        fdt addr @@DEVICETREE_ADDRESS@@
+                        fdt addr @@DEVICETREE_ADDRESS_SD@@
                         fdt resize 8192
                         fdt apply @@DEVICETREE_OVERLAY_ADDRESS@@
                 fi
                 run update_bootargs
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /${ramdisk_name} && test "${skip_tinyramdisk}" != "yes"; then
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@RAMDISK_IMAGE_ADDRESS@@ ${ramdisk_name};
-                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@
+                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS_SD@@
                 fi
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /${rootfs_name} && test "${skip_ramdisk}" != "yes"; then
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@RAMDISK_IMAGE_ADDRESS@@ ${rootfs_name};
-                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@
+                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS_SD@@
                 fi
-                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ - @@DEVICETREE_ADDRESS@@
+                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ - @@DEVICETREE_ADDRESS_SD@@
         fi
         if test "${boot_target}" = "xspi0" || test "${boot_target}" = "xspi1" || test "${boot_target}" = "qspi" || test "${boot_target}" = "qspi0"; then
                 sf probe 0 0 0;
@@ -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-scr/boot.cmd.sd.versal b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal
index d726187a..36a8f92d 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal
@@ -1,7 +1,7 @@
 @@PRE_BOOTENV@@
 
 setenv sdbootdev @@SDBOOTDEV@@
-setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon clk_ignore_unused
+setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon
 fatload mmc $sdbootdev @@DEVICETREE_ADDRESS@@ @@DEVICE_TREE_NAME@@
 fatload mmc $sdbootdev:$partid @@KERNEL_LOAD_ADDRESS@@ @@KERNEL_IMAGETYPE@@
 @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ - @@DEVICETREE_ADDRESS@@
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp
index bddab5d0..ac7438bb 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp
@@ -1,7 +1,7 @@
 @@PRE_BOOTENV@@
 
 setenv sdbootdev @@SDBOOTDEV@@
-setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon clk_ignore_unused
+setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon
 if test -n "@@BITSTREAM@@"; then
    fatload mmc $sdbootdev @@BITSTREAM_LOAD_ADDRESS@@ @@BITSTREAM_IMAGE@@ && fpga @@BITSTREAM_LOAD_TYPE@@ 0 @@BITSTREAM_LOAD_ADDRESS@@ ${filesize}
 fi
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs
index dca974ab..fde094cf 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs
@@ -7,6 +7,10 @@
 
 for boot_target in ${boot_targets};
 do
+        echo "Trying to load boot images from ${boot_target}"
+        if test "${boot_target}" = "jtag" ; then
+                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@
+        fi
         if test "${boot_target}" = "xspi0" || test "${boot_target}" = "qspi" || test "${boot_target}" = "qspi0"; then
                 ubifsls @@FIT_IMAGE@@
                 if test $? = 0; then
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
index 228396eb..53355f28 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_load_address"] = d.getVar("KERNEL_LOAD_ADDRESS")
+    env["kernel_image"] = d.getVar("KERNEL_IMAGETYPE") or ''
+    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_overlay_load_address" ] = d.getVar("DEVICETREE_OVERLAY_LOAD_ADDRESS")
+    env["devicetree_load_address"] = d.getVar("DEVICETREE_LOAD_ADDRESS") or ''
+    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"]:
-        env["bootkernel"] = "setenv bootargs " +  d.getVar("KERNEL_BOOTARGS") + " ; " + env["bootkernel"]
+    if (d.getVar("SOC_FAMILY") or '') in ["zynqmp"]:
+        env["bootkernel"] = "setenv bootargs " +  (d.getVar("KERNEL_BOOTARGS") or '') + " ; " + env["bootkernel"]
 
     # default uenvcmd does not load bitstream
     env["uenvcmd"] = "run bootkernel"
@@ -83,17 +83,18 @@ DEPENDS:append := " virtual/kernel ${@remove_task_from_depends(d)}"
 
 # bootargs, default to booting with the rootfs device being partition 2
 KERNEL_BOOTARGS:zynq = "earlyprintk console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait"
-KERNEL_BOOTARGS:zynqmp = "earlycon clk_ignore_unused root=/dev/mmcblk${devnum}p2 rw rootwait"
+KERNEL_BOOTARGS:zynqmp = "earlycon root=/dev/mmcblk${devnum}p2 rw rootwait"
 
 KERNEL_LOAD_ADDRESS:zynq = "0x2080000"
 KERNEL_LOAD_ADDRESS:zynqmp = "0x200000"
 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)
-    with open(d.expand("${WORKDIR}/uEnv.txt"), "w") as f:
+    with open(d.expand("uEnv.txt"), "w") as f:
         for k, v in env.items():
             f.write("{0}={1}\n".format(k, v))
 }
@@ -101,11 +102,11 @@ python do_compile() {
 FILES:${PN} += "/boot/uEnv.txt"
 
 do_install() {
-        install -Dm 0644 ${WORKDIR}/uEnv.txt ${D}/boot/uEnv.txt
+        install -Dm 0644 uEnv.txt ${D}/boot/uEnv.txt
 }
 
 do_deploy() {
-        install -Dm 0644 ${WORKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv.txt
+        install -Dm 0644 uEnv.txt ${DEPLOYDIR}/uEnv.txt
 }
 addtask do_deploy after do_compile before do_build
 
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
index 4c7ea934..e2ee2c3f 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -7,7 +7,7 @@ require u-boot-xlnx-common.inc
 
 SYSROOT_DIRS += "/boot"
 
-BASE_DTS ?= "${@os.path.basename(d.getVar('CONFIG_DTFILE') or '').rstrip('.dtb').rstrip('.dts') or 'system-top'}"
+BASE_DTS ?= "${@os.path.splitext(os.path.basename(d.getVar('CONFIG_DTFILE') or ''))[0] or 'system-top'}"
 DTB_PATH ?= "boot/devicetree/"
 DTB_FILE_NAME ?= ""
 
@@ -75,7 +75,7 @@ do_deploy:prepend() {
     fi
 
     # In ZynqMP u-boot.dtb is generated by default but not for versal, Hence manually deploy.
-    if [ "${SOC_FAMILY}" == "versal" ]; then
+    if [ "${SOC_FAMILY}" == "versal" -o "${SOC_FAMILY}" == "versal-net" ]; then
         if [ -f ${B}/arch/arm/dts/${UBOOT_USER_SPECIFIED_DTS}.dtb ]; then
             install -Dm 0644 ${B}/arch/arm/dts/${UBOOT_USER_SPECIFIED_DTS}.dtb ${DEPLOYDIR}/u-boot.dtb
         fi
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.1.bb
index fd76bc51..fd76bc51 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.1.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.2.bb
index 22075424..22075424 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.2.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.1.bb
index c1c45e56..718ad9d4 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.1.bb
@@ -1,4 +1,4 @@
 
 require u-boot-xlnx.inc
 require u-boot-spl-zynq-init.inc
-require u-boot-xlnx-2022.1.inc
+require u-boot-xlnx-2024.1.inc
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.2.bb
index b10f321b..bcadf1e4 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.2.bb
@@ -1,4 +1,4 @@
 
 require u-boot-xlnx.inc
 require u-boot-spl-zynq-init.inc
-require u-boot-xlnx-2022.2.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-core/images/core-image-ptest-all.bbappend b/meta-xilinx-core/recipes-core/images/core-image-ptest-all.bbappend
index fd3a3c11..8901a611 100644
--- a/meta-xilinx-core/recipes-core/images/core-image-ptest-all.bbappend
+++ b/meta-xilinx-core/recipes-core/images/core-image-ptest-all.bbappend
@@ -3,3 +3,4 @@ QB_MEM:microblaze = "-m 2G"
 QB_MEM:zynq       = "-m 1G"
 QB_MEM:zynqmp     = "-m 4G"
 QB_MEM:versal     = "-m 16G"
+QB_MEM:versal-net = "-m 16G"
diff --git a/meta-xilinx-core/recipes-core/images/core-image-ptest-all.bbppend b/meta-xilinx-core/recipes-core/images/core-image-ptest-all.bbppend
deleted file mode 100644
index fd3a3c11..00000000
--- a/meta-xilinx-core/recipes-core/images/core-image-ptest-all.bbppend
+++ /dev/null
@@ -1,5 +0,0 @@
-# Minimum board memory required for each type
-QB_MEM:microblaze = "-m 2G"
-QB_MEM:zynq       = "-m 1G"
-QB_MEM:zynqmp     = "-m 4G"
-QB_MEM:versal     = "-m 16G"
diff --git a/meta-xilinx-core/recipes-core/images/core-image-ptest-fast.bbappend b/meta-xilinx-core/recipes-core/images/core-image-ptest-fast.bbappend
index e748c9e4..e7133ca9 100644
--- a/meta-xilinx-core/recipes-core/images/core-image-ptest-fast.bbappend
+++ b/meta-xilinx-core/recipes-core/images/core-image-ptest-fast.bbappend
@@ -3,6 +3,7 @@ QB_MEM:microblaze = "-m 2G"
 QB_MEM:zynq       = "-m 1G"
 QB_MEM:zynqmp     = "-m 4G"
 QB_MEM:versal     = "-m 16G"
+QB_MEM:versal-net = "-m 16G"
 
 # Zynq can't build qemu-xilinx or it's ptests
 PTESTS_FAST:remove:zynq = "qemu-ptest"
diff --git a/meta-xilinx-core/recipes-core/images/core-image-ptest.bbappend b/meta-xilinx-core/recipes-core/images/core-image-ptest.bbappend
index fd3a3c11..8901a611 100644
--- a/meta-xilinx-core/recipes-core/images/core-image-ptest.bbappend
+++ b/meta-xilinx-core/recipes-core/images/core-image-ptest.bbappend
@@ -3,3 +3,4 @@ QB_MEM:microblaze = "-m 2G"
 QB_MEM:zynq       = "-m 1G"
 QB_MEM:zynqmp     = "-m 4G"
 QB_MEM:versal     = "-m 16G"
+QB_MEM:versal-net = "-m 16G"
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-bsp/bootgen/bootgen_2023.2.bb b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.2.bb
index 03f323e1..0a929ca9 100644
--- a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2023.2.bb
+++ b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.2.bb
@@ -4,14 +4,14 @@ DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stit
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 DEPENDS += "openssl"
 RDEPENDS:${PN} += "openssl"
 
 REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
-BRANCH = "xlnx_rel_v2023.2"
-SRCREV = "8e6702bb5064b806e45028486de7376962470a36"
+BRANCH = "xlnx_rel_v2024.2"
+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-anytree_2.8.0.bb b/meta-xilinx-core/recipes-devtools/python/python3-anytree_2.8.0.bb
index 8bd6e6bc..20210be9 100644
--- a/meta-xilinx-core/recipes-devtools/python/python3-anytree_2.8.0.bb
+++ b/meta-xilinx-core/recipes-devtools/python/python3-anytree_2.8.0.bb
@@ -10,7 +10,7 @@ DEPENDS += "python3-six"
 SRC_URI = "git://github.com/c0fec0de/anytree.git;branch=2.x.x;protocol=https"
 SRCREV = "75c0198636f8997967ba00df5077cd21350f68ce"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit setuptools3
 
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 370e694b..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
@@ -5,66 +5,147 @@ import os
 import subprocess
 import sys
 import tempfile
+import re
 import shutil
 
 binpath = os.path.dirname(os.path.abspath(__file__))
 mach_path = tempfile.mkdtemp()
 
-
 # Separate PMU and APU arguments
 APU_args = sys.argv[1:]
-mbtype=''
+PMU_args = []
+PLM_args = []
+bootbin_arg = None
 
 if '-pmu-args' in APU_args:
-    MB_args = APU_args[APU_args.index('-pmu-args')+1]
-    APU_args.remove('-pmu-args')
-    APU_args.remove(MB_args)
-    MB_args = MB_args.split()
-    PMU_rom = MB_args[MB_args.index('-kernel')+1]
-    mbtype='PMU'
-elif '-plm-args' in APU_args:
-    MB_args = APU_args[APU_args.index('-plm-args')+1]
-    APU_args.remove('-plm-args')
-    APU_args.remove(MB_args)
-    MB_args = MB_args.split()
-    mbtype='PLM'
-elif '--help' in APU_args:
-    mbtype='help'
-else:
-    error_msg = '\nMultiarch not setup properly.'
-    sys.exit(error_msg)
-
-error_msg = None
-if (mbtype == 'PMU' and os.path.exists(PMU_rom)) or mbtype == 'PLM':
-
-    # We need to switch tcp serial arguments (if they exist, e.g. qemurunner) to get the output correctly
-    tcp_serial_ports = [i for i, s in enumerate(APU_args) if 'tcp:127.0.0.1:' in s]
-
-    #NEED TO FIX for next yocto release (dont need to switch ports anymore, they will be provided correctly upstream
-    # We can only switch these if there are exactly two, otherwise we can't assume what is being executed so we leave it as is
-    if len(tcp_serial_ports) == 2:
-        APU_args[tcp_serial_ports[0]],APU_args[tcp_serial_ports[1]] = APU_args[tcp_serial_ports[1]],APU_args[tcp_serial_ports[0]]
-
-    mb_cmd =  binpath + '/qemu-system-microblazeel ' + ' '.join(MB_args) + ' -machine-path ' + mach_path
-    apu_cmd =  binpath + '/qemu-system-aarch64 ' + ' '.join(APU_args) + ' -machine-path ' + mach_path
-
-    # Debug prints
-    print('\n%s instance cmd: %s\n' % (mbtype, mb_cmd))
-    print('APU instance cmd: %s\n' % apu_cmd)
-
-
-    # Invoke QEMU pmu instance
-    process_pmu = subprocess.Popen(mb_cmd, shell=True, stderr=subprocess.PIPE)
-
-    # Invoke QEMU APU instance
+    pmu_args_idx = APU_args.index('-pmu-args')
+    PMU_args = APU_args[pmu_args_idx+1].split()
+    del APU_args[pmu_args_idx:pmu_args_idx+2]
+
+if '-plm-args' in APU_args:
+    plm_args_idx = APU_args.index('-plm-args')
+    PLM_args = APU_args[plm_args_idx+1].split()
+    del APU_args[plm_args_idx:plm_args_idx+2]
+
+if '-bootbin' in APU_args:
+    bootbin_args_idx = APU_args.index('-bootbin')
+    bootbin_arg = APU_args[bootbin_args_idx+1]
+    del APU_args[bootbin_args_idx:bootbin_args_idx+2]
+
+if PMU_args and PLM_args:
+    sys.exit("\nError: -pmu-args can not be used with -plm-args\n")
+
+help_options = ['-h', '-help', '--help']
+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")
+    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:
+    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}'
+            '\nSee "meta-xilinx/README.qemu.md" for more information on accquiring the PMU ROM.\n')
+
+if bootbin_arg:
+    if not os.path.isfile(bootbin_arg):
+        print(f"\nERROR: bootbin file not found at {bootbin_arg}"
+            "       Please build and ospi_image or set QB_OSPI_BIN variable to prebuilt file\n")
+        sys.exit(1)
+
+    shutil.copyfile(bootbin_arg, f'{mach_path}/boot.bin')
+
+    bootgen_command = [f'{binpath}/bootgen', '-arch', 'versal', '-dump', 'boot.bin']
+    subprocess.run(bootgen_command + ['bh'], check=True, cwd=mach_path, stdout=subprocess.DEVNULL)
+    subprocess.run(bootgen_command + ['plm'], check=True, cwd=mach_path, stdout=subprocess.DEVNULL)
+    subprocess.run(bootgen_command + ['pmc_cdo'], check=True, cwd=mach_path, stdout=subprocess.DEVNULL)
+
+    bootgen_command = f"{binpath}/bootgen -arch versal -read {bootbin_arg}"
+    result = subprocess.check_output(bootgen_command.split())
+    bootgen_output = result.decode().splitlines()
+
+    for i, l in enumerate(bootgen_output):
+        if 'PARTITION HEADER TABLE (pmc_subsys.0.0)' in l:
+            plm_line = bootgen_output[i+4]
+        if 'BOOT HEADER' in l:
+            pmc_line = bootgen_output[i+6]
+
+    plm_load_addr = re.search(r"exec_addr_lo \(0x10\) : (0x\w*)\s*", plm_line).group(1)
+    pmc_load_addr = re.search(r"pmccdo_load_addr \(0x20\) : (0x\w*)", pmc_line).group(1)
+
+    PLM_args.append(f"-device loader,file={mach_path}/boot_bh.bin,addr=0xF201E000,force-raw=on")
+    PLM_args.append(f"-device loader,file={mach_path}/pmc_cdo.bin,addr={pmc_load_addr},force-raw=on")
+    PLM_args.append(f"-device loader,file={mach_path}/plm.bin,addr={plm_load_addr},force-raw=on")
+    PLM_args.append(f"-device loader,addr={plm_load_addr},cpu-num=1")
+
+# We need to switch tcp serial arguments (if they exist, e.g. qemurunner) to get the output
+tcp_serial_ports = [i for i, s in enumerate(APU_args) if 'tcp:127.0.0.1:' in s]
+
+#FIXME for next yocto release (dont need to switch ports anymore, they will be provided correctly upstream
+# We can only switch these if there are exactly two, otherwise we can't assume what is being executed so we leave it as is
+if len(tcp_serial_ports) == 2:
+    APU_args[tcp_serial_ports[0]],APU_args[tcp_serial_ports[1]] = APU_args[tcp_serial_ports[1]],APU_args[tcp_serial_ports[0]]
+
+mb_cmd = ""
+if PMU_args:
+    pmu_args_s = ' '.join(PMU_args)
+    mb_cmd = f'{binpath}/qemu-system-microblazeel {pmu_args_s} -machine-path {mach_path}'
+    print(f"PMU instance cmd: {mb_cmd}\n")
+
+if PLM_args:
+    plm_args_s = ' '.join(PLM_args)
+    mb_cmd = f'{binpath}/qemu-system-microblazeel {plm_args_s} -machine-path {mach_path}'
+    print(f"PLM instance cmd: {mb_cmd}\n")
+
+apu_args_s = ' '.join(APU_args)
+apu_cmd = f'{binpath}/qemu-system-aarch64 {apu_args_s} -machine-path {mach_path}'
+print(f"APU instance cmd: {apu_cmd}\n")
+
+if mb_cmd:
+    process_mb = subprocess.Popen(mb_cmd, shell=True, stderr=subprocess.PIPE)
+
+if apu_cmd:
     process_apu = subprocess.Popen(apu_cmd, shell=True, stderr=subprocess.PIPE)
-    if process_apu.wait():
-        error_msg = '\nQEMU APU instance failed:\n%s' % process_apu.stderr.read().decode()
 
-else:
-    if mbtype == 'PMU':
-        error_msg = '\nError: Missing PMU ROM: %s' % PMU_rom
-        error_msg += '\nSee "meta-xilinx/README.qemu.md" for more information on accquiring the PMU ROM.\n'
+error_msg = ""
+if apu_cmd and process_apu.wait():
+    # We only check for failures on the MB instance if APU fails
+    error_msg += '\nQEMU APU instance failed:\n%s' % process_apu.stderr.read().decode()
+
+    if mb_cmd and process_mb.wait():
+        error_msg += '\nQEMU MB instance failed:\n%s' % process_mb.stderr.read().decode()
 
 shutil.rmtree(mach_path)
 sys.exit(error_msg)
diff --git a/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
index e1dcc5ae..9f08a1f4 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
@@ -4,6 +4,7 @@ DESCRIPTION = "Building and installing flash strip utility"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://../flash_stripe.c;beginline=1;endline=23;md5=abb859d98b7c4eede655e1b71824125a"
 
+S = "${UNPACKDIR}"
 B = "${WORKDIR}/build"
 
 SRC_URI += "file://flash_stripe.c"
@@ -11,10 +12,10 @@ SRC_URI += "file://flash_stripe.c"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_compile() {
-    ${CC} ${WORKDIR}/flash_stripe.c -o flash_strip
-    ${CC} ${WORKDIR}/flash_stripe.c -o flash_unstrip
-    ${CC} ${WORKDIR}/flash_stripe.c -o flash_strip_bw -DFLASH_STRIPE_BW
-    ${CC} ${WORKDIR}/flash_stripe.c -o flash_unstrip_bw -DUNSTRIP -DFLASH_STRIPE_BW
+    ${CC} ${S}/flash_stripe.c -o flash_strip
+    ${CC} ${S}/flash_stripe.c -o flash_unstrip
+    ${CC} ${S}/flash_stripe.c -o flash_strip_bw -DFLASH_STRIPE_BW
+    ${CC} ${S}/flash_stripe.c -o flash_unstrip_bw -DUNSTRIP -DFLASH_STRIPE_BW
 }
 
 do_install() {
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
new file mode 100644
index 00000000..29b12354
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
@@ -0,0 +1,290 @@
+SUMMARY = "Fast open source processor emulator"
+DESCRIPTION = "QEMU is a hosted virtual machine monitor: it emulates the \
+machine's processor through dynamic binary translation and provides a set \
+of different hardware and device models for the machine, enabling it to run \
+a variety of guest operating systems"
+HOMEPAGE = "http://qemu.org"
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+
+DEPENDS += "bison-native meson-native ninja-native"
+
+RDEPENDS:${PN}-ptest = "bash"
+
+require qemu-targets-8.1.inc
+# https://gitlab.com/qemu-project/qemu/-/commit/81e2b198a8cb4ee5fdf108bd438f44b193ee3a36 means
+# we need a full python3-native setup
+inherit pkgconfig ptest update-rc.d systemd python3native
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+                    file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
+
+SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
+           file://powerpc_rom.bin \
+           file://run-ptest \
+           file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \
+           file://0003-apic-fixup-fallthrough-to-PIC.patch \
+           file://0004-configure-Add-pkg-config-handling-for-libgcrypt.patch \
+           file://0005-qemu-Do-not-include-file-if-not-exists.patch \
+           file://0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \
+           file://0007-qemu-Determinism-fixes.patch \
+           file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \
+           file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \
+           file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \
+           file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \
+           file://fixedmeson.patch \
+           file://fixmips.patch \
+           file://no-pip.patch \
+           file://qemu-guest-agent.init \
+           file://qemu-guest-agent.udev \
+           "
+UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
+
+
+SRC_URI[sha256sum] = "541526a764576eb494d2ff5ec46aeb253e62ea29035d1c23c0a8af4e6cd4f087"
+
+SRC_URI:append:class-target = " file://cross.patch"
+SRC_URI:append:class-nativesdk = " file://cross.patch"
+
+CVE_STATUS[CVE-2017-5957] = "cpe-incorrect: Applies against virglrender < 0.6.0 and not qemu itself"
+
+CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default."
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11
+CVE_STATUS[CVE-2018-18438] = "disputed: The issues identified by this CVE were determined to not constitute a vulnerability."
+
+# As per https://nvd.nist.gov/vuln/detail/CVE-2023-0664
+# https://bugzilla.redhat.com/show_bug.cgi?id=2167423
+CVE_STATUS[CVE-2023-0664] = "not-applicable-platform: Issue only applies on Windows"
+
+# As per https://bugzilla.redhat.com/show_bug.cgi?id=2203387
+CVE_STATUS[CVE-2023-2680] = "not-applicable-platform: RHEL specific issue."
+
+COMPATIBLE_HOST:mipsarchn32 = "null"
+COMPATIBLE_HOST:mipsarchn64 = "null"
+COMPATIBLE_HOST:riscv32 = "null"
+
+# Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html
+# upstream states qemu doesn't work without optimization
+DEBUG_BUILD = "0"
+
+do_install:append() {
+    # Prevent QA warnings about installed ${localstatedir}/run
+    if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
+}
+
+do_install_ptest() {
+        cp -rL ${B}/tests ${D}${PTEST_PATH}
+        find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcodp]" | xargs -i rm -rf {}
+
+        # Don't check the file genreated by configure
+        sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh
+
+        # Strip the paths from the QEMU variable, we can use PATH
+        makfiles=$(find ${D}${PTEST_PATH} -name "*.mak")
+        sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" $makfiles
+
+        # Strip compiler flags as they break reproducibility
+        sed -i -e "s,^CC=.*,CC=gcc," \
+               -e "s,^CCAS=.*,CCAS=gcc," \
+               -e "s,^LD=.*,LD=ld," $makfiles
+
+        # Update SRC_PATH variable to the right place on target
+        sed -i -e "s#^SRC_PATH=.*#SRC_PATH=${PTEST_PATH}#g" $makfiles
+
+        # https://gitlab.com/qemu-project/qemu/-/issues/1403
+        rm ${D}${PTEST_PATH}/tests/unit/test-io-channel-command
+}
+
+# QEMU_TARGETS is overridable variable
+QEMU_TARGETS ?= "arm aarch64 i386 loongarch64 mips mipsel mips64 mips64el ppc ppc64 ppc64le riscv32 riscv64 sh4 x86_64"
+
+EXTRA_OECONF = " \
+    --prefix=${prefix} \
+    --bindir=${bindir} \
+    --includedir=${includedir} \
+    --libdir=${libdir} \
+    --mandir=${mandir} \
+    --datadir=${datadir} \
+    --docdir=${docdir}/${BPN} \
+    --sysconfdir=${sysconfdir} \
+    --libexecdir=${libexecdir} \
+    --localstatedir=${localstatedir} \
+    --with-suffix=${BPN} \
+    --disable-strip \
+    --disable-werror \
+    --extra-cflags='${CFLAGS}' \
+    --extra-ldflags='${LDFLAGS}' \
+    --disable-download \
+    --disable-docs \
+    --host-cc='${BUILD_CC}' \
+    ${PACKAGECONFIG_CONFARGS} \
+    "
+
+EXTRA_OECONF:append:class-target = " --cross-prefix=${HOST_PREFIX}"
+EXTRA_OECONF:append:class-nativesdk = " --cross-prefix=${HOST_PREFIX}"
+
+B = "${WORKDIR}/build"
+
+#EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3"
+
+do_configure:prepend:class-native() {
+        # Append build host pkg-config paths for native target since the host may provide sdl
+        BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
+        if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
+                export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
+        fi
+}
+
+do_configure() {
+    export PKG_CONFIG=pkg-config
+    ${S}/configure ${EXTRA_OECONF}
+}
+do_configure[cleandirs] += "${B}"
+
+do_install () {
+        export STRIP=""
+        oe_runmake 'DESTDIR=${D}' install
+
+        # If we built the guest agent, also install startup/udev rules
+        if [ -e "${D}${bindir}/qemu-ga" ]; then
+                install -d ${D}${sysconfdir}/init.d/
+                install -m 0755 ${UNPACKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent
+                sed -i 's:@bindir@:${bindir}:' ${D}${sysconfdir}/init.d/qemu-guest-agent
+
+                install -d ${D}${sysconfdir}/udev/rules.d/
+                install -m 0644 ${UNPACKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules
+
+                install -d ${D}${systemd_unitdir}/system/
+                install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service ${D}${systemd_unitdir}/system
+                sed -i -e 's,-/usr/bin/,-${bindir}/,g' ${D}${systemd_unitdir}/system/qemu-guest-agent.service
+        fi
+        # ELF binary /usr/share/qemu/s390-netboot.img has relocations in .text
+        rm ${D}${datadir}/qemu/s390-netboot.img -f
+        # ELF binary /usr/share/qemu/s390-ccw.img has relocations in .text [textrel]
+        rm ${D}${datadir}/qemu/s390-ccw.img -f
+}
+
+# The following fragment will create a wrapper for qemu-mips user emulation
+# binary in order to work around a segmentation fault issue. Basically, by
+# default, the reserved virtual address space for 32-on-64 bit is set to 4GB.
+# This will trigger a MMU access fault in the virtual CPU. With this change,
+# the qemu-mips works fine.
+# IMPORTANT: This piece needs to be removed once the root cause is fixed!
+do_install:append() {
+        if [ -e "${D}/${bindir}/qemu-mips" ]; then
+                create_wrapper ${D}/${bindir}/qemu-mips \
+                        QEMU_RESERVED_VA=0x0
+        fi
+}
+# END of qemu-mips workaround
+
+# Disable kvm/virgl/mesa on targets that do not support it
+PACKAGECONFIG:remove:darwin = "kvm virglrenderer epoxy gtk+"
+PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+ pie"
+
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2"
+PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
+PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr,"
+PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio,"
+PACKAGECONFIG[uring] = "--enable-linux-io-uring,--disable-linux-io-uring,liburing"
+PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen-tools,xen-tools-libxenstore xen-tools-libxenctrl xen-tools-libxenguest"
+PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl,"
+PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg,"
+PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,curl,"
+PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss,"
+PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
+PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+3 gettext-native"
+PACKAGECONFIG[vte] = "--enable-vte,--disable-vte,vte gettext-native"
+PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
+PACKAGECONFIG[ssh] = "--enable-libssh,--disable-libssh,libssh,"
+PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
+PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle"
+PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1"
+PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc"
+PACKAGECONFIG[alsa] = "--audio-drv-list=default,,alsa-lib"
+PACKAGECONFIG[epoxy] = "--enable-opengl,--disable-opengl,libepoxy"
+PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo"
+PACKAGECONFIG[dax] = "--enable-libdaxctl,--disable-libdaxctl,ndctl"
+PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl"
+PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls"
+PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2"
+PACKAGECONFIG[libiscsi] = "--enable-libiscsi,--disable-libiscsi"
+PACKAGECONFIG[kvm] = "--enable-kvm,--disable-kvm"
+PACKAGECONFIG[virglrenderer] = "--enable-virglrenderer,--disable-virglrenderer,virglrenderer"
+# spice will be in meta-networking layer
+PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice"
+# usbredir will be in meta-networking layer
+PACKAGECONFIG[dbus-display] = "--enable-dbus-display,--disable-dbus-display,glib-2.0-native,dbus"
+PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir"
+PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy"
+PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs,glusterfs"
+PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
+PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,udev"
+PACKAGECONFIG[attr] = "--enable-attr,--disable-attr,attr,"
+PACKAGECONFIG[rbd] = "--enable-rbd,--disable-rbd,ceph,ceph"
+PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,,"
+PACKAGECONFIG[ust] = "--enable-trace-backends=ust,,lttng-ust,"
+PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,,"
+PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp"
+# libnfs is currently provided by meta-kodi
+PACKAGECONFIG[libnfs] = "--enable-libnfs,--disable-libnfs,libnfs"
+PACKAGECONFIG[pmem] = "--enable-libpmem,--disable-libpmem,pmdk"
+PACKAGECONFIG[pulseaudio] = "--enable-pa,--disable-pa,pulseaudio"
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux"
+PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf"
+PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone"
+PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma"
+PACKAGECONFIG[vde] = "--enable-vde,--disable-vde"
+PACKAGECONFIG[fuse] = "--enable-fuse --enable-fuse-lseek,--disable-fuse --disable-fuse-lseek,fuse3"
+PACKAGECONFIG[slirp] = "--enable-slirp,--disable-slirp,libslirp"
+PACKAGECONFIG[brlapi] = "--enable-brlapi,--disable-brlapi"
+PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack,"
+PACKAGECONFIG[debuginfo] = "--enable-libdw,--disable-libdw,elfutils"
+PACKAGECONFIG[pipewire] = "--enable-pipewire,--disable-pipewire,pipewire"
+PACKAGECONFIG[sndio] = "--enable-sndio,--disable-sndio,sndio"
+
+INSANE_SKIP:${PN}-common = "arch"
+
+FILES:${PN} += "${datadir}/icons"
+
+# For user who want to install all arch packages
+PACKAGES =+ "${PN}-common"
+RDEPENDS:${PN} += "${PN}-common"
+
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN} = ""
+
+FILES:${PN}-common = "${bindir}/* ${includedir}/* ${libexecdir}/* ${datadir}/* ${localstatedir}"
+
+PACKAGES_DYNAMIC += "^${PN}-user-.*  ^${PN}-system-.*"
+
+PACKAGESPLITFUNCS =+ "split_qemu_packages"
+
+python split_qemu_packages () {
+    archdir = d.expand('${bindir}/')
+    subpackages = do_split_packages(d, archdir, r'^qemu-system-(.*)$', '${PN}-system-%s', 'QEMU full system emulation binaries(%s)' , prepend=True, extra_depends='${PN}-common')
+
+    subpackages += do_split_packages(d, archdir, r'^qemu-((?!system|edid|ga|img|io|nbd|pr-helper|storage-daemon).*)$', '${PN}-user-%s', 'QEMU full user emulation binaries(%s)' , prepend=True, extra_depends='${PN}-common')
+    if subpackages:
+        d.appendVar('RDEPENDS:' + d.getVar('PN'), ' ' + ' '.join(subpackages))
+    mipspackage = d.getVar('PN') + "-user-mips"
+    if mipspackage in ' '.join(subpackages):
+        d.appendVar('RDEPENDS:' + mipspackage, ' ' + d.getVar("MLPREFIX") + 'bash')
+}
+
+# Put the guest agent in a separate package
+PACKAGES =+ "${PN}-guest-agent"
+SUMMARY:${PN}-guest-agent = "QEMU guest agent"
+FILES:${PN}-guest-agent += " \
+    ${bindir}/qemu-ga \
+    ${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules \
+    ${sysconfdir}/init.d/qemu-guest-agent \
+    ${systemd_unitdir}/system/qemu-guest-agent.service \
+"
+
+INITSCRIPT_PACKAGES = "${PN}-guest-agent"
+INITSCRIPT_NAME:${PN}-guest-agent = "qemu-guest-agent"
+INITSCRIPT_PARAMS:${PN}-guest-agent = "defaults"
+
+SYSTEMD_PACKAGES = "${PN}-guest-agent"
+SYSTEMD_SERVICE:${PN}-guest-agent = "qemu-guest-agent.service"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-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-xilinx-7.1.0/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
index 6fb160e6..c6550801 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
@@ -18,11 +18,11 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
  hw/mips/malta.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/hw/mips/malta.c b/hw/mips/malta.c
-index 628851172..12d37f35d 100644
---- a/hw/mips/malta.c
-+++ b/hw/mips/malta.c
-@@ -61,7 +61,7 @@
+Index: qemu-8.0.0/hw/mips/malta.c
+===================================================================
+--- qemu-8.0.0.orig/hw/mips/malta.c
++++ qemu-8.0.0/hw/mips/malta.c
+@@ -64,7 +64,7 @@
  #define ENVP_PADDR          0x2000
  #define ENVP_VADDR          cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR)
  #define ENVP_NB_ENTRIES     16
@@ -31,6 +31,3 @@ index 628851172..12d37f35d 100644
  
  /* Hardware addresses */
  #define FLASH_ADDRESS       0x1e000000ULL
--- 
-2.30.2
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch
new file mode 100644
index 00000000..ceae67be
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch
@@ -0,0 +1,355 @@
+From 71f14902256e3c3529710b713e1ea43100bf4c40 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 17 Dec 2022 08:37:46 -0800
+Subject: [PATCH 2/2] linux-user: Replace use of lfs64 related functions and
+ macros
+
+Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
+anf macros behave same as their 64 suffixed counterparts. This also
+helps in compiling with latest musl C library, where these macros and
+functions are no more available under _GNU_SOURCE feature macro
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2022-12/msg02841.html]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Laurent Vivier <laurent@vivier.eu>
+---
+ linux-user/syscall.c | 153 +++++++++++--------------------------------
+ 1 file changed, 39 insertions(+), 114 deletions(-)
+
+Index: qemu-8.0.0/linux-user/syscall.c
+===================================================================
+--- qemu-8.0.0.orig/linux-user/syscall.c
++++ qemu-8.0.0/linux-user/syscall.c
+@@ -761,8 +761,8 @@ safe_syscall6(ssize_t, copy_file_range,
+  */
+ #define safe_ioctl(...) safe_syscall(__NR_ioctl, __VA_ARGS__)
+ /* Similarly for fcntl. Note that callers must always:
+- *  pass the F_GETLK64 etc constants rather than the unsuffixed F_GETLK
+- *  use the flock64 struct rather than unsuffixed flock
++ *  pass the F_GETLK etc constants rather than the unsuffixed F_GETLK
++ *  use the flock struct rather than unsuffixed flock
+  * This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts.
+  */
+ #ifdef __NR_fcntl64
+@@ -6813,13 +6813,13 @@ static int target_to_host_fcntl_cmd(int
+         ret = cmd;
+         break;
+     case TARGET_F_GETLK:
+-        ret = F_GETLK64;
++        ret = F_GETLK;
+         break;
+     case TARGET_F_SETLK:
+-        ret = F_SETLK64;
++        ret = F_SETLK;
+         break;
+     case TARGET_F_SETLKW:
+-        ret = F_SETLKW64;
++        ret = F_SETLKW;
+         break;
+     case TARGET_F_GETOWN:
+         ret = F_GETOWN;
+@@ -6833,17 +6833,6 @@ static int target_to_host_fcntl_cmd(int
+     case TARGET_F_SETSIG:
+         ret = F_SETSIG;
+         break;
+-#if TARGET_ABI_BITS == 32
+-    case TARGET_F_GETLK64:
+-        ret = F_GETLK64;
+-        break;
+-    case TARGET_F_SETLK64:
+-        ret = F_SETLK64;
+-        break;
+-    case TARGET_F_SETLKW64:
+-        ret = F_SETLKW64;
+-        break;
+-#endif
+     case TARGET_F_SETLEASE:
+         ret = F_SETLEASE;
+         break;
+@@ -6895,8 +6884,8 @@ static int target_to_host_fcntl_cmd(int
+      * them to 5, 6 and 7 before making the syscall(). Since we make the
+      * syscall directly, adjust to what is supported by the kernel.
+      */
+-    if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
+-        ret -= F_GETLK64 - 5;
++    if (ret >= F_GETLK && ret <= F_SETLKW) {
++        ret -= F_GETLK - 5;
+     }
+ #endif
+ 
+@@ -6929,55 +6918,11 @@ static int host_to_target_flock(int type
+     return type;
+ }
+ 
+-static inline abi_long copy_from_user_flock(struct flock64 *fl,
+-                                            abi_ulong target_flock_addr)
+-{
+-    struct target_flock *target_fl;
+-    int l_type;
+-
+-    if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
+-        return -TARGET_EFAULT;
+-    }
+-
+-    __get_user(l_type, &target_fl->l_type);
+-    l_type = target_to_host_flock(l_type);
+-    if (l_type < 0) {
+-        return l_type;
+-    }
+-    fl->l_type = l_type;
+-    __get_user(fl->l_whence, &target_fl->l_whence);
+-    __get_user(fl->l_start, &target_fl->l_start);
+-    __get_user(fl->l_len, &target_fl->l_len);
+-    __get_user(fl->l_pid, &target_fl->l_pid);
+-    unlock_user_struct(target_fl, target_flock_addr, 0);
+-    return 0;
+-}
+-
+-static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
+-                                          const struct flock64 *fl)
+-{
+-    struct target_flock *target_fl;
+-    short l_type;
+-
+-    if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
+-        return -TARGET_EFAULT;
+-    }
+-
+-    l_type = host_to_target_flock(fl->l_type);
+-    __put_user(l_type, &target_fl->l_type);
+-    __put_user(fl->l_whence, &target_fl->l_whence);
+-    __put_user(fl->l_start, &target_fl->l_start);
+-    __put_user(fl->l_len, &target_fl->l_len);
+-    __put_user(fl->l_pid, &target_fl->l_pid);
+-    unlock_user_struct(target_fl, target_flock_addr, 1);
+-    return 0;
+-}
+-
+-typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
+-typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
++typedef abi_long from_flock_fn(struct flock *fl, abi_ulong target_addr);
++typedef abi_long to_flock_fn(abi_ulong target_addr, const struct flock *fl);
+ 
+ #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
+-struct target_oabi_flock64 {
++struct target_oabi_flock {
+     abi_short l_type;
+     abi_short l_whence;
+     abi_llong l_start;
+@@ -6985,10 +6930,10 @@ struct target_oabi_flock64 {
+     abi_int   l_pid;
+ } QEMU_PACKED;
+ 
+-static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
++static inline abi_long copy_from_user_oabi_flock(struct flock *fl,
+                                                    abi_ulong target_flock_addr)
+ {
+-    struct target_oabi_flock64 *target_fl;
++    struct target_oabi_flock *target_fl;
+     int l_type;
+ 
+     if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
+@@ -7009,10 +6954,10 @@ static inline abi_long copy_from_user_oa
+     return 0;
+ }
+ 
+-static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
+-                                                 const struct flock64 *fl)
++static inline abi_long copy_to_user_oabi_flock(abi_ulong target_flock_addr,
++                                                 const struct flock *fl)
+ {
+-    struct target_oabi_flock64 *target_fl;
++    struct target_oabi_flock *target_fl;
+     short l_type;
+ 
+     if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
+@@ -7030,10 +6975,10 @@ static inline abi_long copy_to_user_oabi
+ }
+ #endif
+ 
+-static inline abi_long copy_from_user_flock64(struct flock64 *fl,
++static inline abi_long copy_from_user_flock(struct flock *fl,
+                                               abi_ulong target_flock_addr)
+ {
+-    struct target_flock64 *target_fl;
++    struct target_flock *target_fl;
+     int l_type;
+ 
+     if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
+@@ -7054,10 +6999,10 @@ static inline abi_long copy_from_user_fl
+     return 0;
+ }
+ 
+-static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
+-                                            const struct flock64 *fl)
++static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
++                                            const struct flock *fl)
+ {
+-    struct target_flock64 *target_fl;
++    struct target_flock *target_fl;
+     short l_type;
+ 
+     if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
+@@ -7076,7 +7021,7 @@ static inline abi_long copy_to_user_floc
+ 
+ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
+ {
+-    struct flock64 fl64;
++    struct flock fl64;
+ #ifdef F_GETOWN_EX
+     struct f_owner_ex fox;
+     struct target_f_owner_ex *target_fox;
+@@ -7089,6 +7034,7 @@ static abi_long do_fcntl(int fd, int cmd
+ 
+     switch(cmd) {
+     case TARGET_F_GETLK:
++    case TARGET_F_OFD_GETLK:
+         ret = copy_from_user_flock(&fl64, arg);
+         if (ret) {
+             return ret;
+@@ -7098,32 +7044,11 @@ static abi_long do_fcntl(int fd, int cmd
+             ret = copy_to_user_flock(arg, &fl64);
+         }
+         break;
+-
+     case TARGET_F_SETLK:
+     case TARGET_F_SETLKW:
+-        ret = copy_from_user_flock(&fl64, arg);
+-        if (ret) {
+-            return ret;
+-        }
+-        ret = get_errno(safe_fcntl(fd, host_cmd, &fl64));
+-        break;
+-
+-    case TARGET_F_GETLK64:
+-    case TARGET_F_OFD_GETLK:
+-        ret = copy_from_user_flock64(&fl64, arg);
+-        if (ret) {
+-            return ret;
+-        }
+-        ret = get_errno(safe_fcntl(fd, host_cmd, &fl64));
+-        if (ret == 0) {
+-            ret = copy_to_user_flock64(arg, &fl64);
+-        }
+-        break;
+-    case TARGET_F_SETLK64:
+-    case TARGET_F_SETLKW64:
+     case TARGET_F_OFD_SETLK:
+     case TARGET_F_OFD_SETLKW:
+-        ret = copy_from_user_flock64(&fl64, arg);
++        ret = copy_from_user_flock(&fl64, arg);
+         if (ret) {
+             return ret;
+         }
+@@ -7348,7 +7273,7 @@ static inline abi_long target_truncate64
+         arg2 = arg3;
+         arg3 = arg4;
+     }
+-    return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
++    return get_errno(truncate(arg1, target_offset64(arg2, arg3)));
+ }
+ #endif
+ 
+@@ -7362,7 +7287,7 @@ static inline abi_long target_ftruncate6
+         arg2 = arg3;
+         arg3 = arg4;
+     }
+-    return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
++    return get_errno(ftruncate(arg1, target_offset64(arg2, arg3)));
+ }
+ #endif
+ 
+@@ -8598,7 +8523,7 @@ static int do_getdents(abi_long dirfd, a
+     void *tdirp;
+     int hlen, hoff, toff;
+     int hreclen, treclen;
+-    off64_t prev_diroff = 0;
++    off_t prev_diroff = 0;
+ 
+     hdirp = g_try_malloc(count);
+     if (!hdirp) {
+@@ -8651,7 +8576,7 @@ static int do_getdents(abi_long dirfd, a
+              * Return what we have, resetting the file pointer to the
+              * location of the first record not returned.
+              */
+-            lseek64(dirfd, prev_diroff, SEEK_SET);
++            lseek(dirfd, prev_diroff, SEEK_SET);
+             break;
+         }
+ 
+@@ -8685,7 +8610,7 @@ static int do_getdents64(abi_long dirfd,
+     void *tdirp;
+     int hlen, hoff, toff;
+     int hreclen, treclen;
+-    off64_t prev_diroff = 0;
++    off_t prev_diroff = 0;
+ 
+     hdirp = g_try_malloc(count);
+     if (!hdirp) {
+@@ -8727,7 +8652,7 @@ static int do_getdents64(abi_long dirfd,
+              * Return what we have, resetting the file pointer to the
+              * location of the first record not returned.
+              */
+-            lseek64(dirfd, prev_diroff, SEEK_SET);
++            lseek(dirfd, prev_diroff, SEEK_SET);
+             break;
+         }
+ 
+@@ -11158,7 +11083,7 @@ static abi_long do_syscall1(CPUArchState
+                 return -TARGET_EFAULT;
+             }
+         }
+-        ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
++        ret = get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)));
+         unlock_user(p, arg2, ret);
+         return ret;
+     case TARGET_NR_pwrite64:
+@@ -11175,7 +11100,7 @@ static abi_long do_syscall1(CPUArchState
+                 return -TARGET_EFAULT;
+             }
+         }
+-        ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
++        ret = get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5)));
+         unlock_user(p, arg2, 0);
+         return ret;
+ #endif
+@@ -11998,14 +11923,14 @@ static abi_long do_syscall1(CPUArchState
+     case TARGET_NR_fcntl64:
+     {
+         int cmd;
+-        struct flock64 fl;
+-        from_flock64_fn *copyfrom = copy_from_user_flock64;
+-        to_flock64_fn *copyto = copy_to_user_flock64;
++        struct flock fl;
++        from_flock_fn *copyfrom = copy_from_user_flock;
++        to_flock_fn *copyto = copy_to_user_flock;
+ 
+ #ifdef TARGET_ARM
+         if (!cpu_env->eabi) {
+-            copyfrom = copy_from_user_oabi_flock64;
+-            copyto = copy_to_user_oabi_flock64;
++            copyfrom = copy_from_user_oabi_flock;
++            copyto = copy_to_user_oabi_flock;
+         }
+ #endif
+ 
+@@ -12015,7 +11940,7 @@ static abi_long do_syscall1(CPUArchState
+         }
+ 
+         switch(arg2) {
+-        case TARGET_F_GETLK64:
++        case TARGET_F_GETLK:
+             ret = copyfrom(&fl, arg3);
+             if (ret) {
+                 break;
+@@ -12026,8 +11951,8 @@ static abi_long do_syscall1(CPUArchState
+             }
+            break;
+ 
+-        case TARGET_F_SETLK64:
+-        case TARGET_F_SETLKW64:
++        case TARGET_F_SETLK:
++        case TARGET_F_SETLKW:
+             ret = copyfrom(&fl, arg3);
+             if (ret) {
+                 break;
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/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..7bd7ee5f
--- /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-xilinx-7.1.0/0003-apic-fixup-fallthrough-to-PIC.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0003-apic-fixup-fallthrough-to-PIC.patch
index f350ffce..e85f8202 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0003-apic-fixup-fallthrough-to-PIC.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0003-apic-fixup-fallthrough-to-PIC.patch
@@ -29,11 +29,11 @@ Signed-off-by: He Zhe <zhe.he@windriver.com>
  hw/intc/apic.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/hw/intc/apic.c b/hw/intc/apic.c
-index 3df11c34d..9506c88ce 100644
---- a/hw/intc/apic.c
-+++ b/hw/intc/apic.c
-@@ -605,7 +605,7 @@ int apic_accept_pic_intr(DeviceState *dev)
+Index: qemu-8.0.0/hw/intc/apic.c
+===================================================================
+--- qemu-8.0.0.orig/hw/intc/apic.c
++++ qemu-8.0.0/hw/intc/apic.c
+@@ -607,7 +607,7 @@ int apic_accept_pic_intr(DeviceState *de
      APICCommonState *s = APIC(dev);
      uint32_t lvt0;
  
@@ -42,6 +42,3 @@ index 3df11c34d..9506c88ce 100644
          return -1;
  
      lvt0 = s->lvt[APIC_LVT_LINT0];
--- 
-2.30.2
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch
index 6faebd4e..f981a64a 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch
@@ -14,19 +14,16 @@ Signed-off-by: He Zhe <zhe.he@windriver.com>
  meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/meson.build b/meson.build
-index 861de93c4..d45ff2d7c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1063,7 +1063,7 @@ endif
+Index: qemu-8.1.0/meson.build
+===================================================================
+--- qemu-8.1.0.orig/meson.build
++++ qemu-8.1.0/meson.build
+@@ -1481,7 +1481,7 @@ endif
  if not gnutls_crypto.found()
    if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled()
      gcrypt = dependency('libgcrypt', version: '>=1.8',
 -                        method: 'config-tool',
 +                        method: 'pkg-config',
-                         required: get_option('gcrypt'),
-                         kwargs: static_kwargs)
+                         required: get_option('gcrypt'))
      # Debian has removed -lgpg-error from libgcrypt-config
--- 
-2.30.2
-
+     # as it "spreads unnecessary dependencies" which in
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0005-qemu-Do-not-include-file-if-not-exists.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0005-qemu-Do-not-include-file-if-not-exists.patch
index 3f3c39f9..38aa4c3b 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0005-qemu-Do-not-include-file-if-not-exists.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0005-qemu-Do-not-include-file-if-not-exists.patch
@@ -16,11 +16,11 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
  linux-user/syscall.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index f65045efe..340e0c6f0 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -113,7 +113,9 @@
+Index: qemu-8.0.0/linux-user/syscall.c
+===================================================================
+--- qemu-8.0.0.orig/linux-user/syscall.c
++++ qemu-8.0.0/linux-user/syscall.c
+@@ -115,7 +115,9 @@
  #include <linux/blkpg.h>
  #include <netpacket/packet.h>
  #include <linux/netlink.h>
@@ -30,6 +30,3 @@ index f65045efe..340e0c6f0 100644
  #include <linux/rtc.h>
  #include <sound/asound.h>
  #ifdef HAVE_BTRFS_H
--- 
-2.30.2
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
index 75c03693..5d1d7c68 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
@@ -23,11 +23,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
  linux-user/mmap.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/linux-user/mmap.c b/linux-user/mmap.c
-index c125031b9..e651834a5 100644
---- a/linux-user/mmap.c
-+++ b/linux-user/mmap.c
-@@ -749,12 +749,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
+Index: qemu-8.0.0/linux-user/mmap.c
+===================================================================
+--- qemu-8.0.0.orig/linux-user/mmap.c
++++ qemu-8.0.0/linux-user/mmap.c
+@@ -776,12 +776,16 @@ abi_long target_mremap(abi_ulong old_add
      int prot;
      void *host_addr;
  
@@ -47,6 +47,3 @@ index c125031b9..e651834a5 100644
          return -1;
      }
  
--- 
-2.30.2
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0007-qemu-Determinism-fixes.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0007-qemu-Determinism-fixes.patch
index 0d7dae36..d3f965e0 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0007-qemu-Determinism-fixes.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0007-qemu-Determinism-fixes.patch
@@ -16,10 +16,10 @@ RP 2021/3/1
  scripts/decodetree.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/scripts/decodetree.py b/scripts/decodetree.py
-index a03dc6b5e..4ea24c1f3 100644
---- a/scripts/decodetree.py
-+++ b/scripts/decodetree.py
+Index: qemu-8.0.0/scripts/decodetree.py
+===================================================================
+--- qemu-8.0.0.orig/scripts/decodetree.py
++++ qemu-8.0.0/scripts/decodetree.py
 @@ -1328,7 +1328,7 @@ def main():
      toppat = ExcMultiPattern(0)
  
@@ -29,6 +29,3 @@ index a03dc6b5e..4ea24c1f3 100644
          f = open(filename, 'rt', encoding='utf-8')
          parse_file(f, toppat)
          f.close()
--- 
-2.30.2
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch
index 43d3c7cf..a84364cc 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch
@@ -17,22 +17,25 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  tests/unit/meson.build | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/tests/unit/meson.build b/tests/unit/meson.build
-index 96b295263..e4c3246dc 100644
---- a/tests/unit/meson.build
-+++ b/tests/unit/meson.build
-@@ -44,9 +44,9 @@ tests = {
+Index: qemu-8.0.0/tests/unit/meson.build
+===================================================================
+--- qemu-8.0.0.orig/tests/unit/meson.build
++++ qemu-8.0.0/tests/unit/meson.build
+@@ -46,7 +46,7 @@ tests = {
    'test-keyval': [testqapi],
    'test-logging': [],
    'test-uuid': [],
 -  'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'],
 +  'ptimer-test': ['ptimer-test-stubs.c', '../../hw/core/ptimer.c'],
    'test-qapi-util': [],
--  'test-smp-parse': [qom, meson.project_source_root() / 'hw/core/machine-smp.c'],
-+  'test-smp-parse': [qom, '../../hw/core/machine-smp.c'],
- }
- 
- if have_system or have_tools
--- 
-2.30.2
-
+   'test-interval-tree': [],
+   'test-xs-node': [qom],
+@@ -136,7 +136,7 @@ if have_system
+     'test-util-sockets': ['socket-helpers.c'],
+     'test-base64': [],
+     'test-bufferiszero': [],
+-    'test-smp-parse': [qom, meson.project_source_root() / 'hw/core/machine-smp.c'],
++    'test-smp-parse': [qom, '../../hw/core/machine-smp.c'],
+     'test-vmstate': [migration, io],
+     'test-yank': ['socket-helpers.c', qom, io, chardev]
+   }
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
index 23d0a698..4de6cc24 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
@@ -18,10 +18,10 @@ Cc: Michael S. Tsirkin <mst@redhat.com>
  util/mmap-alloc.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
-index 893d86435..86d3cda24 100644
---- a/util/mmap-alloc.c
-+++ b/util/mmap-alloc.c
+Index: qemu-8.0.0/util/mmap-alloc.c
+===================================================================
+--- qemu-8.0.0.orig/util/mmap-alloc.c
++++ qemu-8.0.0/util/mmap-alloc.c
 @@ -10,14 +10,18 @@
   * later.  See the COPYING file in the top-level directory.
   */
@@ -44,6 +44,3 @@ index 893d86435..86d3cda24 100644
  #include "qemu/mmap-alloc.h"
  #include "qemu/host-utils.h"
  #include "qemu/cutils.h"
--- 
-2.30.2
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch
index 810c74fa..6caf35b6 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch
@@ -21,13 +21,13 @@ Signed-off-by: Yuval Shaia <yuval.shaia.ml@gmail.com>
  hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
-index da7ddfa548..89db963c46 100644
---- a/hw/rdma/vmw/pvrdma_cmd.c
-+++ b/hw/rdma/vmw/pvrdma_cmd.c
-@@ -796,6 +796,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev)
- 
-     dsr_info = &dev->dsr_info;
+Index: qemu-8.0.0/hw/rdma/vmw/pvrdma_cmd.c
+===================================================================
+--- qemu-8.0.0.orig/hw/rdma/vmw/pvrdma_cmd.c
++++ qemu-8.0.0/hw/rdma/vmw/pvrdma_cmd.c
+@@ -782,6 +782,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev)
+             goto out;
+     }
  
 +    if (!dsr_info->dsr) {
 +            /* Buggy or malicious guest driver */
@@ -38,6 +38,3 @@ index da7ddfa548..89db963c46 100644
      if (dsr_info->req->hdr.cmd >= sizeof(cmd_handlers) /
                        sizeof(struct cmd_handler)) {
          rdma_error_report("Unsupported command");
--- 
-2.34.1
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/cross.patch
index ca2ad361..112eb925 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/cross.patch
@@ -14,19 +14,19 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
  configure | 4 ----
  1 file changed, 4 deletions(-)
 
-Index: qemu-7.1.0/configure
+Index: qemu-8.0.0/configure
 ===================================================================
---- qemu-7.1.0.orig/configure
-+++ qemu-7.1.0/configure
-@@ -2710,7 +2710,6 @@ if test "$skip_meson" = no; then
-   echo "strip = [$(meson_quote $strip)]" >> $cross
+--- qemu-8.0.0.orig/configure
++++ qemu-8.0.0/configure
+@@ -2590,7 +2590,6 @@ if test "$skip_meson" = no; then
    echo "widl = [$(meson_quote $widl)]" >> $cross
    echo "windres = [$(meson_quote $windres)]" >> $cross
+   echo "windmc = [$(meson_quote $windmc)]" >> $cross
 -  if test "$cross_compile" = "yes"; then
      cross_arg="--cross-file config-meson.cross"
      echo "[host_machine]" >> $cross
      echo "system = '$targetos'" >> $cross
-@@ -2728,9 +2727,6 @@ if test "$skip_meson" = no; then
+@@ -2608,9 +2607,6 @@ if test "$skip_meson" = no; then
      else
          echo "endian = 'little'" >> $cross
      fi
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixedmeson.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixedmeson.patch
new file mode 100644
index 00000000..0cbaea07
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixedmeson.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
+
+Index: qemu-8.1.0/configure
+===================================================================
+--- qemu-8.1.0.orig/configure
++++ qemu-8.1.0/configure
+@@ -1032,12 +1032,7 @@ then
+     exit 1
+ fi
+ 
+-# At this point, we expect Meson to be installed and available.
+-# We expect mkvenv or pip to have created pyvenv/bin/meson for us.
+-# We ignore PATH completely here: we want to use the venv's Meson
+-# *exclusively*.
+-
+-meson="$(cd pyvenv/bin; pwd)/meson"
++meson=`which meson`
+ 
+ # Conditionally ensure Sphinx is installed.
+ 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixmips.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixmips.patch
new file mode 100644
index 00000000..01546d10
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixmips.patch
@@ -0,0 +1,18 @@
+Patch to fix mips boot hangs where virtio appears broken. Patch under discussion upstream. 
+Regression is introduced by other fixes to 8.1.0 to get x86 boots working.
+
+Upstream-Status: Pending [https://lore.kernel.org/qemu-devel/6c956b90-5a13-db96-9c02-9834a512fe6f@linaro.org/]
+
+Index: qemu-8.1.0/softmmu/physmem.c
+===================================================================
+--- qemu-8.1.0.orig/softmmu/physmem.c
++++ qemu-8.1.0/softmmu/physmem.c
+@@ -2517,7 +2517,7 @@ static void tcg_commit(MemoryListener *l
+      * That said, the listener is also called during realize, before
+      * all of the tcg machinery for run-on is initialized: thus halt_cond.
+      */
+-    if (cpu->halt_cond) {
++    if (cpu->halt_cond && !qemu_cpu_is_self(cpu)) {
+         async_run_on_cpu(cpu, tcg_commit_cpu, RUN_ON_CPU_HOST_PTR(cpuas));
+     } else {
+         tcg_commit_cpu(cpu, RUN_ON_CPU_HOST_PTR(cpuas));
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/no-pip.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/no-pip.patch
new file mode 100644
index 00000000..09e13e8b
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/no-pip.patch
@@ -0,0 +1,45 @@
+qemu: Ensure pip and the python venv aren't used for meson
+
+Qemu wants to use a supported python version and a specific meson version
+to "help" users and uses pip and creates a venv to do this. This is a nightmare
+for us. Our versions stay up to date and should be supported so we don't
+really need/want this wrapping. Tweak things to disable it.
+
+There was breakage from the wrapper shown by:
+
+bitbake qemu-system-native
+<add DISTRO_FEATURES:remove = "opengl" to local.conf>
+bitbake qemu-system-native -c configure
+
+which would crash. The issue is the change in configuration removes pieces
+from the sysroot but pyc files remainm as do pieces of pip which causes
+problems.
+
+Ideally we'd convince upstream to allow some way to disable the venv on
+the understanding that if/when it breaks, we keep the pieces. The patch
+as it stands is a workaround.
+
+Upstream-Status: Inappropriate [oe specific]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: qemu-8.1.2/configure
+===================================================================
+--- qemu-8.1.2.orig/configure
++++ qemu-8.1.2/configure
+@@ -1009,7 +1009,7 @@ python="$(command -v "$python")"
+ echo "python determined to be '$python'"
+ echo "python version: $($python --version)"
+ 
+-python="$($python -B "${source_path}/python/scripts/mkvenv.py" create pyvenv)"
++python=python3
+ if test "$?" -ne 0 ; then
+     error_exit "python venv creation failed"
+ fi
+@@ -1017,6 +1017,7 @@ fi
+ # Suppress writing compiled files
+ python="$python -B"
+ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
++mkvenv=true
+ 
+ mkvenv_flags=""
+ if test "$download" = "enabled" ; then
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/powerpc_rom.bin b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/powerpc_rom.bin
index c4044296..c4044296 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/powerpc_rom.bin
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/powerpc_rom.bin
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.init b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.init
new file mode 100644
index 00000000..5ebaadde
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.init
@@ -0,0 +1,75 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Initially written by: Michael Tokarev <mjt@tls.msk.ru>
+# For QEMU Debian downstream package
+
+set -e
+
+. /etc/init.d/functions
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="QEMU Guest Agent"
+NAME=qemu-ga
+DAEMON=@bindir@/$NAME
+PIDFILE=/var/run/$NAME.pid
+
+# config
+DAEMON_ARGS=""
+# default transport
+TRANSPORT=virtio-serial:/dev/virtio-ports/org.qemu.guest_agent.0
+NO_START=0
+
+test ! -r /etc/default/qemu-guest-agent || . /etc/default/qemu-guest-agent
+test "$NO_START" = "0" || exit 0
+test -x "$DAEMON" || exit 0
+
+#
+# Function that checks whenever system has necessary environment
+# It also splits $TRANSPORT into $method and $path
+#
+do_check_transport() {
+        method=${TRANSPORT%%:*};
+        path=${TRANSPORT#*:}
+        case "$method" in
+            virtio-serial | isa-serial)
+                if [ ! -e "$path" ]; then
+                    echo "$NAME: transport endpoint not found, not starting"
+                    return 1
+                fi
+                ;;
+        esac
+}
+
+case "$1" in
+  start)
+        do_check_transport || exit 0
+        echo -n "Starting $DESC: "
+        start-stop-daemon -S -p $PIDFILE -x "$DAEMON" -- \
+                $DAEMON_ARGS -d -m "$method" -p "$path"
+        echo "$NAME."
+        ;;
+  stop)
+        echo -n "Stopping $DESC: "
+        start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
+        echo "$NAME."
+        ;;
+  status)
+        status "$DAEMON"
+        exit $?
+        ;;
+  restart|force-reload)
+        do_check_transport || exit 0
+        echo -n "Restarting $DESC: "
+        start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
+        sleep 1
+        start-stop-daemon -S -p $PIDFILE -x "$DAEMON" -- \
+                $DAEMON_ARGS -d -m "$method" -p "$path"
+        echo "$NAME."
+        ;;
+  *)
+        N=/etc/init.d/$NAME
+        echo "Usage: $N {start|stop|status|restart|force-reload}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.udev b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.udev
new file mode 100644
index 00000000..47097057
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.udev
@@ -0,0 +1,2 @@
+SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/run-ptest b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/run-ptest
index f9a4e8fb..f9a4e8fb 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/run-ptest
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/run-ptest
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
index b08b414f..5f180a35 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
@@ -7,19 +7,19 @@ inherit deploy
 
 LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912cb1dee68d6c68d99"
 
-PV = "xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+PV .= "+git"
 
 REPO ?= "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S = "${WORKDIR}/git"
+SRC_URI += "file://0001-versal-Reorder-serial-ports.patch"
+SRC_URI += "file://0001-versal-net-Reorder-serial-port.patch"
 
-# Don't need to do anything
-do_install() {
-        :
-}
+S = "${UNPACKDIR}/git"
+
+do_install[noexec] = '1'
 
 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..aaaa640a
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-versal-Reorder-serial-ports.patch
@@ -0,0 +1,1468 @@
+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.
+
+Upstream-Status: Inappropriate [not a real board]
+
+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..20f02fde
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-versal-net-Reorder-serial-port.patch
@@ -0,0 +1,293 @@
+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.
+
+Upstream-Status: Inappropriate [not a real board]
+
+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_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb
deleted file mode 100644
index 7c734cd6..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-
-require qemu-devicetrees.inc
-
-BRANCH ?= "xlnx_rel_v2022.1"
-SRCREV ?= "0499324af1178057c3730b0989c8fb5c5bbc4cf8"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append = " file://0001-Makefile-Use-python3-instead-of-python.patch"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb
deleted file mode 100644
index 6675ba3e..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-
-require qemu-devicetrees.inc
-
-BRANCH ?= "xlnx_rel_v2022.2"
-SRCREV ?= "cf5d357e16c13ac447861f908e83951ffb7b4301"
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb
deleted file mode 100644
index dc1feda4..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-
-require qemu-devicetrees.inc
-
-BRANCH ?= "xlnx_rel_v2023.1"
-SRCREV ?= "56538937584f527fb408347c3b430142e74723e8"
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.2.bb
deleted file mode 100644
index d41743c1..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-
-require qemu-devicetrees.inc
-
-BRANCH ?= "xlnx_rel_v2023.2"
-SRCREV ?= "d1013382d9a5ef816cd020e7840813b7a2d65c51"
-
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-native-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-native-8.1.inc
new file mode 100644
index 00000000..22fa9685
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-native-8.1.inc
@@ -0,0 +1,7 @@
+require qemu-8.1.inc
+
+inherit native
+
+EXTRA_OEMAKE:append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'"
+
+LDFLAGS:append = " -fuse-ld=bfd"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-targets-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-targets-8.1.inc
new file mode 100644
index 00000000..24f9a039
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-targets-8.1.inc
@@ -0,0 +1,28 @@
+# possible arch values are:
+#    aarch64 arm armeb alpha cris i386 x86_64 m68k microblaze
+#    mips mipsel mips64 mips64el ppc ppc64 ppc64abi32 ppcemb
+#    riscv32 riscv64 sparc sparc32 sparc32plus
+
+def get_qemu_target_list(d):
+    import bb
+    archs = d.getVar('QEMU_TARGETS').split()
+    tos = d.getVar('HOST_OS')
+    softmmuonly = ""
+    for arch in ['ppcemb', 'lm32']:
+        if arch in archs:
+            softmmuonly += arch + "-softmmu,"
+            archs.remove(arch)
+    linuxuseronly = ""
+    for arch in ['armeb', 'alpha', 'ppc64abi32', 'ppc64le', 'sparc32plus', 'aarch64_be']:
+        if arch in archs:
+            linuxuseronly += arch + "-linux-user,"
+            archs.remove(arch)
+    if 'linux' not in tos:
+        return softmmuonly + ''.join([arch + "-softmmu" + "," for arch in archs]).rstrip(',')
+    return softmmuonly + linuxuseronly + ''.join([arch + "-linux-user" + "," + arch + "-softmmu" + "," for arch in archs]).rstrip(',')
+
+def get_qemu_usermode_target_list(d):
+    return ",".join(filter(lambda i: "-linux-user" in i, get_qemu_target_list(d).split(',')))
+
+def get_qemu_system_target_list(d):
+    return ",".join(filter(lambda i: "-linux-user" not in i, get_qemu_target_list(d).split(',')))
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc
deleted file mode 100644
index bb8fac70..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Note this isn't really the 2022.1 or 2022.2 version of qemu-xilinx
-# Instead it's the current master version, as qemu 6.1.0 doesn't
-# work reliabily anymore.
-
-XILINX_QEMU_VERSION = "v7.1.0"
-BRANCH = "master"
-SRCREV = "21adc9f99e813fb24fb65421259b5b0614938376"
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc
deleted file mode 100644
index bb8fac70..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Note this isn't really the 2022.1 or 2022.2 version of qemu-xilinx
-# Instead it's the current master version, as qemu 6.1.0 doesn't
-# work reliabily anymore.
-
-XILINX_QEMU_VERSION = "v7.1.0"
-BRANCH = "master"
-SRCREV = "21adc9f99e813fb24fb65421259b5b0614938376"
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc
deleted file mode 100644
index 06ac05a1..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-XILINX_QEMU_VERSION = "v7.1.0"
-BRANCH = "xlnx_rel_v2023.1"
-SRCREV = "21adc9f99e813fb24fb65421259b5b0614938376"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc
deleted file mode 100644
index db6e1528..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-XILINX_QEMU_VERSION = "v7.1.0"
-BRANCH = "xlnx_rel_v2023.2"
-SRCREV = "23b643ba1683a47ef49447a45643fe2172d6f8ca"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0001-net-tulip-Restrict-DMA-engine-to-memories.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0001-net-tulip-Restrict-DMA-engine-to-memories.patch
deleted file mode 100644
index 6c85a77b..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0001-net-tulip-Restrict-DMA-engine-to-memories.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-CVE: CVE-2022-2962
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From 5c5c50b0a73d78ffe18336c9996fef5eae9bbbb0 Mon Sep 17 00:00:00 2001
-From: Zheyu Ma <zheyuma97@gmail.com>
-Date: Sun, 21 Aug 2022 20:43:43 +0800
-Subject: [PATCH] net: tulip: Restrict DMA engine to memories
-
-The DMA engine is started by I/O access and then itself accesses the
-I/O registers, triggering a reentrancy bug.
-
-The following log can reveal it:
-==5637==ERROR: AddressSanitizer: stack-overflow
-    #0 0x5595435f6078 in tulip_xmit_list_update qemu/hw/net/tulip.c:673
-    #1 0x5595435f204a in tulip_write qemu/hw/net/tulip.c:805:13
-    #2 0x559544637f86 in memory_region_write_accessor qemu/softmmu/memory.c:492:5
-    #3 0x5595446379fa in access_with_adjusted_size qemu/softmmu/memory.c:554:18
-    #4 0x5595446372fa in memory_region_dispatch_write qemu/softmmu/memory.c
-    #5 0x55954468b74c in flatview_write_continue qemu/softmmu/physmem.c:2825:23
-    #6 0x559544683662 in flatview_write qemu/softmmu/physmem.c:2867:12
-    #7 0x5595446833f3 in address_space_write qemu/softmmu/physmem.c:2963:18
-    #8 0x5595435fb082 in dma_memory_rw_relaxed qemu/include/sysemu/dma.h:87:12
-    #9 0x5595435fb082 in dma_memory_rw qemu/include/sysemu/dma.h:130:12
-    #10 0x5595435fb082 in dma_memory_write qemu/include/sysemu/dma.h:171:12
-    #11 0x5595435fb082 in stl_le_dma qemu/include/sysemu/dma.h:272:1
-    #12 0x5595435fb082 in stl_le_pci_dma qemu/include/hw/pci/pci.h:910:1
-    #13 0x5595435fb082 in tulip_desc_write qemu/hw/net/tulip.c:101:9
-    #14 0x5595435f7e3d in tulip_xmit_list_update qemu/hw/net/tulip.c:706:9
-    #15 0x5595435f204a in tulip_write qemu/hw/net/tulip.c:805:13
-
-Fix this bug by restricting the DMA engine to memories regions.
-
-Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- hw/net/tulip.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/net/tulip.c b/hw/net/tulip.c
-index 097e905bec..b9e42c322a 100644
---- a/hw/net/tulip.c
-+++ b/hw/net/tulip.c
-@@ -70,7 +70,7 @@ static const VMStateDescription vmstate_pci_tulip = {
- static void tulip_desc_read(TULIPState *s, hwaddr p,
-         struct tulip_descriptor *desc)
- {
--    const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED;
-+    const MemTxAttrs attrs = { .memory = true };
- 
-     if (s->csr[0] & CSR0_DBO) {
-         ldl_be_pci_dma(&s->dev, p, &desc->status, attrs);
-@@ -88,7 +88,7 @@ static void tulip_desc_read(TULIPState *s, hwaddr p,
- static void tulip_desc_write(TULIPState *s, hwaddr p,
-         struct tulip_descriptor *desc)
- {
--    const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED;
-+    const MemTxAttrs attrs = { .memory = true };
- 
-     if (s->csr[0] & CSR0_DBO) {
-         stl_be_pci_dma(&s->dev, p, desc->status, attrs);
--- 
-2.34.1
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0002-chardev-connect-socket-to-a-spawned-command.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0002-chardev-connect-socket-to-a-spawned-command.patch
deleted file mode 100644
index 63a99c96..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/0002-chardev-connect-socket-to-a-spawned-command.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-From 14cd62607c9de232edf0a9b8503bd02783e03411 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@xilinx.com>
-Date: Thu, 21 Dec 2017 11:35:16 -0800
-Subject: [PATCH 02/12] chardev: connect socket to a spawned command
-
-The command is started in a shell (sh -c) with stdin connect to QEMU
-via a Unix domain stream socket. QEMU then exchanges data via its own
-end of the socket, just like it normally does.
-
-"-chardev socket" supports some ways of connecting via protocols like
-telnet, but that is only a subset of the functionality supported by
-tools socat. To use socat instead, for example to connect via a socks
-proxy, use:
-
-  -chardev 'socket,id=socat,cmd=exec socat FD:0 SOCKS4A:socks-proxy.localdomain:example.com:9999,,socksuser=nobody' \
-  -device usb-serial,chardev=socat
-
-Beware that commas in the command must be escaped as double commas.
-
-Or interactively in the console:
-   (qemu) chardev-add socket,id=cat,cmd=cat
-   (qemu) device_add usb-serial,chardev=cat
-   ^ac
-   # cat >/dev/ttyUSB0
-   hello
-   hello
-
-Another usage is starting swtpm from inside QEMU. swtpm will
-automatically shut down once it looses the connection to the parent
-QEMU, so there is no risk of lingering processes:
-
-  -chardev 'socket,id=chrtpm0,cmd=exec swtpm socket --terminate --ctrl type=unixio,,clientfd=0 --tpmstate dir=... --log file=swtpm.log' \
-  -tpmdev emulator,id=tpm0,chardev=chrtpm0 \
-  -device tpm-tis,tpmdev=tpm0
-
-The patch was discussed upstream, but QEMU developers believe that the
-code calling QEMU should be responsible for managing additional
-processes. In OE-core, that would imply enhancing runqemu and
-oeqa. This patch is a simpler solution.
-
-Because it is not going upstream, the patch was written so that it is
-as simple as possible.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
-
----
- chardev/char-socket.c | 100 ++++++++++++++++++++++++++++++++++++++++++
- chardev/char.c        |   3 ++
- qapi/char.json        |   5 +++
- 3 files changed, 108 insertions(+)
-
-diff --git a/chardev/char-socket.c b/chardev/char-socket.c
-index fab2d791d..c79641f24 100644
---- a/chardev/char-socket.c
-+++ b/chardev/char-socket.c
-@@ -1315,6 +1315,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock,
-     return true;
- }
- 
-+#ifndef _WIN32
-+static void chardev_open_socket_cmd(Chardev *chr,
-+                                    const char *cmd,
-+                                    Error **errp)
-+{
-+    int fds[2] = { -1, -1 };
-+    QIOChannelSocket *sioc = NULL;
-+    pid_t pid = -1;
-+    const char *argv[] = { "/bin/sh", "-c", cmd, NULL };
-+
-+    /*
-+     * We need a Unix domain socket for commands like swtpm and a single
-+     * connection, therefore we cannot use qio_channel_command_new_spawn()
-+     * without patching it first. Duplicating the functionality is easier.
-+     */
-+    if (socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0, fds)) {
-+        error_setg_errno(errp, errno, "Error creating socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC)");
-+        goto error;
-+    }
-+
-+    pid = qemu_fork(errp);
-+    if (pid < 0) {
-+        goto error;
-+    }
-+
-+    if (!pid) {
-+        /* child */
-+        dup2(fds[1], STDIN_FILENO);
-+        execv(argv[0], (char * const *)argv);
-+        _exit(1);
-+    }
-+
-+    /*
-+     * Hand over our end of the socket pair to the qio channel.
-+     *
-+     * We don't reap the child because it is expected to keep
-+     * running. We also don't support the "reconnect" option for the
-+     * same reason.
-+     */
-+    sioc = qio_channel_socket_new_fd(fds[0], errp);
-+    if (!sioc) {
-+        goto error;
-+    }
-+    fds[0] = -1;
-+
-+    g_free(chr->filename);
-+    chr->filename = g_strdup_printf("cmd:%s", cmd);
-+    tcp_chr_new_client(chr, sioc);
-+
-+ error:
-+    if (fds[0] >= 0) {
-+        close(fds[0]);
-+    }
-+    if (fds[1] >= 0) {
-+        close(fds[1]);
-+    }
-+    if (sioc) {
-+        object_unref(OBJECT(sioc));
-+    }
-+}
-+#endif
- 
- static void qmp_chardev_open_socket(Chardev *chr,
-                                     ChardevBackend *backend,
-@@ -1323,6 +1384,9 @@ static void qmp_chardev_open_socket(Chardev *chr,
- {
-     SocketChardev *s = SOCKET_CHARDEV(chr);
-     ChardevSocket *sock = backend->u.socket.data;
-+#ifndef _WIN32
-+    const char *cmd     = sock->cmd;
-+#endif
-     bool do_nodelay     = sock->has_nodelay ? sock->nodelay : false;
-     bool is_listen      = sock->has_server  ? sock->server  : true;
-     bool is_telnet      = sock->has_telnet  ? sock->telnet  : false;
-@@ -1393,6 +1457,14 @@ static void qmp_chardev_open_socket(Chardev *chr,
- 
-     update_disconnected_filename(s);
- 
-+#ifndef _WIN32
-+    if (cmd) {
-+        chardev_open_socket_cmd(chr, cmd, errp);
-+
-+        /* everything ready (or failed permanently) before we return */
-+        *be_opened = true;
-+    } else
-+#endif
-     if (s->is_listen) {
-         if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270,
-                                            is_waitconnect, errp) < 0) {
-@@ -1412,6 +1484,9 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
-     const char *host = qemu_opt_get(opts, "host");
-     const char *port = qemu_opt_get(opts, "port");
-     const char *fd = qemu_opt_get(opts, "fd");
-+#ifndef _WIN32
-+    const char *cmd = qemu_opt_get(opts, "cmd");
-+#endif
- #ifdef CONFIG_LINUX
-     bool tight = qemu_opt_get_bool(opts, "tight", true);
-     bool abstract = qemu_opt_get_bool(opts, "abstract", false);
-@@ -1419,6 +1494,20 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
-     SocketAddressLegacy *addr;
-     ChardevSocket *sock;
- 
-+#ifndef _WIN32
-+    if (cmd) {
-+        /*
-+         * Here we have to ensure that no options are set which are incompatible with
-+         * spawning a command, otherwise unmodified code that doesn't know about
-+         * command spawning (like socket_reconnect_timeout()) might get called.
-+         */
-+        if (path || sock->server || sock->has_telnet || sock->has_tn3270 || sock->reconnect || host || port || sock->tls_creds) {
-+            error_setg(errp, "chardev: socket: cmd does not support any additional options");
-+            return;
-+        }
-+    } else
-+#endif
-+
-     if ((!!path + !!fd + !!host) > 1) {
-         error_setg(errp,
-                    "None or one of 'path', 'fd' or 'host' option required.");
-@@ -1469,13 +1558,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
-     sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds"));
-     sock->has_tls_authz = qemu_opt_get(opts, "tls-authz");
-     sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz"));
-+#ifndef _WIN32
-+    sock->cmd = g_strdup(cmd);
-+#endif
- 
-     addr = g_new0(SocketAddressLegacy, 1);
-+#ifndef _WIN32
-+    if (path || cmd) {
-+#else
-     if (path) {
-+#endif
-         UnixSocketAddress *q_unix;
-         addr->type = SOCKET_ADDRESS_TYPE_UNIX;
-         q_unix = addr->u.q_unix.data = g_new0(UnixSocketAddress, 1);
-+#ifndef _WIN32
-+        q_unix->path = cmd ? g_strdup_printf("cmd:%s", cmd) : g_strdup(path);
-+#else
-         q_unix->path = g_strdup(path);
-+#endif
- #ifdef CONFIG_LINUX
-         q_unix->has_tight = true;
-         q_unix->tight = tight;
-diff --git a/chardev/char.c b/chardev/char.c
-index 0169d8dde..ce9a21f41 100644
---- a/chardev/char.c
-+++ b/chardev/char.c
-@@ -835,6 +835,9 @@ QemuOptsList qemu_chardev_opts = {
-         },{
-             .name = "path",
-             .type = QEMU_OPT_STRING,
-+        },{
-+            .name = "cmd",
-+            .type = QEMU_OPT_STRING,
-         },{
-             .name = "host",
-             .type = QEMU_OPT_STRING,
-diff --git a/qapi/char.json b/qapi/char.json
-index 7b4215157..37feabdac 100644
---- a/qapi/char.json
-+++ b/qapi/char.json
-@@ -250,6 +250,10 @@
- #
- # @addr: socket address to listen on (server=true)
- #        or connect to (server=false)
-+# @cmd: command to run via "sh -c" with stdin as one end of
-+#       a AF_UNIX SOCK_DSTREAM socket pair. The other end
-+#       is used by the chardev. Either an addr or a cmd can
-+#       be specified, but not both.
- # @tls-creds: the ID of the TLS credentials object (since 2.6)
- # @tls-authz: the ID of the QAuthZ authorization object against which
- #             the client's x509 distinguished name will be validated. This
-@@ -276,6 +280,7 @@
- ##
- { 'struct': 'ChardevSocket',
-   'data': { 'addr': 'SocketAddressLegacy',
-+            '*cmd': 'str',
-             '*tls-creds': 'str',
-             '*tls-authz'  : 'str',
-             '*server': 'bool',
--- 
-2.30.2
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/CVE-2022-3165.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/CVE-2022-3165.patch
deleted file mode 100644
index 3b4a6694..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/CVE-2022-3165.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-CVE: CVE-2022-3165
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From d307040b18bfcb1393b910f1bae753d5c12a4dc7 Mon Sep 17 00:00:00 2001
-From: Mauro Matteo Cascella <mcascell@redhat.com>
-Date: Sun, 25 Sep 2022 22:45:11 +0200
-Subject: [PATCH] ui/vnc-clipboard: fix integer underflow in
- vnc_client_cut_text_ext
-
-Extended ClientCutText messages start with a 4-byte header. If len < 4,
-an integer underflow occurs in vnc_client_cut_text_ext. The result is
-used to decompress data in a while loop in inflate_buffer, leading to
-CPU consumption and denial of service. Prevent this by checking dlen in
-protocol_client_msg.
-
-Fixes: CVE-2022-3165
-Fixes: 0bf41cab93e5 ("ui/vnc: clipboard support")
-Reported-by: TangPeng <tangpeng@qianxin.com>
-Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
-Message-Id: <20220925204511.1103214-1-mcascell@redhat.com>
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
----
- ui/vnc.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/ui/vnc.c b/ui/vnc.c
-index 6a05d06147..acb3629cd8 100644
---- a/ui/vnc.c
-+++ b/ui/vnc.c
-@@ -2442,8 +2442,8 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)
-         if (len == 1) {
-             return 8;
-         }
-+        uint32_t dlen = abs(read_s32(data, 4));
-         if (len == 8) {
--            uint32_t dlen = abs(read_s32(data, 4));
-             if (dlen > (1 << 20)) {
-                 error_report("vnc: client_cut_text msg payload has %u bytes"
-                              " which exceeds our limit of 1MB.", dlen);
-@@ -2456,8 +2456,13 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)
-         }
- 
-         if (read_s32(data, 4) < 0) {
--            vnc_client_cut_text_ext(vs, abs(read_s32(data, 4)),
--                                    read_u32(data, 8), data + 12);
-+            if (dlen < 4) {
-+                error_report("vnc: malformed payload (header less than 4 bytes)"
-+                             " in extended clipboard pseudo-encoding.");
-+                vnc_client_error(vs);
-+                break;
-+            }
-+            vnc_client_cut_text_ext(vs, dlen, read_u32(data, 8), data + 12);
-             break;
-         }
-         vnc_client_cut_text(vs, read_u32(data, 4), data + 8);
--- 
-GitLab
-
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/arm-cpreg-fix.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/arm-cpreg-fix.patch
deleted file mode 100644
index 071691f8..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/arm-cpreg-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-target/arm: mark SP_EL1 with ARM_CP_EL3_NO_EL2_KEEP
-
-SP_EL1 must be kept when EL3 is present but EL2 is not. Therefore mark
-it with ARM_CP_EL3_NO_EL2_KEEP.
-
-Fixes: 696ba3771894 ("target/arm: Handle cpreg registration for missing EL")
-Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
-
-Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2022-09/msg04515.html]
-
----
- target/arm/helper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: qemu-7.1.0/target/arm/helper.c
-===================================================================
---- qemu-7.1.0.orig/target/arm/helper.c
-+++ qemu-7.1.0/target/arm/helper.c
-@@ -4971,7 +4971,7 @@ static const ARMCPRegInfo v8_cp_reginfo[
-       .fieldoffset = offsetof(CPUARMState, sp_el[0]) },
-     { .name = "SP_EL1", .state = ARM_CP_STATE_AA64,
-       .opc0 = 3, .opc1 = 4, .crn = 4, .crm = 1, .opc2 = 0,
--      .access = PL2_RW, .type = ARM_CP_ALIAS,
-+      .access = PL2_RW, .type = ARM_CP_ALIAS | ARM_CP_EL3_NO_EL2_KEEP,
-       .fieldoffset = offsetof(CPUARMState, sp_el[1]) },
-     { .name = "SPSel", .state = ARM_CP_STATE_AA64,
-       .opc0 = 3, .opc1 = 0, .crn = 4, .crm = 2, .opc2 = 0,
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/qemu-7.0.0-glibc-2.36.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/qemu-7.0.0-glibc-2.36.patch
deleted file mode 100644
index abad1cfe..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/qemu-7.0.0-glibc-2.36.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Avoid conflicts between sys/mount.h and linux/mount.h that are seen
-with glibc 2.36
-
-Source: https://github.com/archlinux/svntogit-packages/blob/packages/qemu/trunk/qemu-7.0.0-glibc-2.36.patch
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -95,7 +95,25 @@
- #include <linux/soundcard.h>
- #include <linux/kd.h>
- #include <linux/mtio.h>
-+
-+#ifdef HAVE_SYS_MOUNT_FSCONFIG
-+/*
-+ * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
-+ * which in turn prevents use of linux/fs.h. So we have to
-+ * define the constants ourselves for now.
-+ */
-+#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
-+#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
-+#define FS_IOC_GETVERSION              _IOR('v', 1, long)
-+#define FS_IOC_SETVERSION              _IOW('v', 2, long)
-+#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
-+#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
-+#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
-+#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
-+#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
-+#else
- #include <linux/fs.h>
-+#endif
- #include <linux/fd.h>
- #if defined(CONFIG_FIEMAP)
- #include <linux/fiemap.h>
---- a/meson.build
-+++ b/meson.build
-@@ -1686,6 +1686,8 @@ config_host_data.set('HAVE_OPTRESET',
-                      cc.has_header_symbol('getopt.h', 'optreset'))
- config_host_data.set('HAVE_IPPROTO_MPTCP',
-                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
-+config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
-+                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
- 
- # has_member
- config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc
deleted file mode 100644
index 4b0aceb8..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-SUMMARY = "Xilinx's fork of a fast open source processor emulator"
-HOMEPAGE = "https://github.com/xilinx/qemu/"
-
-# This qemu fork is NOT compatible with running on a 32-bit system
-# See: https://github.com/Xilinx/qemu/issues/35
-COMPATIBLE_HOST:arm = "null"
-
-# x86_64 is needed to build nativesdks
-QEMU_TARGETS = "aarch64 arm microblaze microblazeel x86_64"
-
-LIC_FILES_CHKSUM = " \
-                file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
-                file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f \
-                "
-DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-7.1.0:"
-
-PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-FILESEXTRAPATHS:append := ":${COREBASE}/meta/recipes-devtools/qemu/qemu"
-
-SRC_URI += "\
-           file://powerpc_rom.bin \
-           file://run-ptest \
-           file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \
-           file://0002-chardev-connect-socket-to-a-spawned-command.patch \
-           file://0003-apic-fixup-fallthrough-to-PIC.patch \
-           file://0004-configure-Add-pkg-config-handling-for-libgcrypt.patch \
-           file://0005-qemu-Do-not-include-file-if-not-exists.patch \
-           file://0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \
-           file://0007-qemu-Determinism-fixes.patch \
-           file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \
-           file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \
-           file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \
-           file://0001-net-tulip-Restrict-DMA-engine-to-memories.patch \
-           file://arm-cpreg-fix.patch \
-           file://CVE-2022-3165.patch \
-           file://qemu-guest-agent.init \
-           file://qemu-guest-agent.udev \
-           "
-
-# Workaround for 8.2 patch that doesn't apply
-SRC_URI:remove = "file://0011-linux-user-workaround-for-missing-MAP_FIXED_NOREPLAC.patch"
-SRC_URI:remove = "file://0012-linux-user-workaround-for-missing-MAP_SHARED_VALIDAT.patch"
-
-S = "${WORKDIR}/git"
-
-PACKAGECONFIG ??= " \
-    fdt sdl kvm gcrypt pie slirp \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \
-"
-PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm gcrypt pie slirp"
-
-# Disable this
-PACKAGECONFIG[debuginfo] = ""
-PACKAGECONFIG[pipewire] = ""
-PACKAGECONFIG[sndio] = ""
-
-DISABLE_STATIC:pn-${PN} = ""
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
new file mode 100644
index 00000000..5416f128
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
@@ -0,0 +1,89 @@
+SUMMARY = "Xilinx's fork of a fast open source processor emulator"
+HOMEPAGE = "https://github.com/xilinx/qemu/"
+
+# This qemu fork is NOT compatible with running on a 32-bit system
+# See: https://github.com/Xilinx/qemu/issues/35
+COMPATIBLE_HOST:arm = "null"
+
+# x86_64 is needed to build nativesdks
+QEMU_TARGETS = "aarch64 arm microblaze microblazeel riscv32 x86_64"
+
+BRANCH = "xlnx_rel_v2024.2"
+SRCREV = "01482fa113dcbfa785feb7d513df50d15ec4c5df"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+                    file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-8.1.0:"
+
+PV .= "+git"
+REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG};name=qemu"
+SRCREV_qemu = "${SRCREV}"
+SRCREV_FORMAT = "qemu"
+
+FILESEXTRAPATHS:append := ":${THISDIR}/qemu-8.1"
+
+# Deal with the broken --disable-download
+SRCREV_berkeley-softfloat-3 = "b64af41c3276f97f0e181920400ee056b9c88037"
+SRCREV_berkeley-testfloat-3 = "40619cbb3bf32872df8c53cc457039229428a263"
+SRCREV_dtc = "b6910bec11614980a21e46fbccc35934b671bd81"
+SRCREV_keycodemapdb = "f5772a62ec52591ff6870b7e8ef32482371f22c6"
+SRCREV_libvfio-user = "0b28d205572c80b568a1003db2c8f37ca333e4d7"
+SRCREV_slirp = "26be815b86e8d49add8c9a8b320239b9594ff03d"
+SRC_URI += "\
+           git://gitlab.com/qemu-project/berkeley-softfloat-3;protocol=https;nobranch=1;destsuffix=git/subprojects/berkeley-softfloat-3;name=berkeley-softfloat-3 \
+           git://gitlab.com/qemu-project/berkeley-testfloat-3;protocol=https;nobranch=1;destsuffix=git/subprojects/berkeley-testfloat-3;name=berkeley-testfloat-3 \
+           git://gitlab.com/qemu-project/dtc.git;protocol=https;nobranch=1;destsuffix=git/subprojects/dtc;name=dtc \
+           git://gitlab.com/qemu-project/keycodemapdb.git;protocol=https;nobranch=1;destsuffix=git/subprojects/keycodemapdb;name=keycodemapdb \
+           git://gitlab.com/qemu-project/libvfio-user.git;protocol=https;nobranch=1;destsuffix=git/subprojects/libvfio-user;name=libvfio-user \
+           git://gitlab.freedesktop.org/slirp/libslirp;protocol=https;nobranch=1;destsuffix=git/subprojects/slirp;name=slirp \
+"
+
+# Configure meson for disable-download
+do_configure:prepend() {
+        cp ${S}/subprojects/packagefiles/berkeley-softfloat-3/* ${S}/subprojects/berkeley-softfloat-3/.
+        cp ${S}/subprojects/packagefiles/berkeley-testfloat-3/* ${S}/subprojects/berkeley-testfloat-3/.
+}
+
+
+# Keep this in sync with the main YP QEMU integration
+SRC_URI += "\
+           file://powerpc_rom.bin \
+           file://run-ptest \
+           file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \
+           file://0003-apic-fixup-fallthrough-to-PIC.patch \
+           file://0004-configure-Add-pkg-config-handling-for-libgcrypt.patch \
+           file://0005-qemu-Do-not-include-file-if-not-exists.patch \
+           file://0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \
+           file://0007-qemu-Determinism-fixes.patch \
+           file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \
+           file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \
+           file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \
+           file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \
+           file://fixedmeson.patch \
+           file://no-pip.patch \
+           file://qemu-guest-agent.init \
+           file://qemu-guest-agent.udev \
+           "
+
+# Patch doesn't apply to 8.1.0
+#           file://fixmips.patch 
+
+# 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 = "${UNPACKDIR}/git"
+
+# Based on qemu settings in poky/meta/conf/distro/include/no-static-libs.inc
+DISABLE_STATIC:pn-qemu-xilinx = ""
+DISABLE_STATIC:pn-qemu-xilinx-native = ""
+DISABLE_STATIC:pn-nativesdk-qemu-xilinx = ""
+DISABLE_STATIC:pn-qemu-xilinx-system-native = ""
+
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
index 1eec0163..52c0da6a 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
@@ -15,6 +15,6 @@ do_compile[noexec] = "1"
 SYSROOT_DIRS += "${bindir}/qemu-xilinx"
 
 do_install() {
-        install -Dm 0755 ${WORKDIR}/qemu-system-aarch64-multiarch ${D}${bindir}/qemu-system-aarch64-multiarch
+        install -Dm 0755 ${UNPACKDIR}/qemu-system-aarch64-multiarch ${D}${bindir}/qemu-system-aarch64-multiarch
 }
 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc
deleted file mode 100644
index e664a580..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-require recipes-devtools/qemu/qemu-native.inc
-require qemu-xilinx-7.1.inc
-
-DEPENDS = "glib-2.0-native zlib-native ninja-native meson-native"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-8.1.inc
new file mode 100644
index 00000000..ad00453f
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-8.1.inc
@@ -0,0 +1,2 @@
+require qemu-native-8.1.inc
+require qemu-xilinx-8.1.inc
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb
deleted file mode 100644
index bfdb916d..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require qemu-xilinx-2022.1.inc
-require qemu-xilinx-native-7.1.inc
-require qemu-native-alt.inc
-
-BPN = "qemu-xilinx"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent"
-
-PACKAGECONFIG ??= "pie"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb
deleted file mode 100644
index f91eb891..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require qemu-xilinx-2022.2.inc
-require qemu-xilinx-native-7.1.inc
-require qemu-native-alt.inc
-
-BPN = "qemu-xilinx"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent"
-
-PACKAGECONFIG ??= "pie"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb
deleted file mode 100644
index a19b2cc3..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require qemu-xilinx-2023.1.inc
-require qemu-xilinx-native-7.1.inc
-require qemu-native-alt.inc
-
-BPN = "qemu-xilinx"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent"
-
-PACKAGECONFIG ??= "pie"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.2.bb
deleted file mode 100644
index 78ffedca..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require qemu-xilinx-2023.2.inc
-require qemu-xilinx-native-7.1.inc
-require qemu-native-alt.inc
-
-BPN = "qemu-xilinx"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent"
-
-PACKAGECONFIG ??= "pie"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_8.1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_8.1.0.bb
new file mode 100644
index 00000000..49ffbe6e
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_8.1.0.bb
@@ -0,0 +1,10 @@
+BPN = "qemu-xilinx"
+
+DEPENDS += "glib-2.0-native zlib-native"
+
+require qemu-xilinx-native-8.1.inc
+require qemu-native-alt.inc
+
+EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-install-blobs --disable-guest-agent"
+
+PACKAGECONFIG ??= "pie"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend
index 7c152d60..45bbccdf 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend
@@ -1,5 +1,5 @@
 # Automatically enable pmu-rom-native for ZynqMP support
 PMU_ROM_DEP[vardepsexclude] = "LICENSE_FLAGS_ACCEPTED"
-PMU_ROM_DEP = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "xilinx", " pmu-rom-native", "", d)}"
+PMU_ROM_DEP = "${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "xilinx xilinx_pmu-rom-native", " pmu-rom-native", "", d)}"
 
 DEPENDS .= "${PMU_ROM_DEP}"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb
deleted file mode 100644
index ba733ede..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require qemu-system-native-alt.inc
-require qemu-xilinx-2022.1.inc
-require qemu-xilinx-native-7.1.inc
-
-PROVIDES = "qemu-system-native"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
-
-PACKAGECONFIG ??= "fdt alsa kvm gcrypt pie slirp"
-
-PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
-
-DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native"
-DEPENDS += "qemu-xilinx-multiarch-helper-native"
-
-do_install:append() {
-    # The following is also installed by qemu-native
-    rm -f ${D}${datadir}/qemu/trace-events-all
-    rm -rf ${D}${datadir}/qemu/keymaps
-    rm -rf ${D}${datadir}/icons
-    rm -rf ${D}${includedir}/qemu-plugin.h
-
-    # Install qmp.py to be used with testimage
-    install -d ${D}${libdir}/qemu-python/qmp/
-    install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/
-}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb
deleted file mode 100644
index 17386afe..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require qemu-system-native-alt.inc
-require qemu-xilinx-2022.2.inc
-require qemu-xilinx-native-7.1.inc
-
-PROVIDES = "qemu-system-native"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
-
-PACKAGECONFIG ??= "fdt alsa kvm gcrypt pie slirp"
-
-PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
-
-DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native"
-DEPENDS += "qemu-xilinx-multiarch-helper-native"
-
-do_install:append() {
-    # The following is also installed by qemu-native
-    rm -f ${D}${datadir}/qemu/trace-events-all
-    rm -rf ${D}${datadir}/qemu/keymaps
-    rm -rf ${D}${datadir}/icons
-    rm -rf ${D}${includedir}/qemu-plugin.h
-
-    # Install qmp.py to be used with testimage
-    install -d ${D}${libdir}/qemu-python/qmp/
-    install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/
-}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb
deleted file mode 100644
index 3264c260..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require qemu-system-native-alt.inc
-require qemu-xilinx-2023.1.inc
-require qemu-xilinx-native-7.1.inc
-
-PROVIDES = "qemu-system-native"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
-
-PACKAGECONFIG ??= "fdt alsa kvm gcrypt pie slirp"
-
-PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
-
-DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native"
-DEPENDS += "qemu-xilinx-multiarch-helper-native"
-
-do_install:append() {
-    # The following is also installed by qemu-native
-    rm -f ${D}${datadir}/qemu/trace-events-all
-    rm -rf ${D}${datadir}/qemu/keymaps
-    rm -rf ${D}${datadir}/icons
-    rm -rf ${D}${includedir}/qemu-plugin.h
-
-    # Install qmp.py to be used with testimage
-    install -d ${D}${libdir}/qemu-python/qmp/
-    install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/
-}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.2.bb
deleted file mode 100644
index fdf3be2e..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.2.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require qemu-system-native-alt.inc
-require qemu-xilinx-2023.2.inc
-require qemu-xilinx-native-7.1.inc
-
-PROVIDES = "qemu-system-native"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
-
-PACKAGECONFIG ??= "fdt alsa kvm gcrypt pie slirp"
-
-PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
-
-DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native"
-DEPENDS += "qemu-xilinx-multiarch-helper-native"
-
-do_install:append() {
-    # The following is also installed by qemu-native
-    rm -f ${D}${datadir}/qemu/trace-events-all
-    rm -rf ${D}${datadir}/qemu/keymaps
-    rm -rf ${D}${datadir}/icons
-    rm -rf ${D}${includedir}/qemu-plugin.h
-
-    # Install qmp.py to be used with testimage
-    install -d ${D}${libdir}/qemu-python/qmp/
-    install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/
-}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb
new file mode 100644
index 00000000..1e626ffe
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb
@@ -0,0 +1,34 @@
+BPN = "qemu-xilinx"
+
+require qemu-system-native-alt.inc
+require qemu-xilinx-native-8.1.inc
+
+# As some of the files installed by qemu-native and qemu-system-native
+# are the same, we depend on qemu-native to get the full installation set
+# and avoid file clashes
+DEPENDS += "glib-2.0-native zlib-native pixman-native qemu-native"
+
+DEPENDS += "qemu-xilinx-multiarch-helper-native bootgen-native"
+
+EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
+
+PACKAGECONFIG ??= "fdt alsa kvm pie slirp png gcrypt \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+"
+
+# Handle distros such as CentOS 5 32-bit that do not have kvm support
+PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
+
+do_install:append() {
+    install -Dm 0755 ${UNPACKDIR}/powerpc_rom.bin ${D}${datadir}/qemu-xilinx
+
+    # The following is also installed by qemu-native
+    rm -f ${D}${datadir}/qemu-xilinx/trace-events-all
+    rm -rf ${D}${datadir}/qemu-xilinx/keymaps
+    rm -rf ${D}${datadir}/icons/
+    rm -rf ${D}${includedir}/qemu-plugin.h
+
+    # Install qmp.py to be used with testimage
+    install -d ${D}${libdir}/qemu-python/qmp/
+    install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/
+}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb
deleted file mode 100644
index 96b26101..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require qemu-xilinx-2022.1.inc
-require recipes-devtools/qemu/qemu.inc
-require qemu-xilinx-7.1.inc
-require qemu-alt.inc
-
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH:class-target = "${@bb.utils.contains_any('DEPENDS', 'libepoxy virglrenderer', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
-
-BBCLASSEXTEND = "nativesdk"
-
-RDEPENDS:${PN}:class-target += "bash"
-
-PROVIDES:class-nativesdk = "nativesdk-qemu"
-RPROVIDES:${PN}:class-nativesdk = "nativesdk-qemu"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
-EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
-EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
-
-do_install:append:class-nativesdk() {
-    ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)}
-}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb
deleted file mode 100644
index c6e91fdd..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-require qemu-xilinx-2022.2.inc
-require recipes-devtools/qemu/qemu.inc
-require qemu-xilinx-7.1.inc
-require qemu-alt.inc
-
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH:class-target = "${@bb.utils.contains_any('DEPENDS', 'libepoxy virglrenderer', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
-
-BBCLASSEXTEND = "nativesdk"
-
-RDEPENDS:${PN}:class-target += "bash"
-
-PROVIDES:class-nativesdk = "nativesdk-qemu"
-RPROVIDES:${PN}:class-nativesdk = "nativesdk-qemu"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
-EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
-EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
-
-do_install:append:class-nativesdk() {
-    ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)}
-}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb
deleted file mode 100644
index fca09883..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require qemu-xilinx-2023.1.inc
-require recipes-devtools/qemu/qemu.inc
-require qemu-xilinx-7.1.inc
-require qemu-alt.inc
-
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH:class-target = "${@bb.utils.contains_any('DEPENDS', 'libepoxy virglrenderer', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
-
-BBCLASSEXTEND = "nativesdk"
-
-RDEPENDS:${PN}:class-target += "bash"
-
-PROVIDES:class-nativesdk = "nativesdk-qemu"
-RPROVIDES:${PN}:class-nativesdk = "nativesdk-qemu"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
-EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
-EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
-
-do_install:append:class-nativesdk() {
-    ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)}
-}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.2.bb
deleted file mode 100644
index 070ae65f..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.2.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require qemu-xilinx-2023.2.inc
-require recipes-devtools/qemu/qemu.inc
-require qemu-xilinx-7.1.inc
-require qemu-alt.inc
-
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH:class-target = "${@bb.utils.contains_any('DEPENDS', 'libepoxy virglrenderer', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
-
-BBCLASSEXTEND = "nativesdk"
-
-RDEPENDS:${PN}:class-target += "bash"
-
-PROVIDES:class-nativesdk = "nativesdk-qemu"
-RPROVIDES:${PN}:class-nativesdk = "nativesdk-qemu"
-
-# Latest poky has changed the defaults, restore them to something compatible
-# with this QEMU.  When we update to QEMU 8.x this won't be necessary.
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-af-xdp"
-
-EXTRA_OECONF:append = "\
-    --with-git=/bin/false \
-    --with-git-submodules=ignore \
-    --meson=meson \
-"
-
-EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
-EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
-EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
-
-do_install:append:class-nativesdk() {
-    ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)}
-}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_8.1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_8.1.0.bb
new file mode 100644
index 00000000..4679174b
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_8.1.0.bb
@@ -0,0 +1,29 @@
+BBCLASSEXTEND = "nativesdk"
+
+require qemu-8.1.inc
+require qemu-xilinx-8.1.inc
+require qemu-alt.inc
+
+DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native"
+
+DEPENDS:append:libc-musl = " libucontext"
+
+CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}"
+
+RDEPENDS:${PN}-common:class-target += "bash"
+
+EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
+EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
+EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
+
+PACKAGECONFIG ??= " \
+    fdt sdl kvm pie slirp gcrypt \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio xen', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \
+"
+PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie slirp gcrypt \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+"
+# ppc32 hosts are no longer supported in qemu
+COMPATIBLE_HOST:powerpc = "null"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend b/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend
index 04c89b83..9140060e 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend
@@ -1,8 +1 @@
 require qemu-alt.inc
-
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH:class-target = "${@bb.utils.contains_any('DEPENDS', 'libepoxy virglrenderer', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu_8.1.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu_8.1.2.bb
new file mode 100644
index 00000000..4722e1f5
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu_8.1.2.bb
@@ -0,0 +1,29 @@
+BBCLASSEXTEND = "nativesdk"
+
+FILESEXTRAPATHS:append := ":${THISDIR}/qemu-8.1"
+
+require qemu-8.1.inc
+
+DEPENDS += "glib-2.0 zlib pixman"
+
+DEPENDS:append:libc-musl = " libucontext"
+
+CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}"
+
+RDEPENDS:${PN}-common:class-target += "bash"
+
+EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
+EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
+EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
+
+PACKAGECONFIG ??= " \
+    fdt sdl kvm pie slirp \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio xen', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \
+"
+PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie slirp \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+"
+# ppc32 hosts are no longer supported in qemu
+COMPATIBLE_HOST:powerpc = "null"
diff --git a/meta-xilinx-core/recipes-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-gnome/gtk+/gtk+3_%.bbappend b/meta-xilinx-core/recipes-gnome/gtk+/gtk+3_%.bbappend
deleted file mode 100644
index 03823f6e..00000000
--- a/meta-xilinx-core/recipes-gnome/gtk+/gtk+3_%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch b/meta-xilinx-core/recipes-graphics/drm/files/0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch
new file mode 100644
index 00000000..5f7df974
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch
@@ -0,0 +1,37 @@
+From 7edb14622061e87bb4810fb648017b43e767d4c6 Mon Sep 17 00:00:00 2001
+From: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
+Date: Mon, 1 Nov 2021 12:59:36 -0700
+Subject: [PATCH 1/5] [PATCH] libdrm: Update drm header file with XV15 and XV20
+
+This patch updates drm header file with YUV 420 and
+YUV422 10 bit formats.
+
+Signed-off-by: Satish Kumar Nagireddy <satish.nagireddy.nagireddy@xilinx.com>
+Upstream-Status: Pending
+Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
+---
+ include/drm/drm_fourcc.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
+index ed0258c..c5cdaed 100644
+--- a/include/drm/drm_fourcc.h
++++ b/include/drm/drm_fourcc.h
+@@ -318,6 +318,14 @@ extern "C" {
+ #define DRM_FORMAT_Q401                fourcc_code('Q', '4', '0', '1')
+ 
+ /*
++ * 2 plane 10 bit per component YCbCr
++ * index 0 = Y plane, [31:0] x:Y2:Y1:Y0 2:10:10:10 little endian
++ * index 1 = Cb:Cr plane, [63:0] x:Cb2:Cr2:Cb1:x:Cr1:Cb0:Cr0 2:10:10:10:2:10:10:10 little endian
++ */
++#define DRM_FORMAT_XV15                fourcc_code('X', 'V', '1', '5') /* 2x2 subsampled Cb:Cr plane 2:10:10:10 */
++#define DRM_FORMAT_XV20                fourcc_code('X', 'V', '2', '0') /* 2x1 subsampled Cb:Cr plane 2:10:10:10 */
++
++/*
+  * 3 plane YCbCr
+  * index 0: Y plane, [7:0] Y
+  * index 1: Cb plane, [7:0] Cb
+-- 
+2.7.4
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0001-headers-Sync-with-HDR-from-v5.15.patch b/meta-xilinx-core/recipes-graphics/drm/files/0001-headers-Sync-with-HDR-from-v5.15.patch
new file mode 100644
index 00000000..77a457ce
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0001-headers-Sync-with-HDR-from-v5.15.patch
@@ -0,0 +1,207 @@
+From d159e3f782d33988e52db462948e2e0eab2b9a03 Mon Sep 17 00:00:00 2001
+From: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Date: Thu, 17 Mar 2022 08:21:41 -0700
+Subject: [PATCH] headers: Sync with HDR from v5.15
+
+Sync drm_mode.h with linux-xlnx/include/uapi/drm/drm_mode.h for HDR
+
+Upstream-Status: Pending
+
+Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com>
+---
+ include/drm/drm_mode.h | 129 +++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 125 insertions(+), 4 deletions(-)
+
+diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
+index 9b6722d..bbce882 100644
+--- a/include/drm/drm_mode.h
++++ b/include/drm/drm_mode.h
+@@ -312,16 +312,48 @@ struct drm_mode_set_plane {
+        __u32 src_w;
+ };
+ 
++/**
++ * struct drm_mode_get_plane - Get plane metadata.
++ *
++ * Userspace can perform a GETPLANE ioctl to retrieve information about a
++ * plane.
++ *
++ * To retrieve the number of formats supported, set @count_format_types to zero
++ * and call the ioctl. @count_format_types will be updated with the value.
++ *
++ * To retrieve these formats, allocate an array with the memory needed to store
++ * @count_format_types formats. Point @format_type_ptr to this array and call
++ * the ioctl again (with @count_format_types still set to the value returned in
++ * the first ioctl call).
++ */
+ struct drm_mode_get_plane {
++       /**
++        * @plane_id: Object ID of the plane whose information should be
++        * retrieved. Set by caller.
++        */
+        __u32 plane_id;
+ 
++       /** @crtc_id: Object ID of the current CRTC. */
+        __u32 crtc_id;
++       /** @fb_id: Object ID of the current fb. */
+        __u32 fb_id;
+ 
++       /**
++        * @possible_crtcs: Bitmask of CRTC's compatible with the plane. CRTC's
++        * are created and they receive an index, which corresponds to their
++        * position in the bitmask. Bit N corresponds to
++        * :ref:`CRTC index<crtc_index>` N.
++        */
+        __u32 possible_crtcs;
++       /** @gamma_size: Never used. */
+        __u32 gamma_size;
+ 
++       /** @count_format_types: Number of formats. */
+        __u32 count_format_types;
++       /**
++        * @format_type_ptr: Pointer to ``__u32`` array of formats that are
++        * supported by the plane. These formats do not require modifiers.
++        */
+        __u64 format_type_ptr;
+ };
+ 
+@@ -509,22 +541,74 @@ struct drm_mode_get_connector {
+  */
+ #define DRM_MODE_PROP_ATOMIC        0x80000000
+ 
++/**
++ * struct drm_mode_property_enum - Description for an enum/bitfield entry.
++ * @value: numeric value for this enum entry.
++ * @name: symbolic name for this enum entry.
++ *
++ * See struct drm_property_enum for details.
++ */
+ struct drm_mode_property_enum {
+        __u64 value;
+        char name[DRM_PROP_NAME_LEN];
+ };
+ 
++/**
++ * struct drm_mode_get_property - Get property metadata.
++ *
++ * User-space can perform a GETPROPERTY ioctl to retrieve information about a
++ * property. The same property may be attached to multiple objects, see
++ * "Modeset Base Object Abstraction".
++ *
++ * The meaning of the @values_ptr field changes depending on the property type.
++ * See &drm_property.flags for more details.
++ *
++ * The @enum_blob_ptr and @count_enum_blobs fields are only meaningful when the
++ * property has the type &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK. For
++ * backwards compatibility, the kernel will always set @count_enum_blobs to
++ * zero when the property has the type &DRM_MODE_PROP_BLOB. User-space must
++ * ignore these two fields if the property has a different type.
++ *
++ * User-space is expected to retrieve values and enums by performing this ioctl
++ * at least twice: the first time to retrieve the number of elements, the
++ * second time to retrieve the elements themselves.
++ *
++ * To retrieve the number of elements, set @count_values and @count_enum_blobs
++ * to zero, then call the ioctl. @count_values will be updated with the number
++ * of elements. If the property has the type &DRM_MODE_PROP_ENUM or
++ * &DRM_MODE_PROP_BITMASK, @count_enum_blobs will be updated as well.
++ *
++ * To retrieve the elements themselves, allocate an array for @values_ptr and
++ * set @count_values to its capacity. If the property has the type
++ * &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK, allocate an array for
++ * @enum_blob_ptr and set @count_enum_blobs to its capacity. Calling the ioctl
++ * again will fill the arrays.
++ */
+ struct drm_mode_get_property {
+-       __u64 values_ptr; /* values and blob lengths */
+-       __u64 enum_blob_ptr; /* enum and blob id ptrs */
++       /** @values_ptr: Pointer to a ``__u64`` array. */
++       __u64 values_ptr;
++       /** @enum_blob_ptr: Pointer to a struct drm_mode_property_enum array. */
++       __u64 enum_blob_ptr;
+ 
++       /**
++        * @prop_id: Object ID of the property which should be retrieved. Set
++        * by the caller.
++        */
+        __u32 prop_id;
++       /**
++        * @flags: ``DRM_MODE_PROP_*`` bitfield. See &drm_property.flags for
++        * a definition of the flags.
++        */
+        __u32 flags;
++       /**
++        * @name: Symbolic property name. User-space should use this field to
++        * recognize properties.
++        */
+        char name[DRM_PROP_NAME_LEN];
+ 
++       /** @count_values: Number of elements in @values_ptr. */
+        __u32 count_values;
+-       /* This is only used to count enum values, not blobs. The _blobs is
+-        * simply because of a historical reason, i.e. backwards compat. */
++       /** @count_enum_blobs: Number of elements in @enum_blob_ptr. */
+        __u32 count_enum_blobs;
+ };
+ 
+@@ -578,6 +662,8 @@ struct drm_mode_fb_cmd {
+ 
+ #define DRM_MODE_FB_INTERLACED (1<<0) /* for interlaced framebuffers */
+ #define DRM_MODE_FB_MODIFIERS  (1<<1) /* enables ->modifer[] */
++#define DRM_MODE_FB_ALTERNATE_TOP      (1<<2) /* for alternate top field */
++#define DRM_MODE_FB_ALTERNATE_BOTTOM   (1<<3) /* for alternate bottom field */
+ 
+ struct drm_mode_fb_cmd2 {
+        __u32 fb_id;
+@@ -733,6 +819,20 @@ struct drm_color_lut {
+        __u16 reserved;
+ };
+ 
++enum drm_hdr_type {
++       /*
++        * This is for the gen_hdr_output_metadata structure.
++        * MSB differentiates static (0) or dynamic (1) metadata.
++        * Other 15 bits represent specific HDR standards.
++        */
++
++       /* static HDR */
++       DRM_HDR_TYPE_HDR10     = 0x0000,
++
++       /* dynamic HDR */
++       DRM_HDR_TYPE_HDR10P    = 1 << 15 | DRM_HDR_TYPE_HDR10,
++};
++
+ /**
+  * struct hdr_metadata_infoframe - HDR Metadata Infoframe Data.
+  *
+@@ -819,6 +919,27 @@ struct hdr_output_metadata {
+        };
+ };
+ 
++/**
++ * struct gen_hdr_output_metadata - Generic HDR output metadata
++ *
++ * Generic HDR Metadata Information to be passed from userspace
++ */
++struct gen_hdr_output_metadata {
++       /**
++        * @metadata_type: HDR type.
++        */
++       __u16 metadata_type;
++       /**
++        * @size: size of payload/metadata.
++        */
++       __u16 size;
++       /**
++        * @payload: Actual metadata - HDR Metadata Infoframe.
++        * Currently the largest extended HDR infoframe is 4000 bytes.
++        */
++       __u8 payload[4000];
++};
++
+ #define DRM_MODE_PAGE_FLIP_EVENT 0x01
+ #define DRM_MODE_PAGE_FLIP_ASYNC 0x02
+ #define DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE 0x4
+-- 
+2.17.1
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch b/meta-xilinx-core/recipes-graphics/drm/files/0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch
new file mode 100644
index 00000000..c517221a
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch
@@ -0,0 +1,433 @@
+From de3fffbf7af9d28b5f9d9e118de448a54e2628dd Mon Sep 17 00:00:00 2001
+From: Anil Kumar Mamidala <anil.mamidala@xilinx.com>
+Date: Wed, 27 Oct 2021 16:04:47 +0530
+Subject: [PATCH] modetest: Add YUV444 and X403 format support for modetest
+
+Add YUV44 8-bit and X403 10-bit formats support to modetest
+for generating color bar pattern.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anil Kumar Mamidala <anil.mamidala@xilinx.com>
+---
+ include/drm/drm_fourcc.h |   7 +
+ tests/modetest/buffers.c |  32 +++++
+ tests/util/format.c      |   4 +
+ tests/util/pattern.c     | 270 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 313 insertions(+)
+
+Index: libdrm-2.4.118/include/drm/drm_fourcc.h
+===================================================================
+--- libdrm-2.4.118.orig/include/drm/drm_fourcc.h
++++ libdrm-2.4.118/include/drm/drm_fourcc.h
+@@ -405,6 +405,13 @@ extern "C" {
+ #define DRM_FORMAT_YUV444      fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */
+ #define DRM_FORMAT_YVU444      fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */
+ 
++/* 3 plane non-subsampled (444) YCbCr
++ * 10 bits per component
++ * index 0: Y plane, [31:0] x:Y2:Y1:Y0 [2:10:10:10] little endian
++ * index 1: Cb plane, [31:0] x:Cb2:Cb1:Cb0 [2:10:10:10] little endian
++ * index 2: Cr plane, [31:0] x:Cr2:Cr1:Cr0 [2:10:10:10] little endian
++ */
++#define DRM_FORMAT_X403                fourcc_code('X', '4', '0', '3') /* non-subsampled Cb:Cr plane, 10 bit per channel */
+ 
+ /*
+  * Format Modifiers:
+Index: libdrm-2.4.118/tests/modetest/buffers.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/modetest/buffers.c
++++ libdrm-2.4.118/tests/modetest/buffers.c
+@@ -145,6 +145,7 @@ bo_create(int fd, unsigned int format,
+        case DRM_FORMAT_NV42:
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
++       case DRM_FORMAT_YUV444:
+                bpp = 8;
+                break;
+ 
+@@ -156,6 +157,7 @@ bo_create(int fd, unsigned int format,
+ 
+        case DRM_FORMAT_XV15:
+        case DRM_FORMAT_XV20:
++       case DRM_FORMAT_X403:
+                bpp = 10;
+                break;
+ 
+@@ -242,6 +244,11 @@ bo_create(int fd, unsigned int format,
+                virtual_height = height * 2;
+                break;
+ 
++       case DRM_FORMAT_X403:
++               virtual_width = (width * 32) / 30;
++               virtual_height = height * 3;
++               break;
++
+        case DRM_FORMAT_NV16:
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV20:
+@@ -249,6 +256,11 @@ bo_create(int fd, unsigned int format,
+                virtual_height = height * 2;
+                break;
+ 
++       case DRM_FORMAT_YUV444:
++               virtual_width = width;
++               virtual_height = height * 3;
++               break;
++
+        case DRM_FORMAT_NV24:
+        case DRM_FORMAT_NV42:
+        case DRM_FORMAT_NV30:
+@@ -322,6 +334,24 @@ bo_create(int fd, unsigned int format,
+                planes[1] = virtual + offsets[1];
+                break;
+ 
++       case DRM_FORMAT_X403:
++       case DRM_FORMAT_YUV444:
++               offsets[0] = 0;
++               handles[0] = bo->handle;
++               pitches[0] = bo->pitch;
++               pitches[1] = pitches[0];
++               offsets[1] = pitches[0] * height;
++               handles[1] = bo->handle;
++               pitches[2] = pitches[1];
++               offsets[2] = offsets[1] + pitches[1] * height;
++               handles[2] = bo->handle;
++
++
++               planes[0] = virtual;
++               planes[1] = virtual + offsets[1];
++               planes[2] = virtual + offsets[2];
++               break;
++
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
+                offsets[0] = 0;
+Index: libdrm-2.4.118/tests/util/format.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/format.c
++++ libdrm-2.4.118/tests/util/format.c
+@@ -64,6 +64,10 @@ static const struct util_format_info for
+        /* YUV planar */
+        { DRM_FORMAT_YUV420, "YU12", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 1) },
+        { DRM_FORMAT_YVU420, "YV12", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 1) },
++       { DRM_FORMAT_YUV444, "YU24", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 1) },
++       { DRM_FORMAT_YVU444, "YV24", MAKE_YUV_INFO(YUV_YCrCb, 1, 1, 1) },
++       { DRM_FORMAT_X403, "X403", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 1) },
++
+        /* RGB16 */
+        { DRM_FORMAT_ARGB4444, "AR12", MAKE_RGB_INFO(4, 8, 4, 4, 4, 0, 4, 12) },
+        { DRM_FORMAT_XRGB4444, "XR12", MAKE_RGB_INFO(4, 8, 4, 4, 4, 0, 0, 0) },
+Index: libdrm-2.4.118/tests/util/pattern.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/pattern.c
++++ libdrm-2.4.118/tests/util/pattern.c
+@@ -596,6 +596,175 @@ static void fill_smpte_yuv_semiplanar_10
+        }
+ }
+ 
++static void fill_smpte_yuv_planar_x403(
++                               const struct util_yuv_info *yuv,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem,
++                               unsigned int width,
++                               unsigned int height, unsigned int stride)
++{
++       const struct color_yuv colors_top[] = {
++               MAKE_YUV_601(191, 192, 192),    /* grey */
++               MAKE_YUV_601(192, 192, 0),      /* yellow */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(0, 192, 0),        /* green */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(192, 0, 0),        /* red */
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++       };
++       const struct color_yuv colors_middle[] = {
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 192, 192),    /* grey */
++       };
++       const struct color_yuv colors_bottom[] = {
++               MAKE_YUV_601(0, 33, 76),        /* in-phase */
++               MAKE_YUV_601(255, 255, 255),    /* super white */
++               MAKE_YUV_601(50, 0, 106),       /* quadrature */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(9, 9, 9),          /* 3.5% */
++               MAKE_YUV_601(19, 19, 19),       /* 7.5% */
++               MAKE_YUV_601(29, 29, 29),       /* 11.5% */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++       };
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int xsub = yuv->xsub;
++       unsigned int ysub = yuv->ysub;
++       unsigned int x;
++       unsigned int y;
++       unsigned int cval = 0;
++
++       for (y = 0; y < height * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_top[x * 7 / width].y << 2 |
++                               colors_top[(x+1) * 7 / width].y << 12 |
++                               colors_top[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_middle[x * 7 / width].y << 2 |
++                               colors_middle[(x+1) * 7 / width].y << 12 |
++                               colors_middle[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[x * 4 / (width * 5 / 7)].y << 2 |
++                               colors_bottom[(x + 1) * 4 / (width * 5 / 7)]
++                               .y << 12 | colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].y << 22;
++
++               for (; x < width * 6 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 2 |
++                               colors_bottom[((x + 1) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 12 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 22;
++
++               for (; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] = colors_bottom[7].y << 2 |
++                               colors_bottom[7].y << 12 |
++                               colors_bottom[7].y << 22;
++               y_mem += stride;
++       }
++
++       /* Chroma */
++       unsigned int *cb_mem = (unsigned int *)u_mem;
++       unsigned int *cr_mem = (unsigned int *)v_mem;
++
++       for (y = 0; y < height / ysub * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 3) {
++                       cval = (colors_top[x * 7 / width].u << 2) |
++                               (colors_top[(x + 1) * 7 / width].u << 12) |
++                               (colors_top[(x + 2) * 7 / width].u << 22);
++                       cb_mem[x/3] = cval;
++                       cval = (colors_top[(x) * 7 / width].v << 2) |
++                               (colors_top[(x + 1) * 7 / width].v << 12) |
++                               (colors_top[(x + 2) * 7 / width].v << 22);
++                       cr_mem[x/3] = cval;
++               }
++               cb_mem += stride/4;
++               cr_mem += stride/4;
++       }
++
++       for (; y < height / ysub * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 3) {
++                       cval =  (colors_middle[x * 7 / width].u << 2) |
++                               (colors_middle[(x + 1) * 7 / width].u << 12) |
++                               (colors_middle[(x + 2) * 7 / width].u << 22);
++                       cb_mem[x/3] = cval;
++                       cval = (colors_middle[x * 7 / width].v << 2) |
++                               (colors_middle[(x + 1) * 7 / width].v << 12) |
++                               (colors_middle[(x + 2) * 7 / width].v << 22);
++                       cr_mem[x/3] = cval;
++               }
++               cb_mem += stride/4;
++               cr_mem += stride/4;
++       }
++
++       for (; y < height / ysub; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 3) {
++                       cval = colors_bottom[x * 4 /
++                               (width * 5 / 7)].u << 2 |
++                               colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].u << 12 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)]. u << 22;
++                       cb_mem[x/3] = cval;
++
++                       cval = colors_bottom[(x) * 4 /
++                               (width * 5 / 7)].v << 2 |
++                               colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].v << 12 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)].v << 22;
++
++                       cr_mem[x/3] = cval;
++               }
++               for (; x < width * 6 / 7; x += 3) {
++                       cval = colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 2 |
++                               colors_bottom[((x + 2)- width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 12 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 22;
++                       cb_mem[x/3] = cval;
++
++                       cval = colors_bottom[((x) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 2 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 12 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 22;
++                       cr_mem[x/3] = cval;
++               }
++               for (; x < width; x += 3) {
++                       cval = colors_bottom[7].u << 2 |
++                               colors_bottom[7].u << 12 |
++                               colors_bottom[7].u << 22;
++                       cb_mem[x/3] = cval;
++                       cval = colors_bottom[7].v << 2 |
++                               colors_bottom[7].v << 12 |
++                               colors_bottom[7].v << 22;
++                       cr_mem[x/3] = cval;
++               }
++               cb_mem += stride/4;
++               cr_mem += stride/4;
++       }
++}
++
+ static void fill_smpte_yuv_planar_10b(
+                                const struct util_yuv_info *yuv,
+                                unsigned char *y_mem, unsigned char *u_mem,
+@@ -856,6 +1025,88 @@ static void fill_tiles_xv20(
+        }
+ }
+ 
++static void fill_tiles_x403(
++                               const struct util_format_info *info,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, uint32_t width,
++                               uint32_t height, uint32_t stride)
++{
++       const struct util_yuv_info *yuv = &info->yuv;
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int x;
++       unsigned int y;
++       uint32_t shifter = 0, LumVal = 0;
++       uint32_t lumIndex = 0;
++       uint32_t *Lum;
++       uint32_t *uChrom;
++       uint32_t *vChrom;
++       uint32_t ChromVal = 0;
++       uint32_t uchromIndex = 0;
++       uint32_t vchromIndex = 0;
++
++       /* preparing 10 bit Luma */
++       Lum = (uint32_t *)y_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x++) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       //Checking if we got 3 components to pack in 4 bytes
++                       if (shifter == 30) {
++                               Lum[lumIndex] = LumVal;
++                               lumIndex++; shifter = 0; LumVal = 0;
++                       }
++                       LumVal  = (LumVal | ((color.y << 2) << shifter));
++                       shifter += 10; //10 bit precision
++               }
++               lumIndex = 0; shifter = 0; LumVal = 0;
++               y_mem += stride;
++               Lum = (uint32_t *)y_mem;
++       }
++
++       /* Preparing 10 bit Chroma */
++       uChrom = (uint32_t *)u_mem;
++       vChrom = (uint32_t *)v_mem;
++
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x = x + 3) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       uint32_t rgb32_2 = 0x00130502 * (d.quot >> 6)
++                                               + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color_2 =
++                                       MAKE_YUV_601((rgb32_2 >> 16) & 0xff,
++                                      (rgb32_2 >> 8) & 0xff, rgb32_2 & 0xff);
++                       uint32_t rgb32_3 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color_3 =
++                                       MAKE_YUV_601((rgb32_3 >> 16) & 0xff,
++                                       (rgb32_3 >> 8) & 0xff, rgb32_3 & 0xff);
++
++                       ChromVal = ((color.u << 2) << 20)
++                               | ((color_2.u << 2) << 10) | (color_3.u << 2);
++                       uChrom[uchromIndex++] = ChromVal;
++
++                       ChromVal = ((color.v << 2) << 20)
++                               | ((color_2.v << 2) << 10) | (color_3.v << 2);
++                       vChrom[vchromIndex++] = ChromVal;
++               }
++               uchromIndex = 0; vchromIndex = 0; ChromVal = 0;
++               u_mem += stride;
++               v_mem += stride;
++               uChrom = (uint32_t *)u_mem;
++               vChrom = (uint32_t *)v_mem;
++       }
++}
++
++
+ static void fill_smpte_yuv_packed(const struct util_yuv_info *yuv, void *mem,
+                                  unsigned int width, unsigned int height,
+                                  unsigned int stride)
+@@ -1660,10 +1911,19 @@ static void fill_smpte(const struct util
+                                                   planes[1], width, height,
+                                                   stride);
+ 
++       case DRM_FORMAT_X403:
++                       return fill_smpte_yuv_planar_x403(&info->yuv, planes[0], planes[1],
++                                            planes[2], width, height, stride);
++
++
+        case DRM_FORMAT_YUV420:
+                return fill_smpte_yuv_planar(&info->yuv, planes[0], planes[1],
+                                             planes[2], width, height, stride);
+ 
++       case DRM_FORMAT_YUV444:
++               return fill_smpte_yuv_planar(&info->yuv, planes[0], planes[1],
++                                            planes[2], width, height, stride);
++
+        case DRM_FORMAT_YVU420:
+                return fill_smpte_yuv_planar(&info->yuv, planes[0], planes[2],
+                                             planes[1], width, height, stride);
+@@ -2082,6 +2342,11 @@ static void fill_tiles(const struct util
+                return fill_tiles_yuv_planar(info, planes[0], planes[1],
+                                             planes[2], width, height, stride);
+ 
++       case DRM_FORMAT_YUV444:
++               return fill_tiles_yuv_planar(info, planes[0], planes[1],
++                                            planes[2], width, height, stride);
++
++
+        case DRM_FORMAT_YVU420:
+                return fill_tiles_yuv_planar(info, planes[0], planes[2],
+                                             planes[1], width, height, stride);
+@@ -2090,6 +2355,11 @@ static void fill_tiles(const struct util
+                return fill_tiles_xv20(info, planes[0], planes[1],
+                         planes[1], width, height, stride);
+ 
++       case DRM_FORMAT_X403:
++               return fill_tiles_x403(info, planes[0], planes[1],
++                        planes[2], width, height, stride);
++
++
+        case DRM_FORMAT_XV15:
+                return fill_tiles_xv15(info, planes[0], planes[1],
+                         planes[2], width, height, stride);
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0002-modetest-call-drmModeCrtcSetGamma-only-if-add_proper.patch b/meta-xilinx-core/recipes-graphics/drm/files/0002-modetest-call-drmModeCrtcSetGamma-only-if-add_proper.patch
new file mode 100644
index 00000000..9d2eff7d
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0002-modetest-call-drmModeCrtcSetGamma-only-if-add_proper.patch
@@ -0,0 +1,32 @@
+From ab7aa7563e3b044f84f123f0ed59b370ff0af3f5 Mon Sep 17 00:00:00 2001
+From: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Date: Mon, 24 Feb 2020 03:35:58 -0800
+Subject: [PATCH 2/5] modetest: call drmModeCrtcSetGamma() only if
+ add_property_optional returns true
+
+gamma is a optional property then also it prints error message, so
+set gamma only if add_property_optional() returns true.
+
+Upstream-Status: Pending
+
+Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com>
+---
+ tests/modetest/modetest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
+index 2c83bd0..3e73505 100644
+--- a/tests/modetest/modetest.c
++++ b/tests/modetest/modetest.c
+@@ -1142,7 +1142,7 @@ static void set_gamma(struct device *dev, unsigned crtc_id, unsigned fourcc)
+ 
+        add_property_optional(dev, crtc_id, "DEGAMMA_LUT", 0);
+        add_property_optional(dev, crtc_id, "CTM", 0);
+-       if (!add_property_optional(dev, crtc_id, "GAMMA_LUT", blob_id)) {
++       if (add_property_optional(dev, crtc_id, "GAMMA_LUT", blob_id)) {
+                uint16_t r[256], g[256], b[256];
+ 
+                for (i = 0; i < 256; i++) {
+-- 
+2.7.4
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch b/meta-xilinx-core/recipes-graphics/drm/files/0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch
new file mode 100644
index 00000000..6fd5faab
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch
@@ -0,0 +1,602 @@
+From adc82a4820253ed3f42bf3af9003aa33636e6f89 Mon Sep 17 00:00:00 2001
+From: Anil Kumar M <amamidal@xilinx.com>
+Date: Fri, 10 Apr 2020 21:35:47 +0530
+Subject: [PATCH 3/5] modetest: Add semiplanar 10bit pattern support for
+ modetest
+
+Add XV15 and XV20 10 bit semiplanar formats support for
+generating color bar pattern while running modetest command.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anil Kumar M <amamidal@xilinx.com>
+---
+ tests/modetest/buffers.c |  24 ++-
+ tests/util/format.c      |   3 +
+ tests/util/pattern.c     | 455 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 3 files changed, 473 insertions(+), 9 deletions(-)
+
+Index: libdrm-2.4.118/tests/modetest/buffers.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/modetest/buffers.c
++++ libdrm-2.4.118/tests/modetest/buffers.c
+@@ -116,7 +116,7 @@ bo_create(int fd, unsigned int format,
+          unsigned int handles[4], unsigned int pitches[4],
+          unsigned int offsets[4], enum util_fill_pattern pattern)
+ {
+-       unsigned int virtual_height;
++       unsigned int virtual_height, virtual_width;
+        struct bo *bo;
+        unsigned int bpp;
+        void *planes[3] = { 0, };
+@@ -154,6 +154,11 @@ bo_create(int fd, unsigned int format,
+                bpp = 10;
+                break;
+ 
++       case DRM_FORMAT_XV15:
++       case DRM_FORMAT_XV20:
++               bpp = 10;
++               break;
++
+        case DRM_FORMAT_ARGB4444:
+        case DRM_FORMAT_XRGB4444:
+        case DRM_FORMAT_ABGR4444:
+@@ -223,27 +228,41 @@ bo_create(int fd, unsigned int format,
+        case DRM_FORMAT_NV15:
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
++               virtual_width = width;
+                virtual_height = height * 3 / 2;
+                break;
+ 
++       case DRM_FORMAT_XV15:
++               virtual_width = (width * 32) / 30;
++               virtual_height = height * 3 / 2;
++               break;
++
++       case DRM_FORMAT_XV20:
++               virtual_width = (width * 32) / 30;
++               virtual_height = height * 2;
++               break;
++
+        case DRM_FORMAT_NV16:
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV20:
++               virtual_width = width;
+                virtual_height = height * 2;
+                break;
+ 
+        case DRM_FORMAT_NV24:
+        case DRM_FORMAT_NV42:
+        case DRM_FORMAT_NV30:
++               virtual_width = width;
+                virtual_height = height * 3;
+                break;
+ 
+        default:
++               virtual_width = width;
+                virtual_height = height;
+                break;
+        }
+ 
+-       bo = bo_create_dumb(fd, width, virtual_height, bpp);
++       bo = bo_create_dumb(fd, virtual_width, virtual_height, bpp);
+        if (!bo)
+                return NULL;
+ 
+@@ -276,6 +295,8 @@ bo_create(int fd, unsigned int format,
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV15:
+        case DRM_FORMAT_NV20:
++       case DRM_FORMAT_XV15:
++       case DRM_FORMAT_XV20:
+                offsets[0] = 0;
+                handles[0] = bo->handle;
+                pitches[0] = bo->pitch;
+Index: libdrm-2.4.118/tests/util/pattern.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/pattern.c
++++ libdrm-2.4.118/tests/util/pattern.c
+@@ -430,6 +430,432 @@ static void fill_smpte_yuv_planar_10bpp(
+        }
+ }
+ 
++static void fill_smpte_yuv_semiplanar_10b(
++                               const struct util_yuv_info *yuv,
++                               unsigned char *y_mem, unsigned char *uv_mem,
++                               unsigned int width,
++                               unsigned int height, unsigned int stride)
++{
++       const struct color_yuv colors_top[] = {
++               MAKE_YUV_601(191, 192, 192),    /* grey */
++               MAKE_YUV_601(192, 192, 0),      /* yellow */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(0, 192, 0),        /* green */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(192, 0, 0),        /* red */
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++       };
++       const struct color_yuv colors_middle[] = {
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 192, 192),    /* grey */
++       };
++       const struct color_yuv colors_bottom[] = {
++               MAKE_YUV_601(0, 33, 76),        /* in-phase */
++               MAKE_YUV_601(255, 255, 255),    /* super white */
++               MAKE_YUV_601(50, 0, 106),       /* quadrature */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(9, 9, 9),          /* 3.5% */
++               MAKE_YUV_601(19, 19, 19),       /* 7.5% */
++               MAKE_YUV_601(29, 29, 29),       /* 11.5% */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++       };
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int xsub = yuv->xsub;
++       unsigned int ysub = yuv->ysub;
++       unsigned int x;
++       unsigned int y;
++       unsigned int cval = 0;
++
++       for (y = 0; y < height * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_top[x * 7 / width].y << 2 |
++                               colors_top[(x+1) * 7 / width].y << 12 |
++                               colors_top[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_middle[x * 7 / width].y << 2 |
++                               colors_middle[(x+1) * 7 / width].y << 12 |
++                               colors_middle[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[x * 4 / (width * 5 / 7)].y << 2 |
++                               colors_bottom[(x + 1) * 4 / (width * 5 / 7)]
++                               .y << 12 | colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].y << 22;
++
++               for (; x < width * 6 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 2 |
++                               colors_bottom[((x + 1) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 12 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 22;
++
++               for (; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] = colors_bottom[7].y << 2 |
++                               colors_bottom[7].y << 12 |
++                               colors_bottom[7].y << 22;
++               y_mem += stride;
++       }
++
++       /* Chroma */
++       unsigned int *c_mem = (unsigned int *)uv_mem;
++
++       for (y = 0; y < height / ysub * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 6) {
++                       cval = (colors_top[x * 7 / width].u << 2) |
++                               (colors_top[x * 7 / width].v << 12) |
++                               (colors_top[(x + 2) * 7 / width].u << 22);
++                       c_mem[x/3] = cval;
++                       cval = (colors_top[(x + 2) * 7 / width].v << 2) |
++                               (colors_top[(x + 4) * 7 / width].u << 12) |
++                               (colors_top[(x + 4) * 7 / width].v << 22);
++                       c_mem[x/3 + 1] = cval;
++               }
++               c_mem += (stride/4) * cs / xsub;
++       }
++
++       for (; y < height / ysub * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 6) {
++                       cval =  (colors_middle[x * 7 / width].u << 2) |
++                               (colors_middle[x * 7 / width].v << 12) |
++                               (colors_middle[(x + 2) * 7 / width].u << 22);
++                       c_mem[x/3] = cval;
++                       cval = (colors_middle[(x + 2) * 7 / width].v << 2) |
++                               (colors_middle[(x + 4) * 7 / width].u << 12) |
++                               (colors_middle[(x + 4) * 7 / width].v << 22);
++                       c_mem[x/3 + 1] = cval;
++               }
++               c_mem += (stride/4) * cs / xsub;
++       }
++
++       for (; y < height / ysub; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 6) {
++                       cval = colors_bottom[x * 4 /
++                               (width * 5 / 7)].u << 2 |
++                               colors_bottom[x * 4 /
++                               (width * 5 / 7)].v << 12 |
++                               colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)]. u << 22;
++
++                       c_mem[x/3] = cval;
++
++                       cval = colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].v << 2 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)].u << 12 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)].v << 22;
++
++                       c_mem[x/3 + 1] = cval;
++               }
++               for (; x < width * 6 / 7; x += 6) {
++                       cval = colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 2 |
++                               colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 12 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 22;
++
++                       c_mem[x/3] = cval;
++
++                       cval = colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 2 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 12 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 22;
++                       c_mem[x/3 + 1] = cval;
++               }
++               for (; x < width; x += 6) {
++                       cval = colors_bottom[7].u << 2 |
++                               colors_bottom[7].v << 12 |
++                               colors_bottom[7].u << 22;
++                       c_mem[x/3] = cval;
++                       cval = colors_bottom[7].v << 2 |
++                               colors_bottom[7].u << 12 |
++                               colors_bottom[7].v << 22;
++                       c_mem[x/3 + 1] = cval;
++               }
++               c_mem += (stride/4) * cs / xsub;
++       }
++}
++
++static void fill_smpte_yuv_planar_10b(
++                               const struct util_yuv_info *yuv,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, unsigned int width,
++                               unsigned int height, unsigned int stride)
++{
++       const struct color_yuv colors_top[] = {
++               MAKE_YUV_601(191, 192, 192),    /* grey */
++               MAKE_YUV_601(192, 192, 0),      /* yellow */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(0, 192, 0),        /* green */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(192, 0, 0),        /* red */
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++       };
++       const struct color_yuv colors_middle[] = {
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 192, 192),    /* grey */
++       };
++       const struct color_yuv colors_bottom[] = {
++               MAKE_YUV_601(0, 33, 76),        /* in-phase */
++               MAKE_YUV_601(255, 255, 255),    /* super white */
++               MAKE_YUV_601(50, 0, 106),       /* quadrature */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(9, 9, 9),          /* 3.5% */
++               MAKE_YUV_601(19, 19, 19),       /* 7.5% */
++               MAKE_YUV_601(29, 29, 29),       /* 11.5% */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++       };
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int xsub = yuv->xsub;
++       unsigned int ysub = yuv->ysub;
++       unsigned int x;
++       unsigned int y;
++
++       /* Luma */
++       for (y = 0; y < height * 6 / 9; ++y) {
++               for (x = 0; x < width; ++x)
++                       y_mem[x] = colors_top[x * 7 / width].y;
++               y_mem += stride;
++       }
++
++       for (; y < height * 7 / 9; ++y) {
++               for (x = 0; x < width; ++x)
++                       y_mem[x] = colors_middle[x * 7 / width].y;
++               y_mem += stride;
++       }
++
++       for (; y < height; ++y) {
++               for (x = 0; x < width * 5 / 7; ++x)
++                       y_mem[x] = colors_bottom[x * 4 / (width * 5 / 7)].y;
++               for (; x < width * 6 / 7; ++x)
++                       y_mem[x] = colors_bottom[(x - width * 5 / 7) * 3 /
++                       (width / 7) + 4].y;
++               for (; x < width; ++x)
++                       y_mem[x] = colors_bottom[7].y;
++               y_mem += stride;
++       }
++
++       /* Chroma */
++       for (y = 0; y < height / ysub * 6 / 9; ++y) {
++               for (x = 0; x < width; x += xsub) {
++                       u_mem[x*cs/xsub] = colors_top[x * 7 / width].u;
++                       v_mem[x*cs/xsub] = colors_top[x * 7 / width].v;
++               }
++               u_mem += stride * cs / xsub;
++               v_mem += stride * cs / xsub;
++       }
++
++       for (; y < height / ysub * 7 / 9; ++y) {
++               for (x = 0; x < width; x += xsub) {
++                       u_mem[x*cs/xsub] = colors_middle[x * 7 / width].u;
++                       v_mem[x*cs/xsub] = colors_middle[x * 7 / width].v;
++               }
++               u_mem += stride * cs / xsub;
++               v_mem += stride * cs / xsub;
++       }
++
++       for (; y < height / ysub; ++y) {
++               for (x = 0; x < width * 5 / 7; x += xsub) {
++                       u_mem[x*cs/xsub] =
++               colors_bottom[x * 4 / (width * 5 / 7)].u;
++                       v_mem[x*cs/xsub] =
++               colors_bottom[x * 4 / (width * 5 / 7)].v;
++               }
++               for (; x < width * 6 / 7; x += xsub) {
++                       u_mem[x*cs/xsub] =
++               colors_bottom[(x - width * 5 / 7) * 3 / (width / 7) + 4].u;
++                       v_mem[x*cs/xsub] =
++               colors_bottom[(x - width * 5 / 7) * 3 / (width / 7) + 4].v;
++               }
++               for (; x < width; x += xsub) {
++                       u_mem[x*cs/xsub] = colors_bottom[7].u;
++                       v_mem[x*cs/xsub] = colors_bottom[7].v;
++               }
++               u_mem += stride * cs / xsub;
++               v_mem += stride * cs / xsub;
++       }
++}
++
++static void fill_tiles_xv15(
++                               const struct util_format_info *info,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, uint32_t width,
++                               uint32_t height, uint32_t stride)
++{
++       const struct util_yuv_info *yuv = &info->yuv;
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int x;
++       unsigned int y;
++       uint32_t shifter = 0, LumVal = 0;
++       uint32_t lumIndex = 0;
++       uint32_t *Lum;
++       uint32_t *Chrom;
++       uint32_t ChromVal = 0;
++       uint32_t chromIndex = 0;
++
++       /* preparing 10 bit Luma */
++       Lum = (uint32_t *)y_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x++) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                               + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                               MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                               (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       //Checking if we got 3 components to pack in 4 bytes
++                       if (shifter == 30) {
++                               Lum[lumIndex] = LumVal;
++                               lumIndex++; shifter = 0; LumVal = 0;
++                       }
++                       LumVal  = (LumVal | ((color.y << 2) << shifter));
++                       shifter += 10; //10 bit precision
++               }
++               lumIndex = 0; shifter = 0; LumVal = 0;
++               y_mem += stride;
++               Lum = (uint32_t *)y_mem;
++       }
++
++       /* Preparing 10 bit Chroma */
++       Chrom = (uint32_t *)u_mem;
++       for (y = 0; y < height / 2; ++y) {
++               for (x = 0; x < width; x = x + 6) {
++                       div_t d  = div(x+(2 * y), width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                               + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                               (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       div_t d2  = div(x + 2 + (2*y), width);
++                       uint32_t rgb32_2 = 0x00130502 * (d2.quot >> 6)
++                                       + 0x000a1120 * (d2.rem >> 6);
++                       struct color_yuv color_2 =
++                               MAKE_YUV_601((rgb32_2 >> 16) & 0xff,
++                               (rgb32_2 >> 8) & 0xff, rgb32_2 & 0xff);
++
++                       div_t d3  = div(x + 4 + (2*y), width);
++                       uint32_t rgb32_3 = 0x00130502 * (d3.quot >> 6)
++                                       + 0x000a1120 * (d3.rem >> 6);
++                       struct color_yuv color_3 =
++                               MAKE_YUV_601((rgb32_3 >> 16) & 0xff,
++                               (rgb32_3 >> 8) & 0xff, rgb32_3 & 0xff);
++
++                       ChromVal = ((color_2.u << 2) << 20)
++                               | ((color.v << 2) << 10) | (color.u << 2);
++                       Chrom[chromIndex++] = ChromVal;
++
++                       ChromVal = ((color_3.v << 2) << 20)
++                               | ((color_3.u << 2) << 10) | (color_2.v << 2);
++                       Chrom[chromIndex++] = ChromVal;
++               }
++       chromIndex = 0; ChromVal = 0;
++       u_mem += stride;
++       Chrom = (uint32_t *)u_mem;
++       }
++}
++
++static void fill_tiles_xv20(
++                               const struct util_format_info *info,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, uint32_t width,
++                               uint32_t height, uint32_t stride)
++{
++       const struct util_yuv_info *yuv = &info->yuv;
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int x;
++       unsigned int y;
++       uint32_t shifter = 0, LumVal = 0;
++       uint32_t lumIndex = 0;
++       uint32_t *Lum;
++       uint32_t *Chrom;
++       uint32_t ChromVal = 0;
++       uint32_t chromIndex = 0;
++
++       /* preparing 10 bit Luma */
++       Lum = (uint32_t *)y_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x++) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       //Checking if we got 3 components to pack in 4 bytes
++                       if (shifter == 30) {
++                               Lum[lumIndex] = LumVal;
++                               lumIndex++; shifter = 0; LumVal = 0;
++                       }
++                       LumVal  = (LumVal | ((color.y << 2) << shifter));
++                       shifter += 10; //10 bit precision
++               }
++               lumIndex = 0; shifter = 0; LumVal = 0;
++               y_mem += stride;
++               Lum = (uint32_t *)y_mem;
++       }
++
++       /* Preparing 10 bit Chroma */
++       Chrom = (uint32_t *)u_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x = x + 6) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       div_t d2  = div(x + 2 + y, width);
++                       uint32_t rgb32_2 = 0x00130502 * (d2.quot >> 6)
++                                               + 0x000a1120 * (d2.rem >> 6);
++                       struct color_yuv color_2 =
++                                       MAKE_YUV_601((rgb32_2 >> 16) & 0xff,
++                                      (rgb32_2 >> 8) & 0xff, rgb32_2 & 0xff);
++                       div_t d3  = div(x + 4 + y, width);
++                       uint32_t rgb32_3 = 0x00130502 * (d3.quot >> 6)
++                                       + 0x000a1120 * (d3.rem >> 6);
++                       struct color_yuv color_3 =
++                                       MAKE_YUV_601((rgb32_3 >> 16) & 0xff,
++                                       (rgb32_3 >> 8) & 0xff, rgb32_3 & 0xff);
++
++                       ChromVal = ((color_2.u << 2) << 20)
++                               | ((color.v << 2) << 10) | (color.u << 2);
++                       Chrom[chromIndex++] = ChromVal;
++
++                       ChromVal = ((color_3.v << 2) << 20)
++                               | ((color_3.u << 2) << 10) | (color_2.v << 2);
++                       Chrom[chromIndex++] = ChromVal;
++               }
++               chromIndex = 0; ChromVal = 0;
++               u_mem += stride;
++               Chrom = (uint32_t *)u_mem;
++       }
++}
++
+ static void fill_smpte_yuv_packed(const struct util_yuv_info *yuv, void *mem,
+                                  unsigned int width, unsigned int height,
+                                  unsigned int stride)
+@@ -1188,9 +1614,10 @@ void util_smpte_fill_lut(unsigned int nc
+                memcpy(lut, smpte_color_lut, sizeof(smpte_color_lut));
+ }
+ 
+-static void fill_smpte(const struct util_format_info *info, void *planes[3],
+-                      unsigned int width, unsigned int height,
+-                      unsigned int stride)
++static void fill_smpte(const struct util_format_info *info,
++                               void *planes[3],
++                               unsigned int width, unsigned int height,
++                               unsigned int stride)
+ {
+        unsigned char *u, *v;
+ 
+@@ -1209,7 +1636,12 @@ static void fill_smpte(const struct util
+        case DRM_FORMAT_YVYU:
+                return fill_smpte_yuv_packed(&info->yuv, planes[0], width,
+                                             height, stride);
+-
++       case DRM_FORMAT_XV20:
++               return fill_tiles_xv20(info, planes[0], planes[1], planes[1],
++                      width, height, stride);
++       case DRM_FORMAT_XV15:
++               return fill_tiles_xv15(info, planes[0], planes[1], planes[2],
++                      width, height, stride);
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV21:
+        case DRM_FORMAT_NV16:
+@@ -1614,9 +2046,10 @@ static void fill_tiles_rgb16fp(const str
+        }
+ }
+ 
+-static void fill_tiles(const struct util_format_info *info, void *planes[3],
+-                      unsigned int width, unsigned int height,
+-                      unsigned int stride)
++static void fill_tiles(const struct util_format_info *info,
++                               void *planes[3],
++                               unsigned int width, unsigned int height,
++                               unsigned int stride)
+ {
+        unsigned char *u, *v;
+ 
+@@ -1653,6 +2086,14 @@ static void fill_tiles(const struct util
+                return fill_tiles_yuv_planar(info, planes[0], planes[2],
+                                             planes[1], width, height, stride);
+ 
++       case DRM_FORMAT_XV20:
++               return fill_tiles_xv20(info, planes[0], planes[1],
++                        planes[1], width, height, stride);
++
++       case DRM_FORMAT_XV15:
++               return fill_tiles_xv15(info, planes[0], planes[1],
++                        planes[2], width, height, stride);
++
+        case DRM_FORMAT_ARGB4444:
+        case DRM_FORMAT_XRGB4444:
+        case DRM_FORMAT_ABGR4444:
+Index: libdrm-2.4.118/tests/util/format.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/format.c
++++ libdrm-2.4.118/tests/util/format.c
+@@ -59,6 +59,8 @@ static const struct util_format_info for
+        { DRM_FORMAT_NV15, "NV15", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 2) },
+        { DRM_FORMAT_NV20, "NV20", MAKE_YUV_INFO(YUV_YCbCr, 2, 1, 2) },
+        { DRM_FORMAT_NV30, "NV30", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 2) },
++       { DRM_FORMAT_XV15, "XV15", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 2) },
++       { DRM_FORMAT_XV20, "XV20", MAKE_YUV_INFO(YUV_YCbCr, 2, 1, 2) },
+        /* YUV planar */
+        { DRM_FORMAT_YUV420, "YU12", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 1) },
+        { DRM_FORMAT_YVU420, "YV12", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 1) },
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch b/meta-xilinx-core/recipes-graphics/drm/files/0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch
new file mode 100644
index 00000000..b385bbac
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch
@@ -0,0 +1,38 @@
+From ede95ded932a8f722f339fa345c098c705f40f08 Mon Sep 17 00:00:00 2001
+From: Anil Kumar M <amamidal@xilinx.com>
+Date: Wed, 16 Sep 2020 22:42:47 +0530
+Subject: [PATCH 4/5] modetest: fix smpte colour pattern issue for XV20 and
+ XV15 formats
+
+Fix smpte colour issue for XV15 and XV20 formats.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anil Kumar M <amamidal@xilinx.com>
+---
+ tests/util/pattern.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/util/pattern.c b/tests/util/pattern.c
+index e29d160..0fe2e5f 100644
+--- a/tests/util/pattern.c
++++ b/tests/util/pattern.c
+@@ -1121,11 +1121,11 @@ static void fill_smpte(const struct util_format_info *info,
+                return fill_smpte_yuv_packed(&info->yuv, planes[0], width,
+                                             height, stride);
+        case DRM_FORMAT_XV20:
+-               return fill_tiles_xv20(info, planes[0], planes[1], planes[1],
+-                      width, height, stride);
++               return fill_smpte_yuv_semiplanar_10b(&info->yuv, planes[0], planes[1],
++                                            width, height, stride);
+        case DRM_FORMAT_XV15:
+-               return fill_tiles_xv15(info, planes[0], planes[1], planes[2],
+-                      width, height, stride);
++               return fill_smpte_yuv_semiplanar_10b(&info->yuv, planes[0], planes[1],
++                                            width, height, stride);
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV21:
+        case DRM_FORMAT_NV16:
+-- 
+2.7.4
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/libdrm_%.bbappend b/meta-xilinx-core/recipes-graphics/drm/libdrm_%.bbappend
new file mode 100644
index 00000000..c2f6c8d2
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/libdrm_%.bbappend
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+
+SRC_URI:append = " \
+        file://0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch \
+        file://0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch \
+        file://0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch \
+        file://0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch \
+"
diff --git a/meta-xilinx-core/recipes-graphics/libepoxy/libepoxy_%.bbappend b/meta-xilinx-core/recipes-graphics/libepoxy/libepoxy_%.bbappend
deleted file mode 100644
index 03823f6e..00000000
--- a/meta-xilinx-core/recipes-graphics/libepoxy/libepoxy_%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
diff --git a/meta-xilinx-core/recipes-graphics/libgles/files/egl.pc b/meta-xilinx-core/recipes-graphics/libgles/files/egl.pc
deleted file mode 100644
index 65c4c1f3..00000000
--- a/meta-xilinx-core/recipes-graphics/libgles/files/egl.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: egl
-Description: MALI EGL library
-Requires.private:
-Version: 17.3
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir}
diff --git a/meta-xilinx-core/recipes-graphics/libgles/files/gbm.pc b/meta-xilinx-core/recipes-graphics/libgles/files/gbm.pc
deleted file mode 100644
index c40b5f4f..00000000
--- a/meta-xilinx-core/recipes-graphics/libgles/files/gbm.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: gbm
-Description: MALI gbm library
-Requires.private:
-Version: 17.3
-Libs: -L${libdir} -lgbm
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir}
diff --git a/meta-xilinx-core/recipes-graphics/libgles/files/glesv1.pc b/meta-xilinx-core/recipes-graphics/libgles/files/glesv1.pc
deleted file mode 100644
index 39467f33..00000000
--- a/meta-xilinx-core/recipes-graphics/libgles/files/glesv1.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: glesv1
-Description: MALI OpenGL ES 1.1 library
-Requires.private:
-Version: 17.3
-Libs: -L${libdir} -lGLESv1_CM
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir}
diff --git a/meta-xilinx-core/recipes-graphics/libgles/files/glesv1_cm.pc b/meta-xilinx-core/recipes-graphics/libgles/files/glesv1_cm.pc
deleted file mode 100644
index 1547b4c8..00000000
--- a/meta-xilinx-core/recipes-graphics/libgles/files/glesv1_cm.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: gles_cm
-Description: Mali OpenGL ES 1.1 CM library
-Requires.private:
-Version: 17.3
-Libs: -L${libdir} -lGLESv1_CM
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir}
diff --git a/meta-xilinx-core/recipes-graphics/libgles/files/glesv2.pc b/meta-xilinx-core/recipes-graphics/libgles/files/glesv2.pc
deleted file mode 100644
index a0a84f23..00000000
--- a/meta-xilinx-core/recipes-graphics/libgles/files/glesv2.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: glesv2
-Description: MALI OpenGL ES 2.0 library
-Requires.private:
-Version: 17.3
-Libs: -L${libdir} -lGLESv2
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir}
diff --git a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
deleted file mode 100644
index db99c4d7..00000000
--- a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
+++ /dev/null
@@ -1,200 +0,0 @@
-DESCRIPTION = "libGLES for ZynqMP with Mali 400"
-
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://EULA;md5=82e466d0ed92c5a15f568dbe6b31089c"
-
-inherit features_check update-alternatives
-
-ANY_OF_DISTRO_FEATURES = "x11 fbdev wayland"
-REQUIRED_MACHINE_FEATURES = "mali400"
-
-PROVIDES += "virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-REPO ?= "git://github.com/Xilinx/mali-userspace-binaries.git;protocol=https"
-BRANCH ?= "xlnx_rel_v2023.2"
-SRCREV ?= "b3a772aad859cdadc8513b11c3e995546c20e75e"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-
-PV = "r9p0-01rel0"
-SRC_URI = " \
-    ${REPO};${BRANCHARG} \
-    file://egl.pc \
-    file://glesv1_cm.pc \
-    file://glesv1.pc \
-    file://glesv2.pc \
-    file://gbm.pc \
-    "
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-
-# If were switching at runtime, we would need all RDEPENDS needed for all backends available
-X11RDEPENDS = "libxdamage libxext libx11 libdrm libxfixes"
-X11DEPENDS = "libxdamage libxext virtual/libx11 libdrm libxfixes"
-
-# Don't install runtime dependencies for other backends unless the DISTRO supports it
-RDEPENDS:${PN} = " \
-    kernel-module-mali \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11RDEPENDS}', '', d)} \
-"
-
-# We dont build anything but we want to avoid QA warning build-deps
-DEPENDS = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland libdrm', '', d)} \
-"
-
-
-# x11 is default, set to "fbdev" , "wayland", or "headless" if required
-MALI_BACKEND_DEFAULT ?= "x11"
-
-USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}"
-USE_FB = "${@bb.utils.contains("DISTRO_FEATURES", "fbdev", "yes", "no", d)}"
-USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}"
-
-MONOLITHIC_LIBMALI = "libMali.so.9.0"
-
-do_install() {
-    #Identify the ARCH type
-    ${TARGET_PREFIX}gcc --version > ARCH_PLATFORM
-    if grep -q aarch64 "ARCH_PLATFORM"; then
-        ARCH_PLATFORM_DIR=aarch64-linux-gnu
-    else
-        ARCH_PLATFORM_DIR=arm-linux-gnueabihf
-    fi
-
-    # install headers
-    install -d -m 0655 ${D}${includedir}/EGL
-    install -m 0644 ${S}/${PV}/glesHeaders/EGL/*.h ${D}${includedir}/EGL/
-    install -d -m 0655 ${D}${includedir}/GLES
-    install -m 0644 ${S}/${PV}/glesHeaders/GLES/*.h ${D}${includedir}/GLES/
-    install -d -m 0655 ${D}${includedir}/GLES2
-    install -m 0644 ${S}/${PV}/glesHeaders/GLES2/*.h ${D}${includedir}/GLES2/
-    install -d -m 0655 ${D}${includedir}/KHR
-    install -m 0644 ${S}/${PV}/glesHeaders/KHR/*.h ${D}${includedir}/KHR/
-
-    install -d ${D}${libdir}/pkgconfig
-    install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
-    install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
-    install -m 0644 ${WORKDIR}/glesv1.pc ${D}${libdir}/pkgconfig/glesv1.pc
-    install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-
-    cp -a --no-preserve=ownership ${S}/${PV}/${ARCH_PLATFORM_DIR}/common/*.so* ${D}${libdir}
-
-    install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/headless/${MONOLITHIC_LIBMALI} ${D}${libdir}/headless/${MONOLITHIC_LIBMALI}
-    ln -snf headless/${MONOLITHIC_LIBMALI} ${D}${libdir}/${MONOLITHIC_LIBMALI}
-
-    if [ "${USE_FB}" = "yes" ]; then
-        install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/fbdev/${MONOLITHIC_LIBMALI} ${D}${libdir}/fbdev/${MONOLITHIC_LIBMALI}
-        if [ "${MALI_BACKEND_DEFAULT}" = "fbdev" ]; then
-            ln -snf fbdev/${MONOLITHIC_LIBMALI} ${D}${libdir}/${MONOLITHIC_LIBMALI}
-        fi
-    fi
-    if [ "${USE_X11}" = "yes" ]; then
-        install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/x11/${MONOLITHIC_LIBMALI} ${D}${libdir}/x11/${MONOLITHIC_LIBMALI}
-        if [ "${MALI_BACKEND_DEFAULT}" = "x11" ]; then
-            ln -snf x11/${MONOLITHIC_LIBMALI} ${D}${libdir}/${MONOLITHIC_LIBMALI}
-        fi
-    else
-        # We cant rely on the fact that all apps will use pkgconfig correctly
-        sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if (1)/' ${D}${includedir}/EGL/eglplatform.h
-    fi
-    if [ "${USE_WL}" = "yes" ]; then
-        install -m 0644 ${S}/${PV}/glesHeaders/GBM/gbm.h ${D}${includedir}/
-        install -m 0644 ${WORKDIR}/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc
-        install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/wayland/${MONOLITHIC_LIBMALI} ${D}${libdir}/wayland/${MONOLITHIC_LIBMALI}
-        if [ "${MALI_BACKEND_DEFAULT}" = "wayland" ]; then
-            ln -snf wayland/${MONOLITHIC_LIBMALI} ${D}${libdir}/${MONOLITHIC_LIBMALI}
-        fi
-    fi
-}
-
-
-# We need separate packages to provide multiple alternatives, at this point we install
-# everything on the default one but that can be split if necessary
-PACKAGES += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-x11", "", d)}"
-PACKAGES += "${@bb.utils.contains("DISTRO_FEATURES", "fbdev", "${PN}-fbdev", "", d)}"
-PACKAGES += "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "${PN}-wayland", "", d)}"
-PACKAGES += "${PN}-headless"
-
-# This is default/common for all alternatives
-ALTERNATIVE_LINK_NAME[libmali-xlnx] = "${libdir}/${MONOLITHIC_LIBMALI}"
-
-
-# Declare alternatives and corresponding library location
-ALTERNATIVE:${PN}-x11 = "libmali-xlnx"
-ALTERNATIVE_TARGET_libmali-xlnx-x11[libmali-xlnx] = "${libdir}/x11/${MONOLITHIC_LIBMALI}"
-
-ALTERNATIVE:${PN}-fbdev = "libmali-xlnx"
-ALTERNATIVE_TARGET_libmali-xlnx-fbdev[libmali-xlnx] = "${libdir}/fbdev/${MONOLITHIC_LIBMALI}"
-
-ALTERNATIVE:${PN}-wayland = "libmali-xlnx"
-ALTERNATIVE_TARGET_libmali-xlnx-wayland[libmali-xlnx] = "${libdir}/wayland/${MONOLITHIC_LIBMALI}"
-
-ALTERNATIVE:${PN}-headless = "libmali-xlnx"
-ALTERNATIVE_TARGET_libmali-xlnx-headless[libmali-xlnx] = "${libdir}/headless/${MONOLITHIC_LIBMALI}"
-
-# Set priorities according to what we prveiously defined
-ALTERNATIVE_PRIORITY_libmali-xlnx-x11[libmali-xlnx] = "${@bb.utils.contains("MALI_BACKEND_DEFAULT", "x11", "20", "10", d)}"
-ALTERNATIVE_PRIORITY_libmali-xlnx-fbdev[libmali-xlnx] = "${@bb.utils.contains("MALI_BACKEND_DEFAULT", "fbdev", "20", "10", d)}"
-ALTERNATIVE_PRIORITY_libmali-xlnx-wayland[libmali-xlnx] = "${@bb.utils.contains("MALI_BACKEND_DEFAULT", "wayland", "20", "10", d)}"
-
-# If misconfigured, fallback to headless
-ALTERNATIVE_PRIORITY_libmali-xlnx-headless[libmali-xlnx] = "${@bb.utils.contains("MALI_BACKEND_DEFAULT", "headless", "20", "15", d)}"
-
-
-# Package gets renamed on the debian class, but we want to keep -xlnx
-DEBIAN_NOAUTONAME:libmali-xlnx = "1"
-
-# Update alternatives will actually have separate postinst scripts (one for each package)
-# This wont work for us, so we create a common postinst script and we pass that as the general
-# libmali-xlnx postinst script, but we defer execution to run on first boot (pkg_postinst_ontarget).
-# This will avoid ldconfig removing the symbolic links when creating the root filesystem.
-python populate_packages_updatealternatives:append () {
-    # We need to remove the 'fake' libmali-xlnx before creating any links
-    libdir = d.getVar('libdir')
-    common_postinst = "#!/bin/sh\nrm " + libdir + "/${MONOLITHIC_LIBMALI}\n"
-    for pkg in (d.getVar('PACKAGES') or "").split():
-        # Not all packages provide an alternative (e.g. ${PN}-lic)
-        postinst = d.getVar('pkg_postinst:%s' % pkg)
-        if postinst:
-            old_postinst = postinst
-            new_postinst = postinst.replace('#!/bin/sh','')
-            common_postinst += new_postinst
-    d.setVar('pkg_postinst_ontarget:%s' % 'libmali-xlnx', common_postinst)
-}
-
-
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-
-RREPLACES:${PN} = "libegl libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm"
-RPROVIDES:${PN} = "libegl libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm"
-RCONFLICTS:${PN} = "libegl libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm"
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-FILES:${PN} += "${libdir}/*"
-
-do_package:append() {
-
-    shlibswork_dir = d.getVar('SHLIBSWORKDIR')
-    pkg_filename = d.getVar('PN') + ".list"
-    shlibs_file = os.path.join(shlibswork_dir, pkg_filename)
-    lines = ""
-    with open(shlibs_file, "r") as f:
-        lines = f.readlines()
-    with open(shlibs_file, "w") as f:
-        for line in lines:
-            if d.getVar('MALI_BACKEND_DEFAULT') in line.strip("\n"):
-                 f.write(line)
-}
diff --git a/meta-xilinx-core/recipes-graphics/libglu/libglu_%.bbappend b/meta-xilinx-core/recipes-graphics/libglu/libglu_%.bbappend
deleted file mode 100644
index e824a179..00000000
--- a/meta-xilinx-core/recipes-graphics/libglu/libglu_%.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-# OpenGL comes from libmali, adjust parameters
-MALI_DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', ' virtual/libgles2', '', d)}"
-DEPENDS:append =  "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', ' ${MALI_DEPENDS}', '', d)}"
-
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
-
diff --git a/meta-xilinx-core/recipes-graphics/libsdl2/libsdl2_%.bbappend b/meta-xilinx-core/recipes-graphics/libsdl2/libsdl2_%.bbappend
deleted file mode 100644
index 03823f6e..00000000
--- a/meta-xilinx-core/recipes-graphics/libsdl2/libsdl2_%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb
deleted file mode 100644
index 268759c2..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-SUMMARY = "A Mali 400 Linux Kernel module"
-SECTION = "kernel/modules"
-
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = " \
-        file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \
-        "
-
-PV = "r9p0-01rel0"
-
-SRC_URI = " \
-        https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${PV}.tgz \
-        file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \
-        file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \
-        file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \
-        file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \
-        file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \
-        file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \
-        file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \
-        file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\
-        file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\
-        file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\
-        file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\
-        file://0015-fix-driver-failed-to-check-map-error.patch \
-        file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \
-        file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \
-        file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \
-        file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \
-        file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \
-        file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \
-        file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \
-        file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \
-        file://0024-Use-community-device-tree-names.patch \
-        file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \
-        file://0026-Fix-gpu-driver-probe-failure.patch \
-        file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \
-        "
-SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
-SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
-
-inherit features_check module
-
-PARALLEL_MAKE = "-j 1"
-
-S = "${WORKDIR}/DX910-SW-99002-${PV}/driver/src/devicedrv/mali"
-
-REQUIRED_MACHINE_FEATURES = "mali400"
-
-EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \
-                ARCH="${ARCH}" \
-                BUILD=release \
-                MALI_PLATFORM="arm" \
-                USING_DT=1 \
-                MALI_SHARED_INTERRUPTS=1 \
-                CROSS_COMPILE="${TARGET_PREFIX}" \
-                MALI_QUIET=1 \
-                '
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0001-Change-Makefile-to-be-compatible-with-Yocto.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0001-Change-Makefile-to-be-compatible-with-Yocto.patch
deleted file mode 100644
index 3c82f602..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0001-Change-Makefile-to-be-compatible-with-Yocto.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6d283b9aa3f7fb761da4cb076b47a62275fc4caa Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Date: Tue, 21 Nov 2017 03:57:25 -0800
-Subject: [PATCH 1/9] Change Makefile to be compatible with Yocto
-
-Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com>
-Signed-off-by: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Upstream Status: Inappropriate [Xilinx specific]
----
- driver/src/devicedrv/mali/Makefile | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/driver/src/devicedrv/mali/Makefile b/driver/src/devicedrv/mali/Makefile
-index 5a259fe..a6dd94c 100644
---- Makefile
-+++ b/Makefile
-@@ -89,7 +89,11 @@ endif
- # Define host system directory
- KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build
- 
--include $(KDIR)/.config
-+ifeq ($(O),)
-+       -include $(KDIR)/.config
-+else
-+       -include $(O)/.config
-+endif
- 
- ifeq ($(ARCH), arm)
- # when compiling for ARM we're cross compiling
-@@ -204,9 +208,12 @@ EXTRA_DEFINES += -DMALI_MEM_SWAP_TRACKING=1
- endif
- 
- all: $(UMP_SYMVERS_FILE)
--       $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules
-+       $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) O=$(O) modules
-        @rm $(FILES_PREFIX)__malidrv_build_info.c $(FILES_PREFIX)__malidrv_build_info.o
- 
-+modules_install:
-+       $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules_install
-+
- clean:
-        $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean
- 
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch
deleted file mode 100644
index 0a7b6736..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f27aab2b0e4d5dea9b5a0e4648c142257940c428 Mon Sep 17 00:00:00 2001
-From: Hyun Kwon <hyun.kwon@xilinx.com>
-Date: Thu, 25 Jun 2015 17:14:42 -0700
-Subject: [PATCH 2/9] staging: mali: r8p0-01rel0: Add the ZYNQ/ZYNQMP platform
-
-Add the number of PP cores that is required for Zynq/ZynqMP configuration.
-
-Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com>
-Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-Upstream Status: Inappropriate [Xilinx specific]
----
- driver/src/devicedrv/mali/platform/arm/arm.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/driver/src/devicedrv/mali/platform/arm/arm.c b/driver/src/devicedrv/mali/platform/arm/arm.c
-index 4e09aca..fac99bc 100644
---- platform/arm/arm.c
-+++ b/platform/arm/arm.c
-@@ -261,6 +261,10 @@ static struct mali_gpu_device_data mali_gpu_data = {
-        .dedicated_mem_start = 0x80000000, /* Physical start address (use 0xD0000000 for old indirect setup) */
-        .dedicated_mem_size = 0x10000000, /* 256MB */
- #endif
-+#if defined(CONFIG_ARCH_ZYNQ) || defined(CONFIG_ARCH_ZYNQMP)
-+       .fb_start = 0x00000000,
-+       .fb_size = 0xfffff000,
-+#else
- #if defined(CONFIG_ARM64)
-        /* Some framebuffer drivers get the framebuffer dynamically, such as through GEM,
-        * in which the memory resource can't be predicted in advance.
-@@ -271,6 +275,7 @@ static struct mali_gpu_device_data mali_gpu_data = {
-        .fb_start = 0xe0000000,
-        .fb_size = 0x01000000,
- #endif
-+#endif /* !defined(CONFIG_ARCH_ZYNQ) && !defined(CONFIG_ARCH_ZYNQMP) */
-        .control_interval = 1000, /* 1000ms */
-        .utilization_callback = mali_gpu_utilization_callback,
-        .get_clock_info = NULL,
-@@ -505,6 +510,11 @@ int mali_platform_device_init(struct platform_device *device)
-                        mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */
-                }
-        }
-+#elif defined(CONFIG_ARCH_ZYNQ) || defined(CONFIG_ARCH_ZYNQMP)
-+
-+       MALI_DEBUG_PRINT(4, ("Registering Zynq/ZynqMP Mali-400 device\n"));
-+       num_pp_cores = 2;
-+
- #endif
- 
-        /* After kernel 3.15 device tree will default set dev
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch
deleted file mode 100644
index 98aa6ac9..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d6e44bbf8d1377f78481f611dec237e8d24baf74 Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Date: Tue, 21 Nov 2017 04:00:27 -0800
-Subject: [PATCH 3/9] staging: mali: r8p0-01rel0: Remove unused trace macros
-
-TRACE_SYSTEM_STRING is not need in each trace file anymore.
-
-Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com>
-Signed-off-by: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Upstream Status: Pending
----
- driver/src/devicedrv/mali/linux/mali_linux_trace.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/driver/src/devicedrv/mali/linux/mali_linux_trace.h b/driver/src/devicedrv/mali/linux/mali_linux_trace.h
-index 7f0b19d..33cb1ca 100644
---- linux/mali_linux_trace.h
-+++ b/linux/mali_linux_trace.h
-@@ -13,13 +13,11 @@
- 
- #include <linux/types.h>
- 
--#include <linux/stringify.h>
- #include <linux/tracepoint.h>
- 
- #undef  TRACE_SYSTEM
- #define TRACE_SYSTEM mali
- #ifndef TRACEPOINTS_ENABLED
--#define TRACE_SYSTEM_STRING __stringfy(TRACE_SYSTEM)
- #endif
- #define TRACE_INCLUDE_PATH .
- #define TRACE_INCLUDE_FILE mali_linux_trace
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch
deleted file mode 100644
index c5c49679..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2f5e8944357f43fbde4cb642c6ee4a699c88efb5 Mon Sep 17 00:00:00 2001
-From: Hyun Kwon <hyun.kwon@xilinx.com>
-Date: Wed, 29 Jun 2016 09:14:37 -0700
-Subject: [PATCH 4/9] staging: mali: r8p0-01rel0: Don't include
- mali_read_phys() for zynq/zynqmp
-
-mali_read_phys() is not used with CONFIG_ARCH_ZYNQ and CONFIG_ARCH_ZYNQMP.
-
-Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com>
-Upstream Status: Inappropriate [Xilinx specific]
----
- driver/src/devicedrv/mali/platform/arm/arm.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/driver/src/devicedrv/mali/platform/arm/arm.c b/driver/src/devicedrv/mali/platform/arm/arm.c
-index fac99bc..62f9be6 100644
---- platform/arm/arm.c
-+++ b/platform/arm/arm.c
-@@ -38,7 +38,9 @@
- static int mali_core_scaling_enable = 0;
- 
- void mali_gpu_utilization_callback(struct mali_gpu_utilization_data *data);
-+#if !(defined(CONFIG_ARCH_ZYNQ) || defined(CONFIG_ARCH_ZYNQMP))
- static u32 mali_read_phys(u32 phys_addr);
-+#endif
- #if defined(CONFIG_ARCH_REALVIEW)
- static void mali_write_phys(u32 phys_addr, u32 value);
- #endif
-@@ -578,6 +580,7 @@ int mali_platform_device_deinit(struct platform_device *device)
- 
- #endif /* CONFIG_MALI_DT */
- 
-+#if !(defined(CONFIG_ARCH_ZYNQ) || defined(CONFIG_ARCH_ZYNQMP))
- static u32 mali_read_phys(u32 phys_addr)
- {
-        u32 phys_addr_page = phys_addr & 0xFFFFE000;
-@@ -592,6 +595,7 @@ static u32 mali_read_phys(u32 phys_addr)
- 
-        return ret;
- }
-+#endif
- 
- #if defined(CONFIG_ARCH_REALVIEW)
- static void mali_write_phys(u32 phys_addr, u32 value)
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch
deleted file mode 100644
index 3d784604..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From e67e20ec6ff0c9720d87844270421453c738066a Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Date: Thu, 16 Feb 2017 12:15:58 -0800
-Subject: [PATCH 5/9] linux/mali_kernel_linux.c: Handle clock when probed and
- removed
-
-This patch will handle the clock through clock
-specifier for GPU PP0 and PP1.
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Upstream Status: Inappropriate [Xilinx specific]
----
- .../src/devicedrv/mali/linux/mali_kernel_linux.c   | 40 +++++++++++++++++++++-
- 1 file changed, 39 insertions(+), 1 deletion(-)
-
-diff --git a/driver/src/devicedrv/mali/linux/mali_kernel_linux.c b/driver/src/devicedrv/mali/linux/mali_kernel_linux.c
-index d7893a3..f15fb56 100644
---- linux/mali_kernel_linux.c
-+++ b/linux/mali_kernel_linux.c
-@@ -45,6 +45,14 @@
- #if defined(CONFIG_MALI400_INTERNAL_PROFILING)
- #include "mali_profiling_internal.h"
- #endif
-+
-+#if defined(CONFIG_ARCH_ZYNQMP)
-+/* Initialize variables for clocks */
-+struct clk *clk_gpu;
-+struct clk *clk_gpu_pp0;
-+struct clk *clk_gpu_pp1;
-+#endif
-+
- #if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS)
- #include "mali_osk_profiling.h"
- #include "mali_dvfs_policy.h"
-@@ -580,7 +588,23 @@ static int mali_probe(struct platform_device *pdev)
-        }
- #endif
- 
--
-+#if defined(CONFIG_ARCH_ZYNQMP)
-+       /* Initialize clocks for GPU and PP */
-+       clk_gpu = devm_clk_get(&pdev->dev, "gpu");
-+       if (IS_ERR(clk_gpu))
-+               return PTR_ERR(clk_gpu);
-+       clk_prepare_enable(clk_gpu);
-+
-+       clk_gpu_pp0 = devm_clk_get(&pdev->dev, "gpu_pp0");
-+       if (IS_ERR(clk_gpu_pp0))
-+               return PTR_ERR(clk_gpu_pp0);
-+       clk_prepare_enable(clk_gpu_pp0);
-+
-+       clk_gpu_pp1 = devm_clk_get(&pdev->dev, "gpu_pp1");
-+       if (IS_ERR(clk_gpu_pp1))
-+               return PTR_ERR(clk_gpu_pp1);
-+       clk_prepare_enable(clk_gpu_pp1);
-+#endif
-        if (_MALI_OSK_ERR_OK == _mali_osk_wq_init()) {
-                /* Initialize the Mali GPU HW specified by pdev */
-                if (_MALI_OSK_ERR_OK == mali_initialize_subsystems()) {
-@@ -608,6 +632,12 @@ static int mali_probe(struct platform_device *pdev)
-                _mali_osk_wq_term();
-        }
- 
-+#if defined(CONFIG_ARCH_ZYNQMP)
-+       clk_disable_unprepare(clk_gpu);
-+       clk_disable_unprepare(clk_gpu_pp0);
-+       clk_disable_unprepare(clk_gpu_pp1);
-+#endif
-+
- #ifdef CONFIG_MALI_DEVFREQ
-        mali_devfreq_term(mdev);
- devfreq_init_failed:
-@@ -673,6 +703,14 @@ static int mali_remove(struct platform_device *pdev)
-        mali_platform_device_deinit(mali_platform_device);
- #endif
-        mali_platform_device = NULL;
-+
-+#if defined(CONFIG_ARCH_ZYNQMP)
-+       /* Remove clock */
-+       clk_disable_unprepare(clk_gpu);
-+       clk_disable_unprepare(clk_gpu_pp0);
-+       clk_disable_unprepare(clk_gpu_pp1);
-+#endif
-+
-        return 0;
- }
- 
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch
deleted file mode 100644
index 3e1745fd..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ed7242238151c12029c566d1974058c579d8ae3d Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Date: Wed, 25 Jan 2017 10:00:33 -0800
-Subject: [PATCH 6/9] arm.c: global variable dma_ops is removed from the kernel
- 4.7
-
-Refer kernel commit 1dccb598df549d892b6450c261da54cdd7af44b4, the global
-dma_ops variable and the special-casing for ACPI is removed , and just
-returns the dma ops that got set for the device, or the dummy_dma_ops
-if none were present.
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Upstream Status: Pending
----
- driver/src/devicedrv/mali/platform/arm/arm.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/driver/src/devicedrv/mali/platform/arm/arm.c b/driver/src/devicedrv/mali/platform/arm/arm.c
-index 62f9be6..57ca989 100644
---- platform/arm/arm.c
-+++ b/platform/arm/arm.c
-@@ -529,8 +529,9 @@ int mali_platform_device_init(struct platform_device *device)
-         */
-        if (!device->dev.dma_mask)
-                device->dev.dma_mask = &device->dev.coherent_dma_mask;
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0))
-        device->dev.archdata.dma_ops = dma_ops;
--
-+#endif
-        err = platform_device_add_data(device, &mali_gpu_data, sizeof(mali_gpu_data));
- 
-        if (0 == err) {
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch
deleted file mode 100644
index 98a86c88..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 58e2c55176f1a146781430b2a570c8ce5f80d426 Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Date: Mon, 28 Aug 2017 09:40:37 -0700
-Subject: [PATCH] common/mali_pm.c: Add PM runtime barrier after removing
- suspend
-
-Runtime PM suspend "put" results in addition of PM suspend
-API in work queue. This barrier API will remove it from
-the work queue.
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Upstream-Status: Pending
----
- driver/src/devicedrv/mali/common/mali_pm.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/driver/src/devicedrv/mali/common/mali_pm.c b/driver/src/devicedrv/mali/common/mali_pm.c
-index 858c689..62a1e5f 100644
---- common/mali_pm.c
-+++ b/common/mali_pm.c
-@@ -301,6 +301,7 @@ void mali_pm_init_end(void)
-        }
- 
-        _mali_osk_pm_dev_ref_put();
-+       _mali_osk_pm_dev_barrier();
- }
- 
- void mali_pm_update_sync(void)
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch
deleted file mode 100644
index 38ab4042..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From aeff13ad9e9ef73172a9325f669aefd3c0403dbb Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Date: Wed, 21 Feb 2018 16:52:15 -0800
-Subject: [PATCH] linux/mali_kernel_linux.c: Enable/disable clock for runtime
- resume/suspend
-
-Enable/Disable the clock for GP,PP0 and PP1 during runtime
-resume/suspend.
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurki@xilinx.com>
-Reviewed-by: Hyun Kwon <hyunk@xilinx.com>
-Upstream Status: Inappropriate [Xilinx specific]
----
- .../src/devicedrv/mali/linux/mali_kernel_linux.c   | 65 ++++++++++++++++++----
- 1 file changed, 54 insertions(+), 11 deletions(-)
-
-diff --git a/driver/src/devicedrv/mali/linux/mali_kernel_linux.c b/driver/src/devicedrv/mali/linux/mali_kernel_linux.c
-index f15fb56..e61f33b 100644
---- linux/mali_kernel_linux.c
-+++ b/linux/mali_kernel_linux.c
-@@ -51,6 +51,7 @@
- struct clk *clk_gpu;
- struct clk *clk_gpu_pp0;
- struct clk *clk_gpu_pp1;
-+mali_bool clk_enabled;
- #endif
- 
- #if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS)
-@@ -281,6 +282,46 @@ struct file_operations mali_fops = {
-        .mmap = mali_mmap
- };
- 
-+static int mali_enable_clk(void)
-+{
-+#if defined(CONFIG_ARCH_ZYNQMP)
-+       int err = 0;
-+
-+       if (clk_enabled)
-+               return 0;
-+
-+       clk_enabled = MALI_TRUE;
-+       err = clk_prepare_enable(clk_gpu);
-+       if (err) {
-+               MALI_PRINT_ERROR(("Could not enable clock for GP\n\r"));
-+               return err;
-+       }
-+       err = clk_prepare_enable(clk_gpu_pp0);
-+       if (err) {
-+               MALI_PRINT_ERROR(("Could not enable clock for PP0\n\r"));
-+               return err;
-+       }
-+       err = clk_prepare_enable(clk_gpu_pp1);
-+       if (err) {
-+               MALI_PRINT_ERROR(("Could not enable clock for PP1\n\r"));
-+               return err;
-+       }
-+#endif
-+       return 0;
-+}
-+
-+static void mali_disable_clk(void)
-+{
-+#if defined(CONFIG_ARCH_ZYNQMP)
-+       if (clk_enabled) {
-+               clk_enabled = MALI_FALSE;
-+               clk_disable_unprepare(clk_gpu);
-+               clk_disable_unprepare(clk_gpu_pp0);
-+               clk_disable_unprepare(clk_gpu_pp1);
-+       }
-+#endif
-+}
-+
- #if MALI_ENABLE_CPU_CYCLES
- void mali_init_cpu_time_counters(int reset, int enable_divide_by_64)
- {
-@@ -593,18 +634,19 @@ static int mali_probe(struct platform_device *pdev)
-        clk_gpu = devm_clk_get(&pdev->dev, "gpu");
-        if (IS_ERR(clk_gpu))
-                return PTR_ERR(clk_gpu);
--       clk_prepare_enable(clk_gpu);
- 
-        clk_gpu_pp0 = devm_clk_get(&pdev->dev, "gpu_pp0");
-        if (IS_ERR(clk_gpu_pp0))
-                return PTR_ERR(clk_gpu_pp0);
--       clk_prepare_enable(clk_gpu_pp0);
- 
-        clk_gpu_pp1 = devm_clk_get(&pdev->dev, "gpu_pp1");
-        if (IS_ERR(clk_gpu_pp1))
-                return PTR_ERR(clk_gpu_pp1);
--       clk_prepare_enable(clk_gpu_pp1);
- #endif
-+
-+       err = mali_enable_clk();
-+       if (err)
-+               return err;
-        if (_MALI_OSK_ERR_OK == _mali_osk_wq_init()) {
-                /* Initialize the Mali GPU HW specified by pdev */
-                if (_MALI_OSK_ERR_OK == mali_initialize_subsystems()) {
-@@ -632,11 +674,6 @@ static int mali_probe(struct platform_device *pdev)
-                _mali_osk_wq_term();
-        }
- 
--#if defined(CONFIG_ARCH_ZYNQMP)
--       clk_disable_unprepare(clk_gpu);
--       clk_disable_unprepare(clk_gpu_pp0);
--       clk_disable_unprepare(clk_gpu_pp1);
--#endif
- 
- #ifdef CONFIG_MALI_DEVFREQ
-        mali_devfreq_term(mdev);
-@@ -644,6 +681,7 @@ devfreq_init_failed:
-        mali_pm_metrics_term(mdev);
- pm_metrics_init_failed:
-        clk_disable_unprepare(mdev->clock);
-+       mali_disable_clk();
- clock_prepare_failed:
-        clk_put(mdev->clock);
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && defined(CONFIG_OF) \
-@@ -706,9 +744,7 @@ static int mali_remove(struct platform_device *pdev)
- 
- #if defined(CONFIG_ARCH_ZYNQMP)
-        /* Remove clock */
--       clk_disable_unprepare(clk_gpu);
--       clk_disable_unprepare(clk_gpu_pp0);
--       clk_disable_unprepare(clk_gpu_pp1);
-+       mali_disable_clk();
- #endif
- 
-        return 0;
-@@ -816,6 +852,8 @@ static int mali_driver_runtime_suspend(struct device *dev)
-                devfreq_suspend_device(mdev->devfreq);
- #endif
- 
-+       mali_disable_clk();
-+
-                return 0;
-        } else {
-                return -EBUSY;
-@@ -824,6 +862,11 @@ static int mali_driver_runtime_suspend(struct device *dev)
- 
- static int mali_driver_runtime_resume(struct device *dev)
- {
-+       int err ;
-+
-+       err = mali_enable_clk();
-+       if (err)
-+               return err;
- #ifdef CONFIG_MALI_DEVFREQ
-        struct mali_device *mdev = dev_get_drvdata(dev);
-        if (!mdev)
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch
deleted file mode 100644
index 24f0a22c..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 779b1883d56804ecd08fe7f57d6c01e3db4e893b Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Wed, 5 Dec 2018 18:07:29 -0800
-Subject: [PATCH 1/3] linux: mali_memory_os_alloc: Remove __GFP_COLD
-
-The support for Cache hot and cold pages are removed from the kernel.
-For more information refer kernel commit 453f85d43fa9ee243f0fc3ac4e1be45615301e3f
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com>
-Upstream Status: Pending
----
- driver/src/devicedrv/mali/linux/mali_memory_os_alloc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/driver/src/devicedrv/mali/linux/mali_memory_os_alloc.c b/driver/src/devicedrv/mali/linux/mali_memory_os_alloc.c
-index 1602371..830e8c6 100644
---- linux/mali_memory_os_alloc.c
-+++ b/linux/mali_memory_os_alloc.c
-@@ -202,7 +202,9 @@ int mali_mem_os_alloc_pages(mali_mem_os_mem *os_mem, u32 size)
-        /* Allocate new pages, if needed. */
-        for (i = 0; i < remaining; i++) {
-                dma_addr_t dma_addr;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+               gfp_t flags = __GFP_ZERO | __GFP_RETRY_MAYFAIL | __GFP_NOWARN;
-+#elif LINUX_VERSION_CODE == KERNEL_VERSION(4, 14, 0)
-                gfp_t flags = __GFP_ZERO | __GFP_RETRY_MAYFAIL | __GFP_NOWARN | __GFP_COLD;
- #else
-                gfp_t flags = __GFP_ZERO | __GFP_REPEAT | __GFP_NOWARN | __GFP_COLD;
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch
deleted file mode 100644
index c28a83f4..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d20b6eb3e48e56558488dbdda98875b1aed0c29f Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Wed, 5 Dec 2018 18:13:28 -0800
-Subject: [PATCH 2/3] linux: mali_memory_secure: Add header file dma-direct.h
-
-Add dma-direct.h header, as API dma_to_phys is defined here.
-refer kernel commit ea8c64ace86647260ec4255f483e5844d62af2df
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com>
-Upstream Status: Pending
----
- driver/src/devicedrv/mali/linux/mali_memory_secure.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/driver/src/devicedrv/mali/linux/mali_memory_secure.c b/driver/src/devicedrv/mali/linux/mali_memory_secure.c
-index 2836b1b..4f55fa5 100644
---- linux/mali_memory_secure.c
-+++ b/linux/mali_memory_secure.c
-@@ -13,7 +13,11 @@
- #include "mali_memory_secure.h"
- #include "mali_osk.h"
- #include <linux/mutex.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
-+#include <linux/dma-direct.h>
-+#else
- #include <linux/dma-mapping.h>
-+#endif
- #include <linux/dma-buf.h>
- 
- _mali_osk_errcode_t mali_mem_secure_attach_dma_buf(mali_mem_secure *secure_mem, u32 size, int mem_fd)
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0014-linux-mali_-timer-Get-rid-of-init_timer.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0014-linux-mali_-timer-Get-rid-of-init_timer.patch
deleted file mode 100644
index a7c1d5cc..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0014-linux-mali_-timer-Get-rid-of-init_timer.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From b6936450484b5aa9dd2438367a907af020341d1d Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Thu, 6 Dec 2018 13:30:44 -0800
-Subject: [PATCH 3/3] linux: mali_*timer: Get rid of init_timer
-
-kernel 4.19 got rid of ancient init_timer. Hence, replace it with
-timer_setup API. For more information refer kernel commit
-7eeb6b893bd28c68b6d664de1d3120e49b855cdb
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com>
-Upstream Status: Pending
----
- driver/src/devicedrv/mali/common/mali_control_timer.c |  6 ++++++
- driver/src/devicedrv/mali/common/mali_group.c         |  6 ++++++
- driver/src/devicedrv/mali/common/mali_osk.h           | 15 ++++++++++++++-
- driver/src/devicedrv/mali/linux/mali_osk_timers.c     | 15 ++++++++++++++-
- 4 files changed, 40 insertions(+), 2 deletions(-)
-
-diff --git a/driver/src/devicedrv/mali/common/mali_control_timer.c b/driver/src/devicedrv/mali/common/mali_control_timer.c
-index 1296ffe..d24b934 100644
---- common/mali_control_timer.c
-+++ b/common/mali_control_timer.c
-@@ -65,11 +65,17 @@ _mali_osk_errcode_t mali_control_timer_init(void)
-                }
-        }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+       mali_control_timer = _mali_osk_timer_init(mali_control_timer_callback);
-+#else
-        mali_control_timer = _mali_osk_timer_init();
-+#endif
-        if (NULL == mali_control_timer) {
-                return _MALI_OSK_ERR_FAULT;
-        }
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-        _mali_osk_timer_setcallback(mali_control_timer, mali_control_timer_callback, NULL);
-+#endif
- 
-        return _MALI_OSK_ERR_OK;
- }
-diff --git a/driver/src/devicedrv/mali/common/mali_group.c b/driver/src/devicedrv/mali/common/mali_group.c
-index 5c7b3f4..1702e9a 100644
---- common/mali_group.c
-+++ b/common/mali_group.c
-@@ -65,9 +65,15 @@ struct mali_group *mali_group_create(struct mali_l2_cache_core *core,
- 
-        group = _mali_osk_calloc(1, sizeof(struct mali_group));
-        if (NULL != group) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+               group->timeout_timer = _mali_osk_timer_init(mali_group_timeout);
-+#else
-                group->timeout_timer = _mali_osk_timer_init();
-+#endif
-                if (NULL != group->timeout_timer) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-                        _mali_osk_timer_setcallback(group->timeout_timer, mali_group_timeout, (void *)group);
-+#endif
- 
-                        group->l2_cache_core[0] = core;
-                        _mali_osk_list_init(&group->group_list);
-diff --git a/driver/src/devicedrv/mali/common/mali_osk.h b/driver/src/devicedrv/mali/common/mali_osk.h
-index a501778..fe93d79 100644
---- common/mali_osk.h
-+++ b/common/mali_osk.h
-@@ -947,7 +947,17 @@ _mali_osk_errcode_t _mali_osk_notification_queue_dequeue(_mali_osk_notification_
-  * asked for.
-  *
-  * @{ */
--
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+/** @brief Initialize a timer
-+ *
-+ * Allocates resources for a new timer, and initializes them. This does not
-+ * start the timer.
-+ *
-+ * @param callback Function to call when timer expires
-+ * @return a pointer to the allocated timer object, or NULL on failure.
-+ */
-+_mali_osk_timer_t *_mali_osk_timer_init(_mali_osk_timer_callback_t callback);
-+#else
- /** @brief Initialize a timer
-  *
-  * Allocates resources for a new timer, and initializes them. This does not
-@@ -956,6 +966,7 @@ _mali_osk_errcode_t _mali_osk_notification_queue_dequeue(_mali_osk_notification_
-  * @return a pointer to the allocated timer object, or NULL on failure.
-  */
- _mali_osk_timer_t *_mali_osk_timer_init(void);
-+#endif
- 
- /** @brief Start a timer
-  *
-@@ -1034,6 +1045,7 @@ void _mali_osk_timer_del_async(_mali_osk_timer_t *tim);
-  */
- mali_bool _mali_osk_timer_pending(_mali_osk_timer_t *tim);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- /** @brief Set a timer's callback parameters.
-  *
-  * This must be called at least once before a timer is started/modified.
-@@ -1047,6 +1059,7 @@ mali_bool _mali_osk_timer_pending(_mali_osk_timer_t *tim);
-  * @param data Function-specific data to supply to the function on expiry.
-  */
- void _mali_osk_timer_setcallback(_mali_osk_timer_t *tim, _mali_osk_timer_callback_t callback, void *data);
-+#endif
- 
- /** @brief Terminate a timer, and deallocate resources.
-  *
-diff --git a/driver/src/devicedrv/mali/linux/mali_osk_timers.c b/driver/src/devicedrv/mali/linux/mali_osk_timers.c
-index e5d7238..f9b5a86 100644
---- linux/mali_osk_timers.c
-+++ b/linux/mali_osk_timers.c
-@@ -21,13 +21,24 @@
- struct _mali_osk_timer_t_struct {
-        struct timer_list timer;
- };
--
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+typedef void (*timer_timeout_function_t)(struct timer_list *);
-+#else
- typedef void (*timer_timeout_function_t)(unsigned long);
-+#endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+_mali_osk_timer_t *_mali_osk_timer_init(_mali_osk_timer_callback_t callback)
-+#else
- _mali_osk_timer_t *_mali_osk_timer_init(void)
-+#endif
- {
-        _mali_osk_timer_t *t = (_mali_osk_timer_t *)kmalloc(sizeof(_mali_osk_timer_t), GFP_KERNEL);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+       if (NULL != t) timer_setup(&t->timer, (timer_timeout_function_t)callback, 0);
-+#else
-        if (NULL != t) init_timer(&t->timer);
-+#endif
-        return t;
- }
- 
-@@ -62,12 +73,14 @@ mali_bool _mali_osk_timer_pending(_mali_osk_timer_t *tim)
-        return 1 == timer_pending(&(tim->timer));
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- void _mali_osk_timer_setcallback(_mali_osk_timer_t *tim, _mali_osk_timer_callback_t callback, void *data)
- {
-        MALI_DEBUG_ASSERT_POINTER(tim);
-        tim->timer.data = (unsigned long)data;
-        tim->timer.function = (timer_timeout_function_t)callback;
- }
-+#endif
- 
- void _mali_osk_timer_term(_mali_osk_timer_t *tim)
- {
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0015-fix-driver-failed-to-check-map-error.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0015-fix-driver-failed-to-check-map-error.patch
deleted file mode 100644
index 5363c37e..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0015-fix-driver-failed-to-check-map-error.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: mali/linux/mali_memory_os_alloc.c
-===================================================================
---- mali.orig/linux/mali_memory_os_alloc.c
-+++ mali/linux/mali_memory_os_alloc.c
-@@ -239,8 +239,10 @@ int mali_mem_os_alloc_pages(mali_mem_os_
-                /* Ensure page is flushed from CPU caches. */
-                dma_addr = dma_map_page(&mali_platform_device->dev, new_page,
-                                        0, _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL);
--               dma_unmap_page(&mali_platform_device->dev, dma_addr,
--                              _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL);
-+               err = dma_mapping_error(&mali_platform_device->dev, dma_addr);
-+               if (likely(!err))
-+                       dma_unmap_page(&mali_platform_device->dev, dma_addr,
-+                                      _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL);
-                dma_addr = dma_map_page(&mali_platform_device->dev, new_page,
-                                        0, _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL);
- 
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch
deleted file mode 100644
index dc8bbebf..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8cf1dd43f3f25cb4afb84dfc3b0e7c02bc8f7f0c Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Mon, 24 Feb 2020 18:19:37 -0800
-Subject: [LINUX][rel-v2020.1][PATCH v1 1/3] mali_memory_secure: Kernel 5.0
- onwards 'access_ok' API does not take 'type' as input parameter
-
-'access_ok' no longer needs 'type' as input paramter from kernel 5.0
-onwards.
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
----
- driver/src/devicedrv/mali/linux/mali_ukk_mem.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/driver/src/devicedrv/mali/linux/mali_ukk_mem.c b/driver/src/devicedrv/mali/linux/mali_ukk_mem.c
-index 4ec57dc..270bb6d 100644
---- linux/mali_ukk_mem.c
-+++ b/linux/mali_ukk_mem.c
-@@ -207,8 +207,13 @@ int mem_write_safe_wrapper(struct mali_session_data *session_data, _mali_uk_mem_
-        kargs.ctx = (uintptr_t)session_data;
- 
-        /* Check if we can access the buffers */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
-+       if (!access_ok((const void __user *)kargs.dest, kargs.size)
-+           || !access_ok((const void __user *)kargs.src, kargs.size)) {
-+#else
-        if (!access_ok(VERIFY_WRITE, kargs.dest, kargs.size)
-            || !access_ok(VERIFY_READ, kargs.src, kargs.size)) {
-+#endif
-                return -EINVAL;
-        }
- 
-@@ -266,7 +271,11 @@ int mem_dump_mmu_page_table_wrapper(struct mali_session_data *session_data, _mal
-                goto err_exit;
- 
-        user_buffer = (void __user *)(uintptr_t)kargs.buffer;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
-+       if (!access_ok(user_buffer, kargs.size))
-+#else
-        if (!access_ok(VERIFY_WRITE, user_buffer, kargs.size))
-+#endif
-                goto err_exit;
- 
-        /* allocate temporary buffer (kernel side) to store mmu page table info */
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch
deleted file mode 100644
index 9c4bbee9..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 953cab73b8bc487da330aa454abd7f8c7466737e Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Mon, 24 Feb 2020 18:32:16 -0800
-Subject: [LINUX][rel-v2020.1][PATCH v1 2/3] Support for vm_insert_pfn
- deprecated from kernel 4.20
-
-From kernel 4.20 onwards, support for vm_insert_pfn is deprecated.
-Hence, replace the same with vmf_insert_pfn.
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
----
- .../devicedrv/mali/linux/mali_memory_block_alloc.c   |  6 +++++-
- driver/src/devicedrv/mali/linux/mali_memory_cow.c    | 14 ++++++++++++--
- .../src/devicedrv/mali/linux/mali_memory_os_alloc.c  | 20 +++++++++++++++++---
- driver/src/devicedrv/mali/linux/mali_memory_secure.c |  7 ++++++-
- 4 files changed, 40 insertions(+), 7 deletions(-)
-
-diff --git a/driver/src/devicedrv/mali/linux/mali_memory_block_alloc.c b/driver/src/devicedrv/mali/linux/mali_memory_block_alloc.c
-index 0c5b6c3..e528699 100644
---- linux/mali_memory_block_alloc.c
-+++ b/linux/mali_memory_block_alloc.c
-@@ -309,9 +309,13 @@ int mali_mem_block_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *v
- 
-        list_for_each_entry(m_page, &block_mem->pfns, list) {
-                MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_BLOCK);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+               ret = vmf_insert_pfn(vma, addr, _mali_page_node_get_pfn(m_page));
-+               if (unlikely(VM_FAULT_ERROR & ret)) {
-+#else
-                ret = vm_insert_pfn(vma, addr, _mali_page_node_get_pfn(m_page));
--
-                if (unlikely(0 != ret)) {
-+#endif
-                        return -EFAULT;
-                }
-                addr += _MALI_OSK_MALI_PAGE_SIZE;
-diff --git a/driver/src/devicedrv/mali/linux/mali_memory_cow.c b/driver/src/devicedrv/mali/linux/mali_memory_cow.c
-index f1d44fe..1dae1d6 100644
---- linux/mali_memory_cow.c
-+++ b/linux/mali_memory_cow.c
-@@ -532,9 +532,14 @@ int mali_mem_cow_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma
-                 * flush which makes it way slower than remap_pfn_range or vm_insert_pfn.

-                ret = vm_insert_page(vma, addr, page);

-                */

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+               ret = vmf_insert_pfn(vma, addr, _mali_page_node_get_pfn(m_page));

-+               if (unlikely(VM_FAULT_ERROR & ret)) {
-+#else
-                ret = vm_insert_pfn(vma, addr, _mali_page_node_get_pfn(m_page));

--

-                if (unlikely(0 != ret)) {

-+#endif
-+

-                        return ret;

-                }

-                addr += _MALI_OSK_MALI_PAGE_SIZE;

-@@ -569,9 +574,14 @@ _mali_osk_errcode_t mali_mem_cow_cpu_map_pages_locked(mali_mem_backend *mem_bken
- 

-        list_for_each_entry(m_page, &cow->pages, list) {

-                if ((count >= offset) && (count < offset + num)) {

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+                       ret = vmf_insert_pfn(vma, vaddr, _mali_page_node_get_pfn(m_page));

-+                       if (unlikely(VM_FAULT_ERROR & ret)) {
-+#else
-                        ret = vm_insert_pfn(vma, vaddr, _mali_page_node_get_pfn(m_page));

--

-                        if (unlikely(0 != ret)) {

-+#endif
-+

-                                if (count == offset) {

-                                        return _MALI_OSK_ERR_FAULT;

-                                } else {

-diff --git a/driver/src/devicedrv/mali/linux/mali_memory_os_alloc.c b/driver/src/devicedrv/mali/linux/mali_memory_os_alloc.c
-index 3fb6f05..7de3920 100644
---- linux/mali_memory_os_alloc.c
-+++ b/linux/mali_memory_os_alloc.c
-@@ -378,9 +378,14 @@ int mali_mem_os_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma)
-                ret = vm_insert_page(vma, addr, page);
-                */
-                page = m_page->page;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+               ret = vmf_insert_pfn(vma, addr, page_to_pfn(page));
-+               if (unlikely(VM_FAULT_ERROR & ret)) {
-+#else
-                ret = vm_insert_pfn(vma, addr, page_to_pfn(page));
--
-                if (unlikely(0 != ret)) {
-+#endif
-+
-                        return -EFAULT;
-                }
-                addr += _MALI_OSK_MALI_PAGE_SIZE;
-@@ -416,9 +421,13 @@ _mali_osk_errcode_t mali_mem_os_resize_cpu_map_locked(mali_mem_backend *mem_bken
- 
-                        vm_end -= _MALI_OSK_MALI_PAGE_SIZE;
-                        if (mapping_page_num > 0) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+                               ret = vmf_insert_pfn(vma, vm_end, page_to_pfn(m_page->page));
-+                               if (unlikely(VM_FAULT_ERROR & ret)) {
-+#else
-                                ret = vm_insert_pfn(vma, vm_end, page_to_pfn(m_page->page));
--
-                                if (unlikely(0 != ret)) {
-+#endif
-                                        /*will return -EBUSY If the page has already been mapped into table, but it's OK*/
-                                        if (-EBUSY == ret) {
-                                                break;
-@@ -439,9 +448,14 @@ _mali_osk_errcode_t mali_mem_os_resize_cpu_map_locked(mali_mem_backend *mem_bken
-                list_for_each_entry(m_page, &os_mem->pages, list) {
-                        if (count >= offset) {
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+                               ret = vmf_insert_pfn(vma, vstart, page_to_pfn(m_page->page));
-+                               if (unlikely(VM_FAULT_ERROR & ret)) {
-+#else
-                                ret = vm_insert_pfn(vma, vstart, page_to_pfn(m_page->page));
--
-                                if (unlikely(0 != ret)) {
-+#endif
-+
-                                        /*will return -EBUSY If the page has already been mapped into table, but it's OK*/
-                                        if (-EBUSY == ret) {
-                                                break;
-diff --git a/driver/src/devicedrv/mali/linux/mali_memory_secure.c b/driver/src/devicedrv/mali/linux/mali_memory_secure.c
-index 5546304..cebd1c8 100644
---- linux/mali_memory_secure.c
-+++ b/linux/mali_memory_secure.c
-@@ -132,9 +132,14 @@ int mali_mem_secure_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *
-                MALI_DEBUG_ASSERT(0 == size % _MALI_OSK_MALI_PAGE_SIZE);
- 
-                for (j = 0; j < size / _MALI_OSK_MALI_PAGE_SIZE; j++) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+                       ret = vmf_insert_pfn(vma, addr, PFN_DOWN(phys));
-+                       if (unlikely(VM_FAULT_ERROR & ret)) {
-+#else
-                        ret = vm_insert_pfn(vma, addr, PFN_DOWN(phys));
--
-                        if (unlikely(0 != ret)) {
-+#endif
-+
-                                return -EFAULT;
-                        }
-                        addr += _MALI_OSK_MALI_PAGE_SIZE;
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch
deleted file mode 100644
index 9797db62..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ad5c569f0cc40698699fc2f2c1db3ceb9f8b8f35 Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Tue, 25 Feb 2020 11:36:01 -0800
-Subject: [LINUX][rel-v2020.1][PATCH v1 3/3] Change return type to vm_fault_t
- for fault handler
-
-From kernel 4.17 onwards the return type of fault handler for
-vm_operations is of type 'vm_fault_t'.
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
----
- driver/src/devicedrv/mali/linux/mali_memory.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/driver/src/devicedrv/mali/linux/mali_memory.c b/driver/src/devicedrv/mali/linux/mali_memory.c
-index c0f0982..2b2b209 100644
---- linux/mali_memory.c
-+++ b/linux/mali_memory.c
-@@ -70,7 +70,9 @@ static void mali_mem_vma_close(struct vm_area_struct *vma)
-        }
- }
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+static vm_fault_t  mali_mem_vma_fault(struct vm_fault *vmf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
- static int mali_mem_vma_fault(struct vm_fault *vmf)
- #else
- static int mali_mem_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch
deleted file mode 100644
index 154bb673..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c6a6b39cea3fdfd91cae7f2a4ef6f36d2c55fdd6 Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Tue, 25 Feb 2020 15:17:17 -0800
-Subject: [LINUX][rel-v2020.1][PATCH v1] "get_monotonic_boottime(&ts)"
- deprecated from kernel 4.20 onwards
-
-As "get_monotonic_boottime(&ts)" is deprecated, replace the same with
-"ktime_get_boottime_ts64(&ts)". Refer kernel commit ID
-976516404ff3fab2a8caa8bd6f5efc1437fed0b8
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
----
- driver/src/devicedrv/mali/linux/mali_osk_time.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/driver/src/devicedrv/mali/linux/mali_osk_time.c b/driver/src/devicedrv/mali/linux/mali_osk_time.c
-index 03046a5..bfcbf7f 100644
---- linux/mali_osk_time.c
-+++ b/linux/mali_osk_time.c
-@@ -53,7 +53,13 @@ u64 _mali_osk_time_get_ns(void)
- 
- u64 _mali_osk_boot_time_get_ns(void)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+       struct timespec64 tsval;
-+       ktime_get_boottime_ts64(&tsval);
-+       return (u64)timespec64_to_ns(&tsval);
-+#else
-        struct timespec tsval;
-        get_monotonic_boottime(&tsval);
-        return (u64)timespec_to_ns(&tsval);
-+#endif
- }
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch
deleted file mode 100644
index ff86091f..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From cbc2351e8acf7ed38f6d965e5ea21620e45eda30 Mon Sep 17 00:00:00 2001
-From: Dylan Yip <dylan.yip@xilinx.com>
-Date: Tue, 9 Feb 2021 10:05:41 -0800
-Subject: [PATCH 20/23] Fix ioremap_nocache() deprecation in kernel 5.6
-
-As of commit 4bdc0d676a643140 ("remove ioremap_nocache and
-devm_ioremap_nocache") from kernel 5.6, ioremap_nocache has been
-removed because ioremap is already non-cached by default. So replace all
-calls with ioremap.
-
-Signed-off-by: Dylan Yip <dylan.yip@xilinx.com>
----
- linux/mali_memory_cow.c        |  4 ++++
- linux/mali_osk_low_level_mem.c |  4 ++++
- platform/arm/arm.c             | 12 ++++++++++++
- 3 files changed, 20 insertions(+)
-
-diff --git a/linux/mali_memory_cow.c b/linux/mali_memory_cow.c
-index 1dae1d6..6fadd42 100644
---- a/linux/mali_memory_cow.c
-+++ b/linux/mali_memory_cow.c
-@@ -693,7 +693,11 @@ void _mali_mem_cow_copy_page(mali_page_node *src_node, mali_page_node *dst_node)
-                /*

-                * use ioremap to map src for BLOCK memory

-                */

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)

-+               src = ioremap(_mali_page_node_get_dma_addr(src_node), _MALI_OSK_MALI_PAGE_SIZE);

-+#else

-                src = ioremap_nocache(_mali_page_node_get_dma_addr(src_node), _MALI_OSK_MALI_PAGE_SIZE);

-+#endif

-                memcpy(dst, src , _MALI_OSK_MALI_PAGE_SIZE);

-                iounmap(src);

-        }

-diff --git a/linux/mali_osk_low_level_mem.c b/linux/mali_osk_low_level_mem.c
-index 84f93d9..5a0a725 100644
---- a/linux/mali_osk_low_level_mem.c
-+++ b/linux/mali_osk_low_level_mem.c
-@@ -33,7 +33,11 @@ void _mali_osk_write_mem_barrier(void)
- 
- mali_io_address _mali_osk_mem_mapioregion(uintptr_t phys, u32 size, const char *description)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
-+       return (mali_io_address)ioremap(phys, size);
-+#else
-        return (mali_io_address)ioremap_nocache(phys, size);
-+#endif
- }
- 
- void _mali_osk_mem_unmapioregion(uintptr_t phys, u32 size, mali_io_address virt)
-diff --git a/platform/arm/arm.c b/platform/arm/arm.c
-index b2fb746..e468263 100644
---- a/platform/arm/arm.c
-+++ b/platform/arm/arm.c
-@@ -98,7 +98,11 @@ static int mali_secure_mode_init_juno(void)
- 
-        MALI_DEBUG_ASSERT(NULL == secure_mode_mapped_addr);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
-+       secure_mode_mapped_addr = ioremap(phys_addr_page, map_size);
-+#else
-        secure_mode_mapped_addr = ioremap_nocache(phys_addr_page, map_size);
-+#endif
-        if (NULL != secure_mode_mapped_addr) {
-                return mali_gpu_reset_and_secure_mode_disable_juno();
-        }
-@@ -588,7 +592,11 @@ static u32 mali_read_phys(u32 phys_addr)
-        u32 phys_offset    = phys_addr & 0x00001FFF;
-        u32 map_size       = phys_offset + sizeof(u32);
-        u32 ret = 0xDEADBEEF;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
-+       void *mem_mapped = ioremap(phys_addr_page, map_size);
-+#else
-        void *mem_mapped = ioremap_nocache(phys_addr_page, map_size);
-+#endif
-        if (NULL != mem_mapped) {
-                ret = (u32)ioread32(((u8 *)mem_mapped) + phys_offset);
-                iounmap(mem_mapped);
-@@ -604,7 +612,11 @@ static void mali_write_phys(u32 phys_addr, u32 value)
-        u32 phys_addr_page = phys_addr & 0xFFFFE000;
-        u32 phys_offset    = phys_addr & 0x00001FFF;
-        u32 map_size       = phys_offset + sizeof(u32);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
-+       void *mem_mapped = ioremap(phys_addr_page, map_size);
-+#else
-        void *mem_mapped = ioremap_nocache(phys_addr_page, map_size);
-+#endif
-        if (NULL != mem_mapped) {
-                iowrite32(value, ((u8 *)mem_mapped) + phys_offset);
-                iounmap(mem_mapped);
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch
deleted file mode 100644
index adef8e18..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bc0f85271681532c7e394229f0155366d1de8779 Mon Sep 17 00:00:00 2001
-From: Dylan Yip <dylan.yip@xilinx.com>
-Date: Mon, 8 Feb 2021 23:47:01 -0800
-Subject: [PATCH 21/23] Use updated timekeeping functions in kernel 5.6
-
-As of commit 412c53a680a9 ("y2038: remove unused time32 interfaces"), 32
-bit timekeeping functions like getnstimeofday() have been removed. So
-use the 64 bit replacements.
-
-Signed-off-by: Dylan Yip <dylan.yip@xilinx.com>
----
- linux/mali_osk_time.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/linux/mali_osk_time.c b/linux/mali_osk_time.c
-index bfcbf7f..583d82b 100644
---- a/linux/mali_osk_time.c
-+++ b/linux/mali_osk_time.c
-@@ -46,9 +46,15 @@ void _mali_osk_time_ubusydelay(u32 usecs)
- 
- u64 _mali_osk_time_get_ns(void)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
-+       struct timespec64 tsval;
-+       ktime_get_real_ts64(&tsval);
-+       return (u64)timespec64_to_ns(&tsval);
-+#else
-        struct timespec tsval;
-        getnstimeofday(&tsval);
-        return (u64)timespec_to_ns(&tsval);
-+#endif
- }
- 
- u64 _mali_osk_boot_time_get_ns(void)
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch
deleted file mode 100644
index 181df7b7..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d17933b6909cc29103befc2ef4e6cf413d9e8fb6 Mon Sep 17 00:00:00 2001
-From: Dylan Yip <dylan.yip@xilinx.com>
-Date: Tue, 9 Feb 2021 08:58:44 -0800
-Subject: [PATCH 22/23] Set HAVE_UNLOCKED_IOCTL default to true
-
-As of commit b19dd42faf41 ("bkl: Remove locked .ioctl file operation")
-of kernel 2.6, the ioctl operation has been replaced with
-unlocked_ioctl. Since this change has been around for almost 10 years,
-go ahead and set the default HAVE_UNLOCKED_IOCTL to be true.
-
-Signed-off-by: Dylan Yip <dylan.yip@xilinx.com>
----
- Kbuild | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Kbuild b/Kbuild
-index 02c3f3d..8c6e6e0 100644
---- a/Kbuild
-+++ b/Kbuild
-@@ -21,6 +21,7 @@ MALI_PP_SCHEDULER_KEEP_SUB_JOB_STARTS_ALIGNED ?= 0
- MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP_BETWEEN_APPS ?= 0
- MALI_UPPER_HALF_SCHEDULING ?= 1
- MALI_ENABLE_CPU_CYCLES ?= 0
-+HAVE_UNLOCKED_IOCTL ?= 1
- 
- # For customer releases the Linux Device Drivers will be provided as ARM proprietary and GPL releases:
- # The ARM proprietary product will only include the license/proprietary directory
-@@ -179,6 +180,7 @@ ccflags-y += -DMALI_STATE_TRACKING=1
- ccflags-y += -DMALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB=$(OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB)
- ccflags-y += -DUSING_GPU_UTILIZATION=$(USING_GPU_UTILIZATION)
- ccflags-y += -DMALI_ENABLE_CPU_CYCLES=$(MALI_ENABLE_CPU_CYCLES)
-+ccflags-y += -DHAVE_UNLOCKED_IOCTL=$(HAVE_UNLOCKED_IOCTL)
- 
- ifeq ($(MALI_UPPER_HALF_SCHEDULING),1)
-        ccflags-y += -DMALI_UPPER_HALF_SCHEDULING
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch
deleted file mode 100644
index bab2bd37..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e2b52e358e0e030d3881ef80ef09de3662b41210 Mon Sep 17 00:00:00 2001
-From: Dylan Yip <dylan.yip@xilinx.com>
-Date: Tue, 9 Feb 2021 09:48:01 -0800
-Subject: [PATCH 23/23] Use PTR_ERR_OR_ZERO instead of PTR_RET
-
-As of commit fad7c9020948 ("err.h: remove deprecated PTR_RET for good")
-in kernel 5.7, PTR_RET has been removed and replaced with
-PTR_ERR_OR_ZERO. So use this API instead.
-
-Signed-off-by: Dylan Yip <dylan.yip@xilinx.com>
----
- linux/mali_memory_dma_buf.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/linux/mali_memory_dma_buf.c b/linux/mali_memory_dma_buf.c
-index 905cd8b..fcdcaac 100644
---- a/linux/mali_memory_dma_buf.c
-+++ b/linux/mali_memory_dma_buf.c
-@@ -281,7 +281,11 @@ int mali_dma_buf_get_size(struct mali_session_data *session, _mali_uk_dma_buf_ge
-        buf = dma_buf_get(fd);
-        if (IS_ERR_OR_NULL(buf)) {
-                MALI_DEBUG_PRINT_ERROR(("Failed to get dma-buf from fd: %d\n", fd));
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)
-+               return PTR_ERR_OR_ZERO(buf);
-+#else
-                return PTR_RET(buf);
-+#endif
-        }
- 
-        if (0 != put_user(buf->size, &user_arg->size)) {
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0024-Use-community-device-tree-names.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0024-Use-community-device-tree-names.patch
deleted file mode 100644
index 5b3eeedc..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0024-Use-community-device-tree-names.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Use the community device-tree names
-
-The community LIMA driver uses a series of names that are different then
-the legacy Xilinx names.  Moves from the legacy names to the more standard
-names.
-
-This will allow us to have a single device tree that works with both the
-mali driver, as well as the lima driver.
-
-Interrupt-names:
-  IRQGP     -> gp
-  IRQGPMMU  -> gpmmu
-  IRQPP0    -> pp0
-  IRQPPMMU0 -> ppmmu0
-  IRQPP1    -> pp1
-  IRQPPMMU1 -> ppmmu1
-  ...
-
-Clock-names:
-  gpu_pp0 -> core
-  gpu_pp1 -> bus
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-
-diff -ur a/linux/mali_kernel_linux.c b/linux/mali_kernel_linux.c
---- a/linux/mali_kernel_linux.c 2018-09-17 04:04:48.000000000 -0700
-+++ b/linux/mali_kernel_linux.c 2022-10-24 14:01:54.614376177 -0700
-@@ -635,11 +635,11 @@
-        if (IS_ERR(clk_gpu))
-                return PTR_ERR(clk_gpu);
- 
--       clk_gpu_pp0 = devm_clk_get(&pdev->dev, "gpu_pp0");
-+       clk_gpu_pp0 = devm_clk_get(&pdev->dev, "core");
-        if (IS_ERR(clk_gpu_pp0))
-                return PTR_ERR(clk_gpu_pp0);
- 
--       clk_gpu_pp1 = devm_clk_get(&pdev->dev, "gpu_pp1");
-+       clk_gpu_pp1 = devm_clk_get(&pdev->dev, "bus");
-        if (IS_ERR(clk_gpu_pp1))
-                return PTR_ERR(clk_gpu_pp1);
- #endif
-diff -ur a/linux/mali_osk_mali.c b/linux/mali_osk_mali.c
---- a/linux/mali_osk_mali.c     2018-09-12 23:52:20.000000000 -0700
-+++ b/linux/mali_osk_mali.c     2022-10-24 14:00:28.470380512 -0700
-@@ -72,26 +72,26 @@
- #define MALI_OSK_RESOURCE_DMA_LOCATION 26
- 
- static _mali_osk_resource_t mali_osk_resource_bank[MALI_OSK_MAX_RESOURCE_NUMBER] = {
--       {.description = "Mali_GP", .base = MALI_OFFSET_GP, .irq_name = "IRQGP",},
--       {.description = "Mali_GP_MMU", .base = MALI_OFFSET_GP_MMU, .irq_name = "IRQGPMMU",},
--       {.description = "Mali_PP0", .base = MALI_OFFSET_PP0, .irq_name = "IRQPP0",},
--       {.description = "Mali_PP0_MMU", .base = MALI_OFFSET_PP0_MMU, .irq_name = "IRQPPMMU0",},
--       {.description = "Mali_PP1", .base = MALI_OFFSET_PP1, .irq_name = "IRQPP1",},
--       {.description = "Mali_PP1_MMU", .base = MALI_OFFSET_PP1_MMU, .irq_name = "IRQPPMMU1",},
--       {.description = "Mali_PP2", .base = MALI_OFFSET_PP2, .irq_name = "IRQPP2",},
--       {.description = "Mali_PP2_MMU", .base = MALI_OFFSET_PP2_MMU, .irq_name = "IRQPPMMU2",},
--       {.description = "Mali_PP3", .base = MALI_OFFSET_PP3, .irq_name = "IRQPP3",},
--       {.description = "Mali_PP3_MMU", .base = MALI_OFFSET_PP3_MMU, .irq_name = "IRQPPMMU3",},
--       {.description = "Mali_PP4", .base = MALI_OFFSET_PP4, .irq_name = "IRQPP4",},
--       {.description = "Mali_PP4_MMU", .base = MALI_OFFSET_PP4_MMU, .irq_name = "IRQPPMMU4",},
--       {.description = "Mali_PP5", .base = MALI_OFFSET_PP5, .irq_name = "IRQPP5",},
--       {.description = "Mali_PP5_MMU", .base = MALI_OFFSET_PP5_MMU, .irq_name = "IRQPPMMU5",},
--       {.description = "Mali_PP6", .base = MALI_OFFSET_PP6, .irq_name = "IRQPP6",},
--       {.description = "Mali_PP6_MMU", .base = MALI_OFFSET_PP6_MMU, .irq_name = "IRQPPMMU6",},
--       {.description = "Mali_PP7", .base = MALI_OFFSET_PP7, .irq_name = "IRQPP7",},
--       {.description = "Mali_PP7_MMU", .base = MALI_OFFSET_PP7_MMU, .irq_name = "IRQPPMMU",},
--       {.description = "Mali_PP_Broadcast", .base = MALI_OFFSET_PP_BCAST, .irq_name = "IRQPP",},
--       {.description = "Mali_PMU", .base = MALI_OFFSET_PMU, .irq_name = "IRQPMU",},
-+       {.description = "Mali_GP", .base = MALI_OFFSET_GP, .irq_name = "gp",},
-+       {.description = "Mali_GP_MMU", .base = MALI_OFFSET_GP_MMU, .irq_name = "gpmmu",},
-+       {.description = "Mali_PP0", .base = MALI_OFFSET_PP0, .irq_name = "pp0",},
-+       {.description = "Mali_PP0_MMU", .base = MALI_OFFSET_PP0_MMU, .irq_name = "ppmmu0",},
-+       {.description = "Mali_PP1", .base = MALI_OFFSET_PP1, .irq_name = "pp1",},
-+       {.description = "Mali_PP1_MMU", .base = MALI_OFFSET_PP1_MMU, .irq_name = "ppmmu1",},
-+       {.description = "Mali_PP2", .base = MALI_OFFSET_PP2, .irq_name = "pp2",},
-+       {.description = "Mali_PP2_MMU", .base = MALI_OFFSET_PP2_MMU, .irq_name = "ppmmu2",},
-+       {.description = "Mali_PP3", .base = MALI_OFFSET_PP3, .irq_name = "pp3",},
-+       {.description = "Mali_PP3_MMU", .base = MALI_OFFSET_PP3_MMU, .irq_name = "ppmmu3",},
-+       {.description = "Mali_PP4", .base = MALI_OFFSET_PP4, .irq_name = "pp4",},
-+       {.description = "Mali_PP4_MMU", .base = MALI_OFFSET_PP4_MMU, .irq_name = "ppmmu4",},
-+       {.description = "Mali_PP5", .base = MALI_OFFSET_PP5, .irq_name = "pp5",},
-+       {.description = "Mali_PP5_MMU", .base = MALI_OFFSET_PP5_MMU, .irq_name = "ppmmu5",},
-+       {.description = "Mali_PP6", .base = MALI_OFFSET_PP6, .irq_name = "pp6",},
-+       {.description = "Mali_PP6_MMU", .base = MALI_OFFSET_PP6_MMU, .irq_name = "ppmmu6",},
-+       {.description = "Mali_PP7", .base = MALI_OFFSET_PP7, .irq_name = "pp7",},
-+       {.description = "Mali_PP7_MMU", .base = MALI_OFFSET_PP7_MMU, .irq_name = "ppmmu",},
-+       {.description = "Mali_PP_Broadcast", .base = MALI_OFFSET_PP_BCAST, .irq_name = "pp",},
-+       {.description = "Mali_PMU", .base = MALI_OFFSET_PMU, .irq_name = "pmu",},
-        {.description = "Mali_L2", .base = MALI_OFFSET_L2_RESOURCE0,},
-        {.description = "Mali_L2", .base = MALI_OFFSET_L2_RESOURCE1,},
-        {.description = "Mali_L2", .base = MALI_OFFSET_L2_RESOURCE2,},
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch
deleted file mode 100644
index f3bcd4f1..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d4fcb32f8dc85d01c6e0dc8e5d85c7ed43f0866c Mon Sep 17 00:00:00 2001
-From: Yash Ladani <yash.ladani@amd.com>
-Date: Tue, 6 Dec 2022 00:52:53 -0800
-Subject: [PATCH] Import DMA_BUF module and update register_shrinker function
- for kernel 5.16 or higher
-
-Added MODULE_IMPORT_NS(DMA_BUF) for kernel version 5.16 or higher.
-register_shrinker function call now requires two arguments
-for kernel 5.16 or higher updated this function call.
-
-Signed-off-by: Yash Ladani <yash.ladani@amd.com>
----
- linux/mali_memory_dma_buf.c  | 4 ++++
- linux/mali_memory_os_alloc.c | 5 ++++-
- linux/mali_memory_secure.c   | 4 ++++
- 3 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/linux/mali_memory_dma_buf.c b/linux/mali_memory_dma_buf.c
-index fcdcaac..72e28a8 100644
---- a/linux/mali_memory_dma_buf.c
-+++ b/linux/mali_memory_dma_buf.c
-@@ -34,6 +34,10 @@
- #include "mali_memory_virtual.h"
- #include "mali_pp_job.h"
- 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 15, 0)
-+MODULE_IMPORT_NS(DMA_BUF);
-+#endif
-+
- /*
-  * Map DMA buf attachment \a mem into \a session at virtual address \a virt.
-  */
-diff --git a/linux/mali_memory_os_alloc.c b/linux/mali_memory_os_alloc.c
-index 7de3920..5bf08f8 100644
---- a/linux/mali_memory_os_alloc.c
-+++ b/linux/mali_memory_os_alloc.c
-@@ -801,8 +801,11 @@ _mali_osk_errcode_t mali_mem_os_init(void)
-        dma_set_attr(DMA_ATTR_WRITE_COMBINE, &dma_attrs_wc);
- #endif
- 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 15, 0)
-+       register_shrinker(&mali_mem_os_allocator.shrinker, "mali");
-+#else
-        register_shrinker(&mali_mem_os_allocator.shrinker);
--
-+#endif
-        return _MALI_OSK_ERR_OK;
- }
- 
-diff --git a/linux/mali_memory_secure.c b/linux/mali_memory_secure.c
-index cebd1c8..a9d932f 100644
---- a/linux/mali_memory_secure.c
-+++ b/linux/mali_memory_secure.c
-@@ -20,6 +20,10 @@
- #endif
- #include <linux/dma-buf.h>
- 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 15, 0)
-+MODULE_IMPORT_NS(DMA_BUF);
-+#endif
-+
- _mali_osk_errcode_t mali_mem_secure_attach_dma_buf(mali_mem_secure *secure_mem, u32 size, int mem_fd)
- {
-        struct dma_buf *buf;
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0026-Fix-gpu-driver-probe-failure.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0026-Fix-gpu-driver-probe-failure.patch
deleted file mode 100644
index 247c92ff..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0026-Fix-gpu-driver-probe-failure.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d7a56b7bdf1ea34194fe86639cc318d7a33b9abb Mon Sep 17 00:00:00 2001
-From: Parth Gajjar <parth.gajjar@xilinx.com>
-Date: Thu, 12 Jan 2023 06:00:20 -0800
-Subject: [PATCH] Fix gpu driver probe failure
-
-In patch a1a2b7125e1079cfcc13a116aa3af3df2f9e002b
-(Drop static setup of IRQ resource from DT core) platform_get_resource()
-stopped from returning the IRQ, as all drivers were supposed to have
-switched to platform_get_irq().
-Using platform_get_irq_optional() to avoid printing error messages
-for interrupts not found.
-
-Signed-off-by: Parth Gajjar <parth.gajjar@xilinx.com>
----
- linux/mali_osk_mali.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/linux/mali_osk_mali.c b/linux/mali_osk_mali.c
-index c22758d..3f66132 100644
---- a/linux/mali_osk_mali.c
-+++ b/linux/mali_osk_mali.c
-@@ -113,7 +113,7 @@ static int _mali_osk_get_compatible_name(const char **out_string)
- _mali_osk_errcode_t _mali_osk_resource_initialize(void)
- {
-        mali_bool mali_is_450 = MALI_FALSE, mali_is_470 = MALI_FALSE;
--       int i, pp_core_num = 0, l2_core_num = 0;
-+       int i, pp_core_num = 0, l2_core_num = 0, irq = 0;
-        struct resource *res;
-        const char *compatible_name = NULL;
- 
-@@ -128,9 +128,9 @@ _mali_osk_errcode_t _mali_osk_resource_initialize(void)
-        }
- 
-        for (i = 0; i < MALI_OSK_RESOURCE_WITH_IRQ_NUMBER; i++) {
--               res = platform_get_resource_byname(mali_platform_device, IORESOURCE_IRQ, mali_osk_resource_bank[i].irq_name);
--               if (res) {
--                       mali_osk_resource_bank[i].irq = res->start;
-+               irq = platform_get_irq_byname_optional(mali_platform_device, mali_osk_resource_bank[i].irq_name);
-+               if (irq > 0) {
-+                       mali_osk_resource_bank[i].irq = irq;
-                } else {
-                        mali_osk_resource_bank[i].base = MALI_OSK_INVALID_RESOURCE_ADDRESS;
-                }
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch
deleted file mode 100644
index 18081dc3..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From a64707b7fea40d326c5b18636a41a5994f60048d Mon Sep 17 00:00:00 2001
-From: Parth Gajjar <parth.gajjar@amd.com>
-Date: Fri, 24 Feb 2023 05:11:38 -0800
-Subject: [PATCH] Updated clock name and structure to match LIMA driver
-
-Clock-names:
-  gpu             -> bus
-  gpu_pp0,gpu_pp1 -> core
-
-This will allow us to have a single device tree that works with both the
-mali driver, as well as the lima driver.
-
-Signed-off-by: Parth Gajjar <parth.gajjar@amd.com>
----
- linux/mali_kernel_linux.c  | 37 +++++++------------
- 1 file changed, 13 insertions(+), 24 deletions(-)
-
-diff --git a/linux/mali_kernel_linux.c b/linux/mali_kernel_linux.c
-index ad450b4..050af67 100644
---- a/linux/mali_kernel_linux.c
-+++ b/linux/mali_kernel_linux.c
-@@ -48,9 +48,8 @@
- 
- #if defined(CONFIG_ARCH_ZYNQMP)
- /* Initialize variables for clocks */
--struct clk *clk_gpu;
--struct clk *clk_gpu_pp0;
--struct clk *clk_gpu_pp1;
-+struct clk *clk_bus;
-+struct clk *clk_core;
- mali_bool clk_enabled;
- #endif
- 
-@@ -291,19 +290,14 @@ static int mali_enable_clk(void)
-                return 0;
- 
-        clk_enabled = MALI_TRUE;
--       err = clk_prepare_enable(clk_gpu);
-+       err = clk_prepare_enable(clk_bus);
-        if (err) {
-                MALI_PRINT_ERROR(("Could not enable clock for GP\n\r"));
-                return err;
-        }
--       err = clk_prepare_enable(clk_gpu_pp0);
-+       err = clk_prepare_enable(clk_core);
-        if (err) {
--               MALI_PRINT_ERROR(("Could not enable clock for PP0\n\r"));
--               return err;
--       }
--       err = clk_prepare_enable(clk_gpu_pp1);
--       if (err) {
--               MALI_PRINT_ERROR(("Could not enable clock for PP1\n\r"));
-+               MALI_PRINT_ERROR(("Could not enable clock for PP\n\r"));
-                return err;
-        }
- #endif
-@@ -315,9 +309,8 @@ static void mali_disable_clk(void)
- #if defined(CONFIG_ARCH_ZYNQMP)
-        if (clk_enabled) {
-                clk_enabled = MALI_FALSE;
--               clk_disable_unprepare(clk_gpu);
--               clk_disable_unprepare(clk_gpu_pp0);
--               clk_disable_unprepare(clk_gpu_pp1);
-+               clk_disable_unprepare(clk_bus);
-+               clk_disable_unprepare(clk_core);
-        }
- #endif
- }
-@@ -631,17 +624,13 @@ static int mali_probe(struct platform_device *pdev)
- 
- #if defined(CONFIG_ARCH_ZYNQMP)
-        /* Initialize clocks for GPU and PP */
--       clk_gpu = devm_clk_get(&pdev->dev, "gpu");
--       if (IS_ERR(clk_gpu))
--               return PTR_ERR(clk_gpu);
--
--       clk_gpu_pp0 = devm_clk_get(&pdev->dev, "core");
--       if (IS_ERR(clk_gpu_pp0))
--               return PTR_ERR(clk_gpu_pp0);
-+       clk_bus = devm_clk_get(&pdev->dev, "bus");
-+       if (IS_ERR(clk_bus))
-+               return PTR_ERR(clk_bus);
- 
--       clk_gpu_pp1 = devm_clk_get(&pdev->dev, "bus");
--       if (IS_ERR(clk_gpu_pp1))
--               return PTR_ERR(clk_gpu_pp1);
-+       clk_core = devm_clk_get(&pdev->dev, "core");
-+       if (IS_ERR(clk_core))
-+               return PTR_ERR(clk_core);
- #endif
- 
-        err = mali_enable_clk();
--- 
-2.25.1
-
diff --git a/meta-xilinx-core/recipes-graphics/mesa/files/0001-DRI_Add_xlnx_dri.patch b/meta-xilinx-core/recipes-graphics/mesa/files/0001-DRI_Add_xlnx_dri.patch
deleted file mode 100644
index f77f1939..00000000
--- a/meta-xilinx-core/recipes-graphics/mesa/files/0001-DRI_Add_xlnx_dri.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-DRI: Add xlnx dri
-
-Add the Xilinx dri target
-
-Upstream-Status: Pending
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-
-Index: mesa-24.0.1/src/gallium/targets/dri/meson.build
-===================================================================
---- mesa-24.0.1.orig/src/gallium/targets/dri/meson.build
-+++ mesa-24.0.1/src/gallium/targets/dri/meson.build
-@@ -101,6 +101,7 @@ foreach d : [[with_gallium_kmsro, [
-                'stm_dri.so',
-                'sun4i-drm_dri.so',
-                'udl_dri.so',
-+               'xlnx_dri.so',
-              ]],
-              [with_gallium_radeonsi, 'radeonsi_dri.so'],
-              [with_gallium_nouveau, 'nouveau_dri.so'],
-Index: mesa-24.0.1/src/gallium/targets/dri/target.c
-===================================================================
---- mesa-24.0.1.orig/src/gallium/targets/dri/target.c
-+++ mesa-24.0.1/src/gallium/targets/dri/target.c
-@@ -129,6 +129,7 @@ DEFINE_LOADER_DRM_ENTRYPOINT(sti)
- DEFINE_LOADER_DRM_ENTRYPOINT(stm)
- DEFINE_LOADER_DRM_ENTRYPOINT(sun4i_drm)
- DEFINE_LOADER_DRM_ENTRYPOINT(udl)
-+DEFINE_LOADER_DRM_ENTRYPOINT(xlnx)
- #endif
- 
- #if defined(GALLIUM_LIMA)
diff --git a/meta-xilinx-core/recipes-graphics/mesa/mesa-demos/0001-src-egl-eglinfo-Align-EXT_platform_device-extension-.patch b/meta-xilinx-core/recipes-graphics/mesa/mesa-demos/0001-src-egl-eglinfo-Align-EXT_platform_device-extension-.patch
deleted file mode 100644
index fdb30564..00000000
--- a/meta-xilinx-core/recipes-graphics/mesa/mesa-demos/0001-src-egl-eglinfo-Align-EXT_platform_device-extension-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9470d00850e8b622d963d4d9c61ad1e59972310a Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Tue, 28 Jan 2020 16:10:54 -0800
-Subject: [PATCH 1/2] src: egl: eglinfo: Align EXT_platform_device extension
- macros with khronos
-
-Although the macro definitions are consistent, using the macros name
-defined under khronos makes it backward compatible with older eglext.h
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Upstream-Status: Inappropriate [Xilinx specific]
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- src/egl/opengl/eglinfo.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/egl/opengl/eglinfo.c b/src/egl/opengl/eglinfo.c
-index 72fe45a..e8a0225 100644
---- a/src/egl/opengl/eglinfo.c
-+++ b/src/egl/opengl/eglinfo.c
-@@ -305,17 +305,17 @@ main(int argc, char *argv[])
-                                                   NULL), "Android platform");
-        if (strstr(clientext, "EGL_MESA_platform_gbm") ||
-            strstr(clientext, "EGL_KHR_platform_gbm"))
--           ret += doOneDisplay(getPlatformDisplay(EGL_PLATFORM_GBM_MESA,
-+           ret += doOneDisplay(getPlatformDisplay(EGL_PLATFORM_GBM_KHR,
-                                                   EGL_DEFAULT_DISPLAY,
-                                                   NULL), "GBM platform");
-        if (strstr(clientext, "EGL_EXT_platform_wayland") ||
-            strstr(clientext, "EGL_KHR_platform_wayland"))
--           ret += doOneDisplay(getPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT,
-+           ret += doOneDisplay(getPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR,
-                                                   EGL_DEFAULT_DISPLAY,
-                                                   NULL), "Wayland platform");
-        if (strstr(clientext, "EGL_EXT_platform_x11") ||
-            strstr(clientext, "EGL_KHR_platform_x11"))
--           ret += doOneDisplay(getPlatformDisplay(EGL_PLATFORM_X11_EXT,
-+           ret += doOneDisplay(getPlatformDisplay(EGL_PLATFORM_X11_KHR,
-                                                   EGL_DEFAULT_DISPLAY,
-                                                   NULL), "X11 platform");
-        if (strstr(clientext, "EGL_MESA_platform_surfaceless"))
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-graphics/mesa/mesa-demos/0002-src-egl-eglinfo-Use-EGL_PLATFORM_DEVICE_EXT-only-if-.patch b/meta-xilinx-core/recipes-graphics/mesa/mesa-demos/0002-src-egl-eglinfo-Use-EGL_PLATFORM_DEVICE_EXT-only-if-.patch
deleted file mode 100644
index 7212ef27..00000000
--- a/meta-xilinx-core/recipes-graphics/mesa/mesa-demos/0002-src-egl-eglinfo-Use-EGL_PLATFORM_DEVICE_EXT-only-if-.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 040b0b79a8e73a3348ab2e95f817636a7d479f18 Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Tue, 28 Jan 2020 16:17:46 -0800
-Subject: [PATCH 2/2] src: egl: eglinfo: Use EGL_PLATFORM_DEVICE_EXT only if
- the EGL provider supports it
-
-Compiling against the other EGL provider like mali fails, as they dont
-support this macro as one of thier supported platforms
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Upstream-Status: Inappropriate [Xilinx specific]
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- src/egl/opengl/eglinfo.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/egl/opengl/eglinfo.c b/src/egl/opengl/eglinfo.c
-index e8a0225..bc0e869 100644
---- a/src/egl/opengl/eglinfo.c
-+++ b/src/egl/opengl/eglinfo.c
-@@ -243,6 +243,7 @@ doOneDisplay(EGLDisplay d, const char *name)
- static int
- doOneDevice(EGLDeviceEXT d, int i)
- {
-+#ifdef EGL_PLATFORM_DEVICE_EXT
-    PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplay =
-      (PFNEGLGETPLATFORMDISPLAYEXTPROC)
-      eglGetProcAddress("eglGetPlatformDisplayEXT");
-@@ -253,6 +254,9 @@ doOneDevice(EGLDeviceEXT d, int i)
- 
-    return doOneDisplay(getPlatformDisplay(EGL_PLATFORM_DEVICE_EXT, d, NULL),
-                        "Platform Device");
-+#else
-+   return 0;
-+#endif
- }
- 
- 
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-graphics/mesa/mesa-demos/libmali-egl-workaround.patch b/meta-xilinx-core/recipes-graphics/mesa/mesa-demos/libmali-egl-workaround.patch
deleted file mode 100644
index 6cfecb38..00000000
--- a/meta-xilinx-core/recipes-graphics/mesa/mesa-demos/libmali-egl-workaround.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Inappropriate [libmali specific]
-
-Index: mesa-demos-8.5.0/src/egl/opengl/eglinfo.c
-===================================================================
---- mesa-demos-8.5.0.orig/src/egl/opengl/eglinfo.c
-+++ mesa-demos-8.5.0/src/egl/opengl/eglinfo.c
-@@ -195,6 +195,7 @@ PrintDisplayExtensions(EGLDisplay d)
- }
- 
- 
-+#ifdef EGL_EXT_device_base
- static const char *
- PrintDeviceExtensions(EGLDeviceEXT d)
- {
-@@ -211,7 +212,7 @@ PrintDeviceExtensions(EGLDeviceEXT d)
- 
-    return PrintExtensions(extensions);
- }
--
-+#endif
- 
- static int
- doOneDisplay(EGLDisplay d, const char *name)
-@@ -240,6 +241,7 @@ doOneDisplay(EGLDisplay d, const char *n
- }
- 
- 
-+#ifdef EGL_EXT_device_base
- static int
- doOneDevice(EGLDeviceEXT d, int i)
- {
-@@ -258,8 +260,9 @@ doOneDevice(EGLDeviceEXT d, int i)
-    return 0;
- #endif
- }
-+#endif
- 
--
-+#ifdef EGL_EXT_device_base
- static int
- doDevices(const char *name)
- {
-@@ -288,7 +291,7 @@ doDevices(const char *name)
- 
-    return ret;
- }
--
-+#endif
- 
- int
- main(int argc, char *argv[])
-@@ -322,13 +325,17 @@ main(int argc, char *argv[])
-            ret += doOneDisplay(getPlatformDisplay(EGL_PLATFORM_X11_KHR,
-                                                   EGL_DEFAULT_DISPLAY,
-                                                   NULL), "X11 platform");
-+#ifdef EGL_PLATFORM_SURFACELESS_MESA
-        if (strstr(clientext, "EGL_MESA_platform_surfaceless"))
-            ret += doOneDisplay(getPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA,
-                                                   EGL_DEFAULT_DISPLAY,
-                                                   NULL), "Surfaceless platform");
-+#endif
-+#ifdef EGL_EXT_device_base
-        if (strstr(clientext, "EGL_EXT_device_enumeration") &&
-            strstr(clientext, "EGL_EXT_platform_device"))
-            ret += doDevices("Device platform");
-+#endif
-    }
-    else {
-       ret = doOneDisplay(eglGetDisplay(EGL_DEFAULT_DISPLAY), "Default display");
diff --git a/meta-xilinx-core/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-xilinx-core/recipes-graphics/mesa/mesa-demos_%.bbappend
deleted file mode 100644
index 5c84f56e..00000000
--- a/meta-xilinx-core/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/mesa-demos:"
-
-SRC_URI += " \
-    file://0001-src-egl-eglinfo-Align-EXT_platform_device-extension-.patch \
-    file://0002-src-egl-eglinfo-Use-EGL_PLATFORM_DEVICE_EXT-only-if-.patch \
-    file://libmali-egl-workaround.patch \
-"
-
-DEPENDS += "wayland-protocols"
-
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
diff --git a/meta-xilinx-core/recipes-graphics/mesa/mesa-gl_%.bbappend b/meta-xilinx-core/recipes-graphics/mesa/mesa-gl_%.bbappend
deleted file mode 100644
index a8e18a57..00000000
--- a/meta-xilinx-core/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-PACKAGECONFIG:append = " dri3 gallium"
-
-# If we're using libmali-xlnx, then we need to bring it in for the KHR/khrplatform.h file
-DEPENDS .= "${@' libmali-xlnx' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else ''}"
-RDEPENDS:libgl-mesa-dev .= "${@' libmali-xlnx-dev' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else ''}"
-
-do_install:append () {
-    if ${@'true' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else 'false'} ; then
-        rm -rf ${D}${includedir}/KHR/*
-    fi
-}
-
-# If we require libmali-xlnx, this becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${MACHINE_ARCH}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@'${MALI_PACKAGE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
diff --git a/meta-xilinx-core/recipes-graphics/mesa/mesa_%.bbappend b/meta-xilinx-core/recipes-graphics/mesa/mesa_%.bbappend
deleted file mode 100644
index 86183f54..00000000
--- a/meta-xilinx-core/recipes-graphics/mesa/mesa_%.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI:append:class-target = " file://0001-DRI_Add_xlnx_dri.patch"
-
-# This is not compatible with the mali400 driver, use mesa-gl instead
-CONFLICT_DISTRO_FEATURES:class-target = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', bb.utils.contains('DISTRO_FEATURES', 'libmali', 'libmali', '', d), '', d)}"
-
-# Enable lima if not using libmali
-PACKAGECONFIG_MALI = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '', 'lima', d)}"
-PACKAGECONFIG:append:class-target = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${PACKAGECONFIG_MALI}', '', d)}"
-
-PACKAGE_ARCH_DEFAULT := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${MACHINE_ARCH}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${MALI_PACKAGE_ARCH}', '${PACKAGE_ARCH_DEFAULT}', d)}"
diff --git a/meta-xilinx-core/recipes-graphics/virglrenderer/virglrenderer_%.bbappend b/meta-xilinx-core/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
deleted file mode 100644
index 03823f6e..00000000
--- a/meta-xilinx-core/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch b/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
deleted file mode 100644
index de1f3719..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3fbb596e53524e78703b76c4fdc33cd6ac62f777 Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Fri, 11 Dec 2020 16:21:38 -0800
-Subject: [PATCH] libweston: Remove substitute format for ARGB8888
-
-Xilinx DP gfx layer does not support XRGB8888. Hence, remove the same
-as opaque substitute.
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Upstream-Status: Inappropriate [Xilinx specific]
-
-Reworked the patch for the newer weston
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- libweston/pixel-formats.c | 1 -
- 1 file changed, 1 deletion(-)
-
-Index: weston-13.0.0/libweston/pixel-formats.c
-===================================================================
---- weston-13.0.0.orig/libweston/pixel-formats.c
-+++ weston-13.0.0/libweston/pixel-formats.c
-@@ -251,7 +251,6 @@ static const struct pixel_format_info pi
-        {
-                DRM_FORMAT(ARGB8888),
-                BITS_RGBA_FIXED(8, 8, 8, 8),
--               .opaque_substitute = DRM_FORMAT_XRGB8888,
-                .addfb_legacy_depth = 32,
-                .bpp = 32,
-                GL_INTERNALFORMAT(GL_RGBA8),
diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/9.0.0/0001-libweston-Remove-substitute-format-for-ARGB8888.patch b/meta-xilinx-core/recipes-graphics/wayland/files/9.0.0/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
deleted file mode 100644
index 6b5f53b0..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/files/9.0.0/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3fbb596e53524e78703b76c4fdc33cd6ac62f777 Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Fri, 11 Dec 2020 16:21:38 -0800
-Subject: [PATCH] libweston: Remove substitute format for ARGB8888
-
-Xilinx DP gfx layer does not support XRGB8888. Hence, remove the same
-as opaque substitute.
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Upstream-Status: Inappropriate [Xilinx specific]
----
- libweston/pixel-formats.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/libweston/pixel-formats.c b/libweston/pixel-formats.c
-index 79dc709..ec2d3b7 100644
---- a/libweston/pixel-formats.c
-+++ b/libweston/pixel-formats.c
-@@ -193,7 +193,6 @@ static const struct pixel_format_info pixel_format_table[] = {
-        {
-                DRM_FORMAT(ARGB8888),
-                BITS_RGBA_FIXED(8, 8, 8, 8),
--               .opaque_substitute = DRM_FORMAT_XRGB8888,
-                .depth = 32,
-                .bpp = 32,
-                GL_FORMAT(GL_BGRA_EXT),
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/init b/meta-xilinx-core/recipes-graphics/wayland/files/init
deleted file mode 100644
index f74ac8b1..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/files/init
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides: weston
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-### END INIT INFO
-
-if test -e /etc/default/weston ; then
-        . /etc/default/weston
-fi
-
-killproc() {
-        pid=`/bin/pidof $1`
-        [ "$pid" != "" ] && kill $pid
-}
-
-read CMDLINE < /proc/cmdline
-for x in $CMDLINE; do
-        case $x in
-        weston=false)
-                echo "Weston disabled"
-                exit 0;
-                ;;
-        esac
-done
-
-case "$1" in
-  start)
-        . /etc/profile
-        export HOME=ROOTHOME
-
-        weston-start -- --continue-without-input $OPTARGS
-  ;;
-
-  stop)
-        echo "Stopping Weston"
-        killproc weston
-  ;;
-
-  restart)
-        $0 stop
-        sleep 1
-        $0 start
-  ;;
-
-  *)
-        echo "usage: $0 { start | stop | restart }"
-  ;;
-esac
-
-exit 0
diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/weston.service b/meta-xilinx-core/recipes-graphics/wayland/files/weston.service
deleted file mode 100644
index c7583e92..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/files/weston.service
+++ /dev/null
@@ -1,71 +0,0 @@
-# This is a system unit for launching Weston with auto-login as the
-# user configured here.
-#
-# Weston must be built with systemd support, and your weston.ini must load
-# the plugin systemd-notify.so.
-[Unit]
-Description=Weston, a Wayland compositor, as a system service
-Documentation=man:weston(1) man:weston.ini(5)
-Documentation=http://wayland.freedesktop.org/
-
-# Make sure we are started after logins are permitted.
-Requires=systemd-user-sessions.service
-After=systemd-user-sessions.service
-
-# If Plymouth is used, we want to start when it is on its way out.
-After=plymouth-quit-wait.service
-
-# D-Bus is necessary for contacting logind. Logind is required.
-Wants=dbus.socket
-After=dbus.socket
-
-# Ensure the socket is present
-Requires=weston.socket
-
-# Since we are part of the graphical session, make sure we are started before
-# it is complete.
-Before=graphical.target
-
-# Prevent starting on systems without virtual consoles, Weston requires one
-# for now.
-ConditionPathExists=/dev/tty0
-
-[Service]
-# Requires systemd-notify.so Weston plugin.
-Type=notify
-EnvironmentFile=/etc/default/weston
-ExecStart=/usr/bin/weston --continue-without-input --modules=systemd-notify.so
-
-# Optional watchdog setup
-TimeoutStartSec=60
-WatchdogSec=20
-
-# The user to run Weston as.
-User=weston
-Group=weston
-
-# Make sure the working directory is the users home directory
-WorkingDirectory=/home/weston
-
-# Set up a full user session for the user, required by Weston.
-PAMName=weston-autologin
-
-# A virtual terminal is needed.
-TTYPath=/dev/tty7
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-
-# Fail to start if not controlling the tty.
-StandardInput=tty-fail
-StandardOutput=journal
-StandardError=journal
-
-# Log this user with utmp, letting it show up with commands 'w' and 'who'.
-UtmpIdentifier=tty7
-UtmpMode=user
-
-[Install]
-# Note: If you only want weston to start on-demand, remove this line with a
-# service drop file
-WantedBy=graphical.target
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston-init.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston-init.bbappend
deleted file mode 100644
index f0d64e27..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston-init.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-PACKAGECONFIG += "no-idle-timeout"
-
-do_install:append:zynqmp() {
-        sed -i -e "/^\[core\]/a gbm-format=rgb565" ${D}${sysconfdir}/xdg/weston/weston.ini
-}
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston.inc b/meta-xilinx-core/recipes-graphics/wayland/weston.inc
deleted file mode 100644
index fadc9486..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SRC_URI:append:zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch"
-
-# Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific
-SOC_FAMILY_ARCH ??= "${TUNE_PKGARCH}"
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-DEFAULT_PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}"
-PACKAGE_ARCH = "${DEFAULT_PACKAGE_ARCH}"
-
-
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
deleted file mode 100644
index f8f75894..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c8bfa1f8d576cdc6d515dbbac36c48c6166be0d5 Mon Sep 17 00:00:00 2001
-From: Marius Vlad <marius.vlad@collabora.com>
-Date: Thu, 1 Apr 2021 00:12:00 +0300
-Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at DRM-backend tear down
-
-Tearing down the drm-backend when there are no input devices, would call
-for the gbm device destruction before compositor shutdown. The latter
-would call into the renderer detroy function and assume that the
-EGLDisplay, which was created using the before-mentioned gbm device, is
-still available. This patch re-orders the gbm destruction after the
-compositor shutdown when no one would make use of it.
-
-Fixes: #314
-
-Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
-Suggested-by: Daniel Stone <daniel.stone@collabora.com>
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commit/d171c7b3ba346c4d0bd6494f45ebf0be3c3cc5fb]
----
- libweston/backend-drm/drm.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
-index 2780f3b..fbcfeca 100644
---- a/libweston/backend-drm/drm.c
-+++ b/libweston/backend-drm/drm.c
-@@ -3025,10 +3025,6 @@ err_drm_source:
- err_udev_input:
-        udev_input_destroy(&b->input);
- err_sprite:
--#ifdef BUILD_DRM_GBM
--       if (b->gbm)
--               gbm_device_destroy(b->gbm);
--#endif
-        destroy_sprites(b);
- err_udev_dev:
-        udev_device_unref(drm_device);
-@@ -3038,6 +3034,10 @@ err_launcher:
-        weston_launcher_destroy(compositor->launcher);
- err_compositor:
-        weston_compositor_shutdown(compositor);
-+#ifdef BUILD_DRM_GBM
-+       if (b->gbm)
-+               gbm_device_destroy(b->gbm);
-+#endif
-        free(b);
-        return NULL;
- }
---
-2.33.0
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch
deleted file mode 100644
index 06e0f7ba..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a2ba4714a6872e547621d29d9ddcb0f374b88cf6 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Tue, 20 Apr 2021 20:42:18 -0700
-Subject: [PATCH] meson.build: fix incorrect header
-
-The wayland.c actually include 'xdg-shell-client-protocol.h' instead of
-the server one, so fix it. Otherwise, it's possible to get build failure
-due to race condition.
-
-Upstream-Status: Pending
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- libweston/backend-wayland/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libweston/backend-wayland/meson.build b/libweston/backend-wayland/meson.build
-index 7e82513..29270b5 100644
---- a/libweston/backend-wayland/meson.build
-+++ b/libweston/backend-wayland/meson.build
-@@ -10,7 +10,7 @@ srcs_wlwl = [
-        fullscreen_shell_unstable_v1_protocol_c,
-        presentation_time_protocol_c,
-        presentation_time_server_protocol_h,
--       xdg_shell_server_protocol_h,
-+       xdg_shell_client_protocol_h,
-        xdg_shell_protocol_c,
- ]
- 
--- 
-2.30.2
-
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch
deleted file mode 100644
index 6fe86ff3..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 58760e09eed662a72da939ff4802d605489cff8e Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Tue, 8 Sep 2020 19:37:42 -0400
-Subject: [PATCH] tests: include fcntl.h for open(), O_RDWR, O_CLOEXEC and
- O_CREAT
-
-musl libc (unlike glibc) requires explicitly incuding fcntl.h to define open(),
-O_RDWR, O_CLOEXEC and O_CREAT. Otherwise the build fails with the errors:
-
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c: In function 'wait_for_lock':
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:7: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration]
-|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
-|       |       ^~~~
-|       |       popen
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: error: 'O_RDWR' undeclared (first use in this function)
-|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
-|       |                       ^~~~~~
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: note: each undeclared identifier is reported only once for each function it appears in
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:32: error: 'O_CLOEXEC' undeclared (first use in this function)
-|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
-|       |                                ^~~~~~~~~
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:44: error: 'O_CREAT' undeclared (first use in this function)
-|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
-|       |                                            ^~~~~~~
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/493/diffs?commit_id=b10c0e843dcb8148bbe869bb15261955b94ac98c]
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- tests/weston-test-fixture-compositor.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c
-index 0c9855f..e0e32c9 100644
---- a/tests/weston-test-fixture-compositor.c
-+++ b/tests/weston-test-fixture-compositor.c
-@@ -31,6 +31,7 @@
- #include <unistd.h>
- #include <sys/file.h>
- #include <errno.h>
-+#include <fcntl.h>
- 
- #include "shared/helpers.h"
- #include "weston-test-fixture-compositor.h"
--- 
-2.7.4
-
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta-xilinx-core/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
deleted file mode 100644
index f6ebfd8f..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From a1548c742bf2dedbb47282d8a00407b60bbab669 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Wed, 22 Feb 2017 15:53:30 +0200
-Subject: [PATCH] weston-launch: Provide a default version that doesn't require
-
- PAM
-
-weston-launch requires PAM for starting weston as a non-root user.
-
-Since starting weston as root is a valid use case by itself, if
-PAM is not available, provide a default version of weston-launch
-without non-root-user support.
-
-Upstream-Status: Denied [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/725]
-
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-Signed-off-by: Ming Liu <ming.liu@toradex.com>
-
----
- libweston/meson.build     | 16 ++++++++++++----
- libweston/weston-launch.c | 21 +++++++++++++++++++++
- meson_options.txt         |  7 +++++++
- 3 files changed, 40 insertions(+), 4 deletions(-)
-
-diff --git a/libweston/meson.build b/libweston/meson.build
-index 08d23ec..cb9fd3f 100644
---- a/libweston/meson.build
-+++ b/libweston/meson.build
-@@ -216,16 +216,24 @@ dep_vertex_clipping = declare_dependency(
- )
- 
- if get_option('weston-launch')
--       dep_pam = cc.find_library('pam')
-+       deps_weston_launch = [systemd_dep, dep_libdrm]
- 
--       if not cc.has_function('pam_open_session', dependencies: dep_pam)
--               error('pam_open_session not found for weston-launch')
-+       if get_option('pam')
-+               dep_pam = cc.find_library('pam')
-+               if not cc.has_function('pam_open_session', dependencies: dep_pam)
-+                       error('pam_open_session not found for weston-launch')
-+               endif
-+
-+               if dep_pam.found()
-+                       deps_weston_launch += dep_pam
-+                       config_h.set('HAVE_PAM', '1')
-+               endif
-        endif
- 
-        executable(
-                'weston-launch',
-                'weston-launch.c',
--               dependencies: [dep_pam, systemd_dep, dep_libdrm],
-+               dependencies: deps_weston_launch,
-                include_directories: common_inc,
-                install: true
-        )
-diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index 521cb2c..2d42d33 100644
---- a/libweston/weston-launch.c
-+++ b/libweston/weston-launch.c
-@@ -51,7 +51,9 @@
- 
- #include <pwd.h>
- #include <grp.h>
-+#ifdef HAVE_PAM
- #include <security/pam_appl.h>
-+#endif
- 
- #ifdef HAVE_SYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-@@ -100,8 +102,10 @@ drmSetMaster(int drm_fd)
- #endif
- 
- struct weston_launch {
-+#ifdef HAVE_PAM
-        struct pam_conv pc;
-        pam_handle_t *ph;
-+#endif
-        int tty;
-        int ttynr;
-        int sock[2];
-@@ -192,6 +196,7 @@ weston_launch_allowed(struct weston_launch *wl)
-        return false;
- }
- 
-+#ifdef HAVE_PAM
- static int
- pam_conversation_fn(int msg_count,
-                    const struct pam_message **messages,
-@@ -232,6 +237,7 @@ setup_pam(struct weston_launch *wl)
- 
-        return 0;
- }
-+#endif
- 
- static int
- setup_launcher_socket(struct weston_launch *wl)
-@@ -466,6 +472,7 @@ quit(struct weston_launch *wl, int status)
-        close(wl->signalfd);
-        close(wl->sock[0]);
- 
-+#ifdef HAVE_PAM
-        if (wl->new_user) {
-                err = pam_close_session(wl->ph, 0);
-                if (err)
-@@ -473,6 +480,7 @@ quit(struct weston_launch *wl, int status)
-                                err, pam_strerror(wl->ph, err));
-                pam_end(wl->ph, err);
-        }
-+#endif
- 
-        /*
-         * Get a fresh handle to the tty as the previous one is in
-@@ -710,6 +718,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
-        setenv("HOME", wl->pw->pw_dir, 1);
-        setenv("SHELL", wl->pw->pw_shell, 1);
- 
-+#ifdef HAVE_PAM
-        env = pam_getenvlist(wl->ph);
-        if (env) {
-                for (i = 0; env[i]; ++i) {
-@@ -718,6 +727,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
-                }
-                free(env);
-        }
-+#endif
- 
-        /*
-         * We open a new session, so it makes sense
-@@ -789,8 +799,10 @@ static void
- help(const char *name)
- {
-        fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
-+#ifdef HAVE_PAM
-        fprintf(stderr, "  -u, --user      Start session as specified username,\n"
-                        "                  e.g. -u joe, requires root.\n");
-+#endif
-        fprintf(stderr, "  -t, --tty       Start session on alternative tty,\n"
-                        "                  e.g. -t /dev/tty4, requires -u option.\n");
-        fprintf(stderr, "  -v, --verbose   Be verbose\n");
-@@ -804,7 +816,9 @@ main(int argc, char *argv[])
-        int i, c;
-        char *tty = NULL;
-        struct option opts[] = {
-+#ifdef HAVE_PAM
-                { "user",    required_argument, NULL, 'u' },
-+#endif
-                { "tty",     required_argument, NULL, 't' },
-                { "verbose", no_argument,       NULL, 'v' },
-                { "help",    no_argument,       NULL, 'h' },
-@@ -816,11 +830,16 @@ main(int argc, char *argv[])
-        while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
-                switch (c) {
-                case 'u':
-+#ifdef HAVE_PAM
-                        wl.new_user = optarg;
-                        if (getuid() != 0) {
-                                fprintf(stderr, "weston: Permission denied. -u allowed for root only\n");
-                                exit(EXIT_FAILURE);
-                        }
-+#else
-+                       fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n");
-+                       exit(EXIT_FAILURE);
-+#endif
-                        break;
-                case 't':
-                        tty = optarg;
-@@ -872,8 +891,10 @@ main(int argc, char *argv[])
-        if (setup_tty(&wl, tty) < 0)
-                exit(EXIT_FAILURE);
- 
-+#ifdef HAVE_PAM
-        if (wl.new_user && setup_pam(&wl) < 0)
-                exit(EXIT_FAILURE);
-+#endif
- 
-        if (setup_launcher_socket(&wl) < 0)
-                exit(EXIT_FAILURE);
-diff --git a/meson_options.txt b/meson_options.txt
-index 239bd2d..99e4ec3 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -73,6 +73,13 @@ option(
- )
- 
- option(
-+       'pam',
-+       type: 'boolean',
-+       value: true,
-+       description: 'Define if PAM is available'
-+)
-+
-+option(
-        'xwayland',
-        type: 'boolean',
-        value: true,
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/meta-xilinx-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
deleted file mode 100644
index a4444e5d..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix atomic modesetting with musl
-
-atomic modesetting seems to fail with drm weston backend and this patch fixes
-it, below errors are seen before weston exits
-
-atomic: couldn't commit new state: Invalid argument
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---- a/libweston/backend-drm/kms.c
-+++ b/libweston/backend-drm/kms.c
-@@ -1168,8 +1168,8 @@ drm_pending_state_apply_atomic(struct dr
-                wl_list_for_each(plane, &b->plane_list, link) {
-                        drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n",
-                                  (unsigned long) plane->plane_id);
--                       plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
--                       plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
-+                       //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
-+                       //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
-                }
- 
-                flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/systemd-notify.weston-start b/meta-xilinx-core/recipes-graphics/wayland/weston/systemd-notify.weston-start
deleted file mode 100644
index a97e7b38..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston/systemd-notify.weston-start
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-  
-# SPDX-FileCopyrightText: Huawei Inc.
-# SPDX-License-Identifier: Apache-2.0
-
-
-if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then
-        add_weston_module "systemd-notify.so"
-fi
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/weston.desktop b/meta-xilinx-core/recipes-graphics/wayland/weston/weston.desktop
deleted file mode 100644
index 1086ae8b..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston/weston.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Weston
-Comment=Wayland Compostitor
-Exec=weston
-Icon=weston
-Terminal=false
-Categories=Utility;
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/weston.png b/meta-xilinx-core/recipes-graphics/wayland/weston/weston.png
deleted file mode 100644
index ea8b7e0e..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston/weston.png
+++ /dev/null
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston/xwayland.weston-start b/meta-xilinx-core/recipes-graphics/wayland/weston/xwayland.weston-start
deleted file mode 100644
index db384b1a..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston/xwayland.weston-start
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if type Xwayland  >/dev/null 2>/dev/null; then
-        mkdir -p /tmp/.X11-unix
-fi
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_13.%.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_13.%.bbappend
deleted file mode 100644
index 3ee9cafa..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston_13.%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:"
-
-require weston.inc
-
-ZYNQMP_WARN_DEFAULT = "0"
-ZYNQMP_WARN_DEFAULT:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '1', '0', d)}"
-ZYNQMP_WARN = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${ZYNQMP_WARN_DEFAULT}', '0', d)}"
-
-python() {
-    if d.getVar('ZYNQMP_WARN') == "1":
-        raise bb.parse.SkipRecipe("Weston %s requires GLES 3 interfaces which are not available when libmali enabled.  Use Weston 9.0.0.0 instead." % (d.getVar('PV')))
-}
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bb b/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bb
deleted file mode 100644
index a534b1b7..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bb
+++ /dev/null
@@ -1,148 +0,0 @@
-SUMMARY = "Weston, a Wayland compositor"
-DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
-HOMEPAGE = "http://wayland.freedesktop.org"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
-                    file://libweston/compositor.c;endline=27;md5=6c53bbbd99273f4f7c4affa855c33c0a"
-
-# We want this version to be "newer" then 10, only if libmali and mali400 are both enabled
-ORIG_PE := "${PE}"
-MALI_PE = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '1', '${ORIG_PE}', d)}"
-PE = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${MALI_PE}', '${ORIG_PE}', d)}"
-
-SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
-           file://weston.png \
-           file://weston.desktop \
-           file://xwayland.weston-start \
-           file://systemd-notify.weston-start \
-           file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
-           file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \
-           file://0001-meson.build-fix-incorrect-header.patch \
-           file://0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch \
-"
-
-SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch "
-
-SRC_URI[sha256sum] = "5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe"
-
-UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
-
-inherit meson pkgconfig useradd features_check
-# depends on virtual/egl
-# weston-init requires pam enabled if started via systemd
-REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}"
-
-DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
-DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
-
-LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
-
-WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
-
-EXTRA_OEMESON += "-Dbackend-default=auto -Dpipewire=false"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
-                   ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \
-                   ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \
-                   launch \
-                   image-jpeg \
-                   screenshare \
-                   shell-desktop \
-                   shell-fullscreen \
-                   shell-ivi"
-
-#
-# Compositor choices
-#
-# Weston on KMS
-PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev"
-# Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2"
-# Weston on X11
-PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo"
-# Headless Weston
-PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false"
-# Weston on framebuffer
-PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev"
-# Weston on RDP
-PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp"
-# weston-launch
-PACKAGECONFIG[launch] = "-Dweston-launch=true,-Dweston-launch=false,drm"
-# VA-API desktop recorder
-PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva"
-# Weston with EGL support
-PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl"
-# Weston with lcms support
-PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms"
-# Weston with webp support
-PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
-# Weston with systemd-login support
-PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus"
-# Weston with Xwayland support (requires X11 and Wayland)
-PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false"
-# colord CMS support
-PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord"
-# Clients support
-PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
-# Virtual remote output with GStreamer on DRM backend
-PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base"
-# Weston with PAM support
-PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam"
-# Weston with screen-share support
-PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false"
-# Traditional desktop shell
-PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false"
-# Fullscreen shell
-PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false"
-# In-Vehicle Infotainment (IVI) shell
-PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false"
-# JPEG image loading support
-PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg"
-
-do_install:append() {
-        # Weston doesn't need the .la files to load modules, so wipe them
-        rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
-
-        # If X11, ship a desktop file to launch it
-        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
-                install -d ${D}${datadir}/applications
-                install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
-
-                install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
-        fi
-
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
-        fi
-
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
-        fi
-
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
-                chmod u+s ${D}${bindir}/weston-launch
-        fi
-}
-
-PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
-             libweston-${WESTON_MAJOR_VERSION} ${PN}-examples"
-
-FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so"
-FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}"
-
-FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so"
-SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'."
-
-FILES:${PN}-examples = "${bindir}/*"
-
-FILES:${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so"
-RDEPENDS:${PN}-xwayland += "xwayland"
-
-RDEPENDS:${PN} += "xkeyboard-config"
-RRECOMMENDS:${PN} = "weston-init liberation-fonts"
-RRECOMMENDS:${PN}-dev += "wayland-protocols"
-
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM:${PN} = "--system weston-launch"
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bbappend
deleted file mode 100644
index 80512ac3..00000000
--- a/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files/9.0.0:${THISDIR}/files:"
-
-require weston.inc
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 460ff581..9431a7be 100644
--- a/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -1,23 +1,17 @@
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
-
 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() {
     install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/monitor-hotplug.sh ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/monitor-hotplug.sh ${D}${bindir}
 
     install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-monitor-hotplug.rules ${D}${sysconfdir}/udev/rules.d/99-monitor-hotplug.rules
+    install -m 0644 ${UNPACKDIR}/99-monitor-hotplug.rules ${D}${sysconfdir}/udev/rules.d/99-monitor-hotplug.rules
 }
 
 FILES:${PN} += "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-graphics/xwayland/xwayland_%.bbappend b/meta-xilinx-core/recipes-graphics/xwayland/xwayland_%.bbappend
deleted file mode 100644
index c1005f11..00000000
--- a/meta-xilinx-core/recipes-graphics/xwayland/xwayland_%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
-
diff --git a/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch b/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch
new file mode 100644
index 00000000..dde59936
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch
@@ -0,0 +1,343 @@
+From adc957ce85d431da42dc42ed4074322d6c94932f Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Thu, 16 May 2024 20:31:29 -0600
+Subject: [PATCH] Support both pre 6.4.0 and current i2c probing
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ dp/xfmc/dp141.c                          | 13 +++++++++++++
+ dp/xfmc/fmc.c                            | 13 +++++++++++++
+ dp/xfmc/fmc64.c                          | 14 ++++++++++++++
+ dp/xfmc/fmc65.c                          | 13 +++++++++++++
+ dp/xfmc/idt.c                            | 21 +++++++++++++++++----
+ dp/xfmc/mcdp6000.c                       | 13 +++++++++++++
+ dp/xfmc/tipower.c                        | 13 +++++++++++++
+ 7 files changed, 96 insertions(+), 4 deletions(-)
+
+diff --git a/dp/xfmc/dp141.c b/dp/xfmc/dp141.c
+index dfdb6f4..5fddd2b
+--- a/dp/xfmc/dp141.c
++++ b/dp/xfmc/dp141.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -105,7 +106,12 @@ static const struct i2c_device_id dp141_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, dp141_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int dp141_probe(struct i2c_client *client)
++#else
++static int dp141_probe(struct i2c_client *client,
++                        const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -134,9 +140,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void dp141_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int dp141_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver dp141_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/fmc.c b/dp/xfmc/fmc.c
+index 3447785..2ed136c
+--- a/dp/xfmc/fmc.c
++++ b/dp/xfmc/fmc.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -93,7 +94,12 @@ static const struct i2c_device_id fmc_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc_probe(struct i2c_client *client)
++#else
++static int fmc_probe(struct i2c_client *client,
++                    const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -121,9 +127,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void fmc_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int fmc_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver fmc_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/fmc64.c b/dp/xfmc/fmc64.c
+index 6f5562c..a0bad7a
+--- a/dp/xfmc/fmc64.c
++++ b/dp/xfmc/fmc64.c
+@@ -14,6 +14,8 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
++
+ /**************************** Type Definitions *******************************/
+ static const struct regmap_config fmc64_regmap_config = {
+        .reg_bits = 16,
+@@ -89,7 +91,12 @@ static const struct i2c_device_id fmc64_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc64_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc64_probe(struct i2c_client *client)
++#else
++static int fmc64_probe(struct i2c_client *client,
++                      const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -118,9 +125,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void fmc64_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int fmc64_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver fmc64_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/fmc65.c b/dp/xfmc/fmc65.c
+index 9f091f9..ce7f884
+--- a/dp/xfmc/fmc65.c
++++ b/dp/xfmc/fmc65.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -91,7 +92,12 @@ static const struct i2c_device_id fmc65_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc65_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc65_probe(struct i2c_client *client)
++#else
++static int fmc65_probe(struct i2c_client *client,
++                      const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -120,9 +126,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void fmc65_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int fmc65_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver fmc65_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/idt.c b/dp/xfmc/idt.c
+index 348c863..f332277
+--- a/dp/xfmc/idt.c
++++ b/dp/xfmc/idt.c
+@@ -17,6 +17,7 @@
+ #include <linux/of_gpio.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ #define IDT_8T49N24X_REVID 0x0    /**< Device Revision */
+ #define IDT_8T49N24X_DEVID 0x0607 /**< Device ID Code */
+@@ -38,8 +39,8 @@
+ #define IDT_8T49N24X_P_MAX pow(2, 22)  //!< Maximum P divider value
+ #define IDT_8T49N24X_M_MAX pow(2, 24)  //!< Maximum M multiplier value
+ 
+-#define TRUE 1
+-#define FALSE 0
++#define IDT_TRUE 1
++#define IDT_FALSE 0
+ #define XPAR_IIC_0_BASEADDR 0xA0080000
+ #define I2C_IDT8N49_ADDR 0x7C
+ /*
+@@ -455,7 +456,7 @@ int IDT_8T49N24x_Init(void)
+        int ret = 0;
+ 
+        msleep_range(30);
+-       ret = idt_enable(FALSE);
++       ret = idt_enable(IDT_FALSE);
+        if (ret)
+                dev_dbg(&idt->client->dev,
+                        "IDT_8T49N24x_enable 0  I2C progmming failed\n");
+@@ -468,7 +469,7 @@ int IDT_8T49N24x_Init(void)
+ 
+        msleep_range(30);
+        /* enable DPLL and APLL calibration. */
+-       ret = idt_enable(TRUE);
++       ret = idt_enable(IDT_TRUE);
+        if (ret)
+                dev_dbg(&idt->client->dev,
+                        "IDT_8T49N24x_enable 1 I2C progmming failed\n");
+@@ -489,7 +490,12 @@ static const struct i2c_device_id idt_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, idt_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int idt_probe(struct i2c_client *client)
++#else
++static int idt_probe(struct i2c_client *client,
++                    const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -517,9 +523,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void idt_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int idt_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver idt_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/mcdp6000.c b/dp/xfmc/mcdp6000.c
+index 5a7c5b2..f13979b
+--- a/dp/xfmc/mcdp6000.c
++++ b/dp/xfmc/mcdp6000.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ #define SWAP_BYTES(u32Value) ((u32Value & 0x000000FF) << 24)\
+ |((u32Value & 0x0000FF00) << 8) \
+@@ -363,7 +364,12 @@ static const struct i2c_device_id mcdp6000_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, mcdp6000_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int mcdp6000_probe(struct i2c_client *client)
++#else
++static int mcdp6000_probe(struct i2c_client *client,
++                         const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -393,9 +399,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void mcdp6000_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int mcdp6000_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver mcdp6000_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/tipower.c b/dp/xfmc/tipower.c
+index 46c3de1..6d247a8
+--- a/dp/xfmc/tipower.c
++++ b/dp/xfmc/tipower.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -131,7 +132,12 @@ static const struct i2c_device_id tipower_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, tipower_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int tipower_probe(struct i2c_client *client)
++#else
++static int tipower_probe(struct i2c_client *client,
++                        const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -162,9 +168,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void tipower_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int tipower_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver tipower_i2c_driver = {
+        .driver = {
+-- 
+2.34.1
+
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb
deleted file mode 100644
index dda6ec31..00000000
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx DisplayPort Linux Kernel module"
-DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XLNX_DP_VERSION = "5.10.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" 
-
-S = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "c57b2ce95ee6c86f35caecbc7007644ff8f6d337"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-inherit module
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb
deleted file mode 100644
index 28770994..00000000
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx DisplayPort Linux Kernel module"
-DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XLNX_DP_VERSION = "6.1.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "5b0969ac09f301c33bccc140c8f60e832f5cf222"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-inherit module
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.2.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
index d1c6bd3d..083604dd 100644
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.2.bb
+++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
@@ -4,18 +4,19 @@ SECTION = "kernel/modules"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
-XLNX_DP_VERSION = "6.1.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "5b0969ac09f301c33bccc140c8f60e832f5cf222"
+SRCREV ?= "e20942b256e6fb18eaef919c7441f65ad8afcf43"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
+SRC_URI += "file://0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch"
+
 inherit module
 
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
diff --git a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch b/meta-xilinx-core/recipes-kernel/dtc/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
deleted file mode 100644
index cf4739eb..00000000
--- a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Wed, 19 Jan 2022 12:46:42 -0500
-Subject: [PATCH] Revert "libfdt: overlay: make overlay_get_target() public"
-
-This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb.
----
- libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++-------
- libfdt/libfdt.h      | 18 ------------------
- libfdt/version.lds   |  1 -
- 3 files changed, 22 insertions(+), 26 deletions(-)
-
-diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
-index 5c0c398..d217e79 100644
---- a/libfdt/fdt_overlay.c
-+++ b/libfdt/fdt_overlay.c
-@@ -40,22 +40,37 @@ static uint32_t overlay_get_target_phandle(const void *fdto, int fragment)
-        return fdt32_to_cpu(*val);
- }
- 
--int fdt_overlay_target_offset(const void *fdt, const void *fdto,
--                             int fragment_offset, char const **pathp)
-+/**
-+ * overlay_get_target - retrieves the offset of a fragment's target
-+ * @fdt: Base device tree blob
-+ * @fdto: Device tree overlay blob
-+ * @fragment: node offset of the fragment in the overlay
-+ * @pathp: pointer which receives the path of the target (or NULL)
-+ *
-+ * overlay_get_target() retrieves the target offset in the base
-+ * device tree of a fragment, no matter how the actual targeting is
-+ * done (through a phandle or a path)
-+ *
-+ * returns:
-+ *      the targeted node offset in the base device tree
-+ *      Negative error code on error
-+ */
-+static int overlay_get_target(const void *fdt, const void *fdto,
-+                             int fragment, char const **pathp)
- {
-        uint32_t phandle;
-        const char *path = NULL;
-        int path_len = 0, ret;
- 
-        /* Try first to do a phandle based lookup */
--       phandle = overlay_get_target_phandle(fdto, fragment_offset);
-+       phandle = overlay_get_target_phandle(fdto, fragment);
-        if (phandle == (uint32_t)-1)
-                return -FDT_ERR_BADPHANDLE;
- 
-        /* no phandle, try path */
-        if (!phandle) {
-                /* And then a path based lookup */
--               path = fdt_getprop(fdto, fragment_offset, "target-path", &path_len);
-+               path = fdt_getprop(fdto, fragment, "target-path", &path_len);
-                if (path)
-                        ret = fdt_path_offset(fdt, path);
-                else
-@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto)
-                if (overlay < 0)
-                        return overlay;
- 
--               target = fdt_overlay_target_offset(fdt, fdto, fragment, NULL);
-+               target = overlay_get_target(fdt, fdto, fragment, NULL);
-                if (target < 0)
-                        return target;
- 
-@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
-                        return -FDT_ERR_BADOVERLAY;
- 
-                /* get the target of the fragment */
--               ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path);
-+               ret = overlay_get_target(fdt, fdto, fragment, &target_path);
-                if (ret < 0)
-                        return ret;
-                target = ret;
-@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
- 
-                if (!target_path) {
-                        /* again in case setprop_placeholder changed it */
--                       ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path);
-+                       ret = overlay_get_target(fdt, fdto, fragment, &target_path);
-                        if (ret < 0)
-                                return ret;
-                        target = ret;
-diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
-index a7f432c..7f117e8 100644
---- a/libfdt/libfdt.h
-+++ b/libfdt/libfdt.h
-@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
-  */
- int fdt_overlay_apply(void *fdt, void *fdto);
- 
--/**
-- * fdt_overlay_target_offset - retrieves the offset of a fragment's target
-- * @fdt: Base device tree blob
-- * @fdto: Device tree overlay blob
-- * @fragment_offset: node offset of the fragment in the overlay
-- * @pathp: pointer which receives the path of the target (or NULL)
-- *
-- * fdt_overlay_target_offset() retrieves the target offset in the base
-- * device tree of a fragment, no matter how the actual targeting is
-- * done (through a phandle or a path)
-- *
-- * returns:
-- *      the targeted node offset in the base device tree
-- *      Negative error code on error
-- */
--int fdt_overlay_target_offset(const void *fdt, const void *fdto,
--                             int fragment_offset, char const **pathp);
--
- /**********************************************************************/
- /* Debugging / informational functions                                */
- /**********************************************************************/
-diff --git a/libfdt/version.lds b/libfdt/version.lds
-index cbce5d4..7ab85f1 100644
---- a/libfdt/version.lds
-+++ b/libfdt/version.lds
-@@ -77,7 +77,6 @@ LIBFDT_1.2 {
-                fdt_appendprop_addrrange;
-                fdt_setprop_inplace_namelen_partial;
-                fdt_create_with_flags;
--               fdt_overlay_target_offset;
-        local:
-                *;
- };
--- 
-2.19.1
-
diff --git a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.1.bb
deleted file mode 100644
index a868bd01..00000000
--- a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Python Library for the Device Tree Compiler"
-HOMEPAGE = "https://devicetree.org/"
-DESCRIPTION = "A python library for the Device Tree Compiler, a tool used to manipulate Device Tree files which contain a data structure for describing hardware."
-SECTION = "bootloader"
-LICENSE = "GPL-2.0-only | BSD-2-Clause"
-
-DEPENDS = "flex-native bison-native swig-native python3-setuptools-scm-native libyaml dtc"
-
-SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \
-           file://0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch \
-          "
-
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
-
-LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90"
-
-SRCREV = "c001fc01a43e7a06447c06ea3d50bd60641322b8"
-
-PV = "1.6.1+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-PYPA_WHEEL = "${S}/dist/libfdt-1.6.2*.whl"
-
-inherit setuptools3 pkgconfig
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch b/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch
new file mode 100644
index 00000000..9bdbfc94
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch
@@ -0,0 +1,82 @@
+From e1352e6872edc2b521ad44eb776ce093553192e3 Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Fri, 17 May 2024 10:44:37 -0600
+Subject: [PATCH] Support both pre 6.4.0 and current kernels
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ hdmi/xilinx_drm_hdmi.c |  3 +++
+ misc/dp159.c           | 14 ++++++++++++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/hdmi/xilinx_drm_hdmi.c b/hdmi/xilinx_drm_hdmi.c
+index 104fc3d..6ebbdca 100644
+--- a/hdmi/xilinx_drm_hdmi.c
++++ b/hdmi/xilinx_drm_hdmi.c
+@@ -17,6 +17,7 @@
+  * GNU General Public License for more details.
+  */
+ 
++#include <linux/version.h>
+ #include <drm/drm_atomic_helper.h>
+ #include <drm/drm_connector.h>
+ #include <drm/drm_crtc.h>
+@@ -27,7 +28,9 @@
+ #include <drm/drm_of.h>
+ #include <drm/drm_probe_helper.h>
+ #include <drm/drm_sysfs.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ #include <drm/display/drm_hdmi_helper.h>
++#endif
+ 
+ #include <linux/clk.h>
+ #include <linux/delay.h>
+diff --git a/misc/dp159.c b/misc/dp159.c
+index 73e886f..d2c60d9 100644
+--- a/misc/dp159.c
++++ b/misc/dp159.c
+@@ -28,6 +28,7 @@
+ #include <linux/of.h>
+ #include <linux/of.h>
+ #include <linux/clk-provider.h>
++#include <linux/version.h>
+ 
+ MODULE_DESCRIPTION("i2c device driver for dp159 redriver and retimer");
+ MODULE_AUTHOR("Leon Woestenberg");
+@@ -133,7 +134,12 @@ struct clk_ops clk_tx_rate_ops = {
+        .round_rate             = &clk_tx_round_rate,
+ };
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int dp159_probe(struct i2c_client *client)
++#else
++static int dp159_probe(struct i2c_client *client,
++                      const struct i2c_device_id *id)
++#endif
+ {
+        struct clk_tx_linerate *clk_tx;
+        struct clk *clk;
+@@ -191,12 +197,20 @@ static int dp159_probe(struct i2c_client *client)
+        return 0;
+ }
+ 
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void dp159_remove(struct i2c_client *client)
++#else
++static int dp159_remove(struct i2c_client *client)
++#endif
+ {
+        struct clk_tx_linerate *clk_tx;
+        clk_tx = (struct clk_tx_linerate *)i2c_get_clientdata(client);
+        if (clk_tx)
+                clk_unregister(clk_tx->clk);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)
++       return 0;
++#endif
+ }
+ 
+ static const struct i2c_device_id dp159_id[] = {
+-- 
+2.34.1
+
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb
deleted file mode 100644
index c1f66013..00000000
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx HDMI Linux Kernel module"
-DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
-
-XLNX_HDMI_VERSION = "5.15.19"
-PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
-SRCREV = "25b6fe7a26a975be15c002b48cfd4c291486491e"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-inherit module
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb
deleted file mode 100644
index 20acb8b3..00000000
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx HDMI Linux Kernel module"
-DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
-
-XLNX_HDMI_VERSION = "6.1"
-PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
-SRCREV = "1c6330f02fea68992e22400fdbc8c0d0e63e2958"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-inherit module
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.40.bb
index bc89f5f3..a56f90b0 100644
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.40.bb
@@ -4,18 +4,19 @@ SECTION = "kernel/modules"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
 
-XLNX_HDMI_VERSION = "6.1"
-PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.2"
 REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
-SRCREV = "82209b0021a7b5d7ef71a859eed4bafeb541ed08"
+SRCREV = "4bb89eb3f3062eac8de1aa2b7e64d7f861e18caa"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
+SRC_URI += "file://0001-Support-both-pre-6.4.0-and-current-kernels.patch"
+
 inherit module
 
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
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..9a266e9c
--- /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 = "${UNPACKDIR}/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/linux-firmware/linux-firmware-ti-bt.bb b/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
index 97740671..76002cb3 100644
--- a/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
+++ b/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
@@ -14,7 +14,7 @@ NO_GENERIC_LICENSE[Firmware-ti-bt] = "LICENSE.ti-bt"
 SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;protocol=https;branch=master"
 SRCREV = "c290f8af9e388f37e509ecb111a1b64572b7c225"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit allarch
 
diff --git a/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules.bb b/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules.bb
index 611e2e91..8eb742c9 100644
--- a/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules.bb
+++ b/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules.bb
@@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "\
     file://99-aie-device.rules \
-    file://99-mali-device.rules \
 "
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 inherit useradd
 
@@ -17,13 +16,14 @@ COMPATIBLE_MACHINE:zynq = ".*"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:microblaze = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 
 do_configure[noexec] = '1'
 do_compile[noexec] = '1'
 
 do_install () {
     install -d ${D}${sysconfdir}/udev/rules.d
-    for rule in $(find ${WORKDIR} -maxdepth 1 -type f -name "*.rules"); do
+    for rule in $(find ${UNPACKDIR} -maxdepth 1 -type f -name "*.rules"); do
         install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/
     done
 }
diff --git a/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules/99-mali-device.rules b/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules/99-mali-device.rules
deleted file mode 100644
index 89ec5f78..00000000
--- a/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules/99-mali-device.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-# Device rules for GPU MALI-400 drivers.
-ACTION=="add", SUBSYSTEM=="misc", KERNEL=="mali", MODE="0660", GROUP="video", TAG+="uaccess"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
index 2355d090..3133c485 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
@@ -1,6 +1,6 @@
 # This version extension should match CONFIG_LOCALVERSION in defconfig
-LINUX_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}"
-PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}"
+LINUX_VERSION_EXTENSION ?= "-xilinx"
+PV = "${LINUX_VERSION}+git"
 
 # Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits
 KBRANCH ?= "undefined"
@@ -27,14 +27,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 EXTKERNELSRC = "${@'1' if d.getVar('EXTERNALSRC') else ''}"
 
-# Force the use of the KBUILD_DEFCONFIG even if some other defconfig was generated in the ${WORKDIR}
+# Force the use of the KBUILD_DEFCONFIG even if some other defconfig was generated in the ${UNPACKDIR}
 do_kernel_metadata:prepend () {
-        [ -n "${KBUILD_DEFCONFIG}" ] && [ -e ${WORKDIR}/defconfig ] && rm ${WORKDIR}/defconfig
+        [ -n "${KBUILD_DEFCONFIG}" ] && [ -e ${UNPACKDIR}/defconfig ] && rm ${UNPACKDIR}/defconfig
 }
 
 do_configure:prepend () {
         if [ -n "${KBUILD_DEFCONFIG}" ] && [ -n "${EXTKERNELSRC}" ]; then
-                cp ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
+                cp ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig
         fi
 }
 
@@ -46,6 +46,7 @@ COMPATIBLE_MACHINE:zynq = ".*"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:microblaze = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 
 # Use DEFCONFIGs for configuring linux-xlnx kernels
 KCONFIG_MODE ?= "alldefconfig"
@@ -53,15 +54,13 @@ KBUILD_DEFCONFIG:zynqmp ?= "xilinx_defconfig"
 KBUILD_DEFCONFIG:zynq ?= "xilinx_zynq_defconfig"
 KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig"
 KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig"
+KBUILD_DEFCONFIG:versal-net ?= "xilinx_defconfig"
 
 KERNEL_FEATURES:append:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}"
 
 KERNEL_FEATURES:append:zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}"
 
 KERNEL_FEATURES:append:versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc"
+KERNEL_FEATURES:append:versal-net = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc"
 
 KERNEL_FEATURES:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}"
-
-# Enable DRM_LIMA support if DISTRO_FEATURES != 'libmali' and MACHINE_FEATURES mali400 is enabled
-MALI_FEATURE = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '', 'features/drm-lima/drm-lima.scc', d)}"
-KERNEL_FEATURES:append = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', ' ${MALI_FEATURE}', '', d)}"
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/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg
new file mode 100644
index 00000000..a5b23e3f
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg
@@ -0,0 +1 @@
+CONFIG_VERSAL_SYSMON_I2C=y
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc
new file mode 100644
index 00000000..c1830956
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: MIT
+kconf hardware versal-sysmon.cfg
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb
deleted file mode 100644
index 41c1ffe2..00000000
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LINUX_VERSION = "5.15.19"
-KBRANCH="xlnx_rebase_v5.15_LTS_2022.1_update"
-SRCREV = "75872fda9ad270b611ee6ae2433492da1e22b688"
-
-KCONF_AUDIT_LEVEL="0"
-
-include linux-xlnx.inc
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb
deleted file mode 100644
index 260224b8..00000000
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LINUX_VERSION = "5.15.36"
-KBRANCH="xlnx_rebase_v5.15_LTS"
-SRCREV = "19984dd147fa7fbb7cb14b17400263ad0925c189"
-
-KCONF_AUDIT_LEVEL="0"
-
-include linux-xlnx.inc
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.1.bb
index d229f21c..d229f21c 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.1.bb
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.2.bb
index ec5827e6..ec5827e6 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.2.bb
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
new file mode 100644
index 00000000..4558101a
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.10-v2024.1.bb
@@ -0,0 +1,11 @@
+LINUX_VERSION = "6.6.10"
+YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=yocto-kmeta"
+KBRANCH="xlnx_rebase_v6.6_LTS"
+SRCREV = "3af4295e00efdced3e8c6973606a7de55f6bf7dc"
+SRCREV_meta = "5d0809d0d939c7738cb6e5391126c73fd0e4e865"
+
+KCONF_AUDIT_LEVEL="0"
+
+include linux-xlnx.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
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/lopper/xilinx-lops.bb b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
index 2648c372..c44e8ab1 100644
--- a/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
+++ b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
@@ -13,7 +13,7 @@ SRC_URI = " \
 
 LIC_FILES_CHKSUM = "file://lop-microblaze-yocto.dts;endline=10;md5=27139f9b862dc6fe466c7157aba7ed9c"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 inherit python3-dir
 
diff --git a/meta-xilinx-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-xilinx-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend
deleted file mode 100644
index 03823f6e..00000000
--- a/meta-xilinx-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
-DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
-MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
-MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
-PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
-PACKAGE_ARCH = "${@bb.utils.contains_any('DEPENDS', 'virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Current-gcc-requires-cstdint-for-C-types.patch b/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Current-gcc-requires-cstdint-for-C-types.patch
deleted file mode 100644
index defe14dc..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Current-gcc-requires-cstdint-for-C-types.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2316632e8f3eefc21bc4f9cb97be4603b4c14719 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Thu, 28 Sep 2023 12:24:04 -0600
-Subject: [PATCH] Current gcc requires cstdint for C types
-
-Add #include <cstdint> to resolve the issues similar to the following:
-
-  module/module_structs.h:259:3: note: 'uint16_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-  module/module_structs.h:260:3: error: 'uint16_t' does not name a type
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- exe_omx/encoder/EncCmdMngr.h | 1 +
- module/module_structs.h      | 1 +
- utility/processor_fifo.h     | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/exe_omx/encoder/EncCmdMngr.h b/exe_omx/encoder/EncCmdMngr.h
-index 6dacd68..cd3d0a6 100644
---- a/exe_omx/encoder/EncCmdMngr.h
-+++ b/exe_omx/encoder/EncCmdMngr.h
-@@ -7,6 +7,7 @@
- #include <iostream>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- #include "ICommandsSender.h"
- 
-diff --git a/module/module_structs.h b/module/module_structs.h
-index 7151b86..37ff8ac 100644
---- a/module/module_structs.h
-+++ b/module/module_structs.h
-@@ -6,6 +6,7 @@
- #include "module_enums.h"
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- template<typename T>
- struct InputOutput
-diff --git a/utility/processor_fifo.h b/utility/processor_fifo.h
-index 1c62ba4..3c9cd86 100644
---- a/utility/processor_fifo.h
-+++ b/utility/processor_fifo.h
-@@ -6,6 +6,7 @@
- #include <utility/locked_queue.h>
- #include <thread>
- #include <functional>
-+#include <string>
- 
- #if defined __linux__
- #include <sys/prctl.h>
--- 
-2.34.1
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch b/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch
deleted file mode 100644
index 788edd03..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b58c0a7dd0eeb16b2251edfad3b4763ce5653ea2 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Thu, 28 Sep 2023 12:04:34 -0600
-Subject: [PATCH] Support updated gcc, add cstdint where necessary
-
-With the latest gcc, cstdint is now needs to be explicitly included, otherwise
-errors similar to the following will occur:
-
-  include/lib_app/Parser.h:413:36: error: 'uint32_t' has not been declared
-    413 | static void resetFlag(T* bitfield, uint32_t uFlag)
-        |                                    ^~~~~~~~
-  include/lib_app/Parser.h: In function 'void resetFlag(T*, int)':
-  include/lib_app/Parser.h:415:20: error: 'uint32_t' was not declared in this scope
-    415 |   *bitfield = (T)((uint32_t)*bitfield & ~uFlag);
-        |                    ^~~~~~~~
-  include/lib_app/Parser.h:18:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-     17 | #include <iomanip>
-    +++ |+#include <cstdint>
-     18 |
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- exe_encoder/EncCmdMngr.h | 1 +
- include/lib_app/Parser.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/exe_encoder/EncCmdMngr.h b/exe_encoder/EncCmdMngr.h
-index 6dacd68..cd3d0a6 100644
---- a/exe_encoder/EncCmdMngr.h
-+++ b/exe_encoder/EncCmdMngr.h
-@@ -7,6 +7,7 @@
- #include <iostream>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- #include "ICommandsSender.h"
- 
-diff --git a/include/lib_app/Parser.h b/include/lib_app/Parser.h
-index efb7f94..66d5164 100644
---- a/include/lib_app/Parser.h
-+++ b/include/lib_app/Parser.h
-@@ -15,6 +15,7 @@
- #include <sstream>
- #include <vector>
- #include <iomanip>
-+#include <cstdint>
- 
- std::deque<Token> toReversePolish(std::deque<Token>& tokens);
- std::string parseString(std::deque<Token>& tokens);
--- 
-2.34.1
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules b/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules
deleted file mode 100644
index 4643ad37..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Allegro VCU Encode, Decoder module drivers
-SUBSYSTEM=="allegro_encode_class", KERNEL=="allegroIP", MODE="0660", GROUP="video"
-SUBSYSTEM=="allegro_decode_class", KERNEL=="allegroDecodeIP", MODE="0660", GROUP="video"
-
-# Xilinx Video DMA driver
-SUBSYSTEM=="char", KERNEL=="dmaproxy", MODE="0660", GROUP="video"
-
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb
deleted file mode 100644
index 7ef1d5fd..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Linux kernel module for Video Code Unit"
-DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-BRANCH = "xlnx_rel_v2022.1"
-REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "9d2657550eccebccce08cacfcdd369367b9f6be4"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = " \
-    ${REPO};${BRANCHARG} \
-    file://99-vcu-enc-dec.rules \
-    "
-
-inherit module features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-
-RDEPENDS:${PN} = "vcu-firmware"
-
-KERNEL_MODULE_AUTOLOAD += "dmaproxy"
-
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb
deleted file mode 100644
index b1c96d3c..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Linux kernel module for Video Code Unit"
-DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-BRANCH = "xlnx_rel_v2022.2"
-REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "b131e220285e06658b6ab27f9e19b1c592a55f3a"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = " \
-    ${REPO};${BRANCHARG} \
-    file://99-vcu-enc-dec.rules \
-    "
-
-inherit module features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-
-RDEPENDS:${PN} = "vcu-firmware"
-
-KERNEL_MODULE_AUTOLOAD += "dmaproxy"
-
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb
deleted file mode 100644
index 9adfcade..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Linux kernel module for Video Code Unit"
-DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-BRANCH = "xlnx_rel_v2023.1"
-REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "4afe0ab4eb3b7f2d17bcb823dee0caa0f03ab7a0"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = " \
-    ${REPO};${BRANCHARG} \
-    file://99-vcu-enc-dec.rules \
-    "
-
-inherit module features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-
-RDEPENDS:${PN} = "vcu-firmware"
-
-KERNEL_MODULE_AUTOLOAD += "dmaproxy"
-
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
deleted file mode 100644
index e8bd3397..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Linux kernel module for Video Code Unit"
-DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-BRANCH = "xlnx_rel_v2023.2"
-REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "689c8d823b383e2a8a5249be49de627f866cfaf2"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = " \
-    ${REPO};${BRANCHARG} \
-    file://99-vcu-enc-dec.rules \
-    "
-
-inherit module features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-
-RDEPENDS:${PN} = "vcu-firmware"
-
-KERNEL_MODULE_AUTOLOAD += "dmaproxy"
-
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb
deleted file mode 100644
index 47c521c4..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-BRANCH ?= "xlnx_rel_v2022.1"
-REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "b3308c608be7ed9250b9c6732f6e0a02b1a2e985"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-
-    install -Dm 0755 ${S}/bin/omx_decoder ${D}/${bindir}/omx_decoder
-    install -Dm 0755 ${S}/bin/omx_encoder ${D}/${bindir}/omx_encoder
-
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb
deleted file mode 100644
index c5b956bc..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "6752f5da88a8783f689ae762065295b89902d6d4"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-S  = "${WORKDIR}/git"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-
-    install -Dm 0755 ${S}/bin/omx_decoder ${D}/${bindir}/omx_decoder
-    install -Dm 0755 ${S}/bin/omx_encoder ${D}/${bindir}/omx_encoder
-
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb
deleted file mode 100644
index 75a05fed..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5375796c5ae4ee85ea1f2c1603e58509"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "4773b372b72b88ccbabc122b023f042fb22a019e"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-SRC_URI += "file://0001-Current-gcc-requires-cstdint-for-C-types.patch"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-
-    install -Dm 0755 ${S}/bin/omx_decoder ${D}/${bindir}/omx_decoder
-    install -Dm 0755 ${S}/bin/omx_encoder ${D}/${bindir}/omx_encoder
-
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb
deleted file mode 100644
index 0c215605..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ef69c2bb405668101824f0b644631e2e"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "3a04b5adc661a0eced626c1373dbbfe699ae6fe0"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-SRC_URI += "file://0001-Current-gcc-requires-cstdint-for-C-types.patch"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-
-    oe_runmake install INSTALL_PATH=${D}${bindir}
-
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb
deleted file mode 100644
index 71e6e572..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-BRANCH ?= "xlnx_rel_v2022.1"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "5bf158af204b181f00ac009c8745557642ecfe5f"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-RDEPENDS:${PN} = "kernel-module-vcu"
-
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-
-    install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder
-    install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder
-
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
-
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb
deleted file mode 100644
index 130d79bc..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "3c59dede1923a159a8db736ce0b4ab55633a2114"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-RDEPENDS:${PN} = "kernel-module-vcu"
-
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-
-    install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder
-    install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder
-
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
-
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb
deleted file mode 100644
index 53a03f45..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5375796c5ae4ee85ea1f2c1603e58509"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "83aabb84c26667f7d6aee632654c63e504838061"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-SRC_URI += "file://0001-Support-updated-gcc-add-cstdint-where-necessary.patch"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-RDEPENDS:${PN} = "kernel-module-vcu"
-
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-
-    install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder
-    install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder
-
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
-
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb
deleted file mode 100644
index a2c7d98c..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ef69c2bb405668101824f0b644631e2e"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "84b0856cad7844d69f57ac4d9447c20930875475"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-SRC_URI += "file://0001-Support-updated-gcc-add-cstdint-where-necessary.patch"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-RDEPENDS:${PN} = "kernel-module-vcu"
-
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include INSTALL_PATH=${D}/${bindir}
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
-
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.1.bb
deleted file mode 100644
index c5c2b045..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Firmware for VCU"
-DESCRIPTION = "Firmware binaries provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=63b45903a9a50120df488435f03cf498"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S  = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2022.1"
-REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "569f980527fd58f43baf16bd0b294bf8c7cdf963"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}/lib/firmware/al5d_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}/lib/firmware/al5d.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}/lib/firmware/al5e_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}/lib/firmware/al5e.fw
-}
-
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "/lib/firmware/*"
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb
deleted file mode 100644
index 594a94c3..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Firmware for VCU"
-DESCRIPTION = "Firmware binaries provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=63b45903a9a50120df488435f03cf498"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S  = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "3980c778d71fa51a15e89bf70fd8fb28d5cb12e0"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}/lib/firmware/al5d_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}/lib/firmware/al5d.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}/lib/firmware/al5e_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}/lib/firmware/al5e.fw
-}
-
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "/lib/firmware/*"
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb
deleted file mode 100644
index a90d307f..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Firmware for VCU"
-DESCRIPTION = "Firmware binaries provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6da65299754e921b31f03e9b11d77a74"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S  = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "c90288595ac9a12ff401de6dfa680b1f9adce5f6"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-do_install() {
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}${nonarch_base_libdir}/firmware/al5d_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}${nonarch_base_libdir}/firmware/al5d.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}${nonarch_base_libdir}/firmware/al5e_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}${nonarch_base_libdir}/firmware/al5e.fw
-}
-
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb
deleted file mode 100644
index 73fc2201..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Firmware for VCU"
-DESCRIPTION = "Firmware binaries provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=52eb1e8f27e0e189b175c7d75f028cc6"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S  = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "f4ab98d26aa3e244a487f518f5a76071137c8402"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-do_install() {
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}${nonarch_base_libdir}/firmware/al5d_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}${nonarch_base_libdir}/firmware/al5d.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}${nonarch_base_libdir}/firmware/al5e_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}${nonarch_base_libdir}/firmware/al5e.fw
-}
-
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-include-libapp-Parser.h-Add-cstdint.patch b/meta-xilinx-core/recipes-multimedia/vdu/files/0001-include-libapp-Parser.h-Add-cstdint.patch
deleted file mode 100644
index 04d59c60..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-include-libapp-Parser.h-Add-cstdint.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 79eddc5c5474c9b61bf6b2e648eba8bca61469b9 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Thu, 25 Jan 2024 12:30:24 -0700
-Subject: [PATCH] include/libapp/Parser.h: Add cstdint
-
-Resolves usages of unit32_t being undefined
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- include/lib_app/Parser.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/lib_app/Parser.h b/include/lib_app/Parser.h
-index 976a835..6fa63ce 100644
---- a/include/lib_app/Parser.h
-+++ b/include/lib_app/Parser.h
-@@ -35,6 +35,7 @@
- #include <sstream>
- #include <vector>
- #include <iomanip>
-+#include <cstdint>
- 
- std::deque<Token> toReversePolish(std::deque<Token>& tokens);
- std::string parseString(std::deque<Token>& tokens);
--- 
-2.34.1
-
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch b/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch
deleted file mode 100644
index db23ed00..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7fc63cdd6642ea84b78db62fccafc460af0ff23e Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Thu, 25 Jan 2024 12:50:18 -0700
-Subject: [PATCH] Fix missing definitions
-
-Fix issues such as:
-| module/module_structs.h:370:3: error: 'uint8_t' does not name a type
-|   370 |   uint8_t distributionMaxrgbPercentages[MAX_MAXRGB_PERCENTILES_ST2094_40];
-|       |   ^~~~~~~
-| module/module_structs.h:370:3: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-| module/module_structs.h:371:3: error: 'uint32_t' does not name a type
-|   371 |   uint32_t distributionMaxrgbPercentiles[MAX_MAXRGB_PERCENTILES_ST2094_40];
-|       |   ^~~~~~~~
-| module/module_structs.h:371:3: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-
-and
-
-| ./utility/processor_fifo.h:80:15: error: field 'name_' has incomplete type 'std::string' {aka 'std::__cxx11::basic_string<char>'}
-|    80 |   std::string name_;
-|       |               ^~~~~
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- module/module_structs.h  | 1 +
- utility/processor_fifo.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/module/module_structs.h b/module/module_structs.h
-index 75bdff6..594076f 100644
---- a/module/module_structs.h
-+++ b/module/module_structs.h
-@@ -27,6 +27,7 @@
- #include "module_enums.h"
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- template<typename T>
- struct InputOutput
-diff --git a/utility/processor_fifo.h b/utility/processor_fifo.h
-index e0dd47c..f047267 100644
---- a/utility/processor_fifo.h
-+++ b/utility/processor_fifo.h
-@@ -27,6 +27,7 @@
- #include <utility/locked_queue.h>
- #include <thread>
- #include <functional>
-+#include <string>
- 
- #if defined __linux__
- #include <sys/prctl.h>
--- 
-2.34.1
-
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/files/99-vdu-enc-dec.rules b/meta-xilinx-core/recipes-multimedia/vdu/files/99-vdu-enc-dec.rules
deleted file mode 100644
index 78bb54f4..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/files/99-vdu-enc-dec.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-# Allegro VDU Encode, Decoder module drivers
-SUBSYSTEM=="allegro_decode_class", KERNEL=="allegroDecodeIP[0-4]*", MODE="0660", GROUP="video", TAG+="uaccess"
-
-
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb
deleted file mode 100644
index 9b835490..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "Linux kernel module for Video Decode Unit"
-DESCRIPTION = "Out-of-tree VDU decoder common kernel modules"
-SECTION = "kernel/modules"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO ?= "git://github.com/Xilinx/vdu-modules.git;protocol=https"
-SRCREV ?= "82d06e395c93a1e941b83cccbb6f2e4e6d966f1c"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-        file://99-vdu-enc-dec.rules \
-"
-
-inherit module features_check
-
-REQUIRED_MACHINE_FEATURES = "vdu"
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-
-RDEPENDS:${PN} = "vdu-firmware"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
deleted file mode 100644
index 1c9ba8ad..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "Linux kernel module for Video Decode Unit"
-DESCRIPTION = "Out-of-tree VDU decoder common kernel modules"
-SECTION = "kernel/modules"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO ?= "git://github.com/Xilinx/vdu-modules.git;protocol=https"
-SRCREV ?= "4d5134f54006f904f0b28f00e05dd3febd5fcfd3"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-        file://99-vdu-enc-dec.rules \
-"
-
-inherit module features_check
-
-REQUIRED_MACHINE_FEATURES = "vdu"
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-
-RDEPENDS:${PN} = "vdu-firmware"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb
deleted file mode 100644
index f9228678..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-SUMMARY = "Control Software for VDU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VDU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
-
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-
-inherit autotools features_check
-
-REQUIRED_MACHINE_FEATURES = "vdu"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
-SRCREV ?= "06fc18b303b40d4fee7549ad162c22ee1bc31582"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-           file://0001-include-libapp-Parser.h-Add-cstdint.patch \
-          "
-
-S  = "${WORKDIR}/git"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-
-RDEPENDS:${PN} = "kernel-module-vdu"
-
-do_compile[dirs] = "${S}"
-do_install[dirs] = "${S}"
-
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-EXTRA_OEMAKE +=" INSTALL_HDR_PATH=${D}${includedir}/vdu-ctrl-sw/include INSTALL_PATH=${D}${bindir}"
-
-do_install:append() {
-
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb
deleted file mode 100644
index f8b36a93..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-SUMMARY = "Control Software for VDU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VDU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
-
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-
-inherit autotools features_check
-
-REQUIRED_MACHINE_FEATURES = "vdu"
-
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
-SRCREV ?= "1beb8f247d01b1a728faea36ce8f7847c895482f"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-           file://0001-include-libapp-Parser.h-Add-cstdint.patch \
-          "
-
-S  = "${WORKDIR}/git"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-
-RDEPENDS:${PN} = "kernel-module-vdu"
-
-do_compile[dirs] = "${S}"
-do_install[dirs] = "${S}"
-
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-EXTRA_OEMAKE +=" INSTALL_HDR_PATH=${D}${includedir}/vdu-ctrl-sw/include INSTALL_PATH=${D}${bindir}"
-
-do_install:append() {
-
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb
deleted file mode 100644
index b3c02ca2..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VDU"
-DESCRIPTION = "OMX IL Libraries,test application and headers for VDU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
-
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/vdu-omx-il.git;protocol=https"
-SRCREV ?= "811eefac953fd5e098c69cada97a0dd35f5e9015"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-           file://0001-libvdu-omxil-Fix-missing-definitions.patch \
-          "
-S  = "${WORKDIR}/git"
-
-inherit autotools features_check
-
-REQUIRED_MACHINE_FEATURES = "vdu"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-
-DEPENDS = "libvdu-ctrlsw"
-RDEPENDS:${PN} = "kernel-module-vdu libvdu-ctrlsw"
-
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vdu-ctrl-sw/include"
-
-do_compile[dirs] = "${S}"
-do_install[dirs] = "${S}"
-
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    INSTALL_PATH=${D}${bindir} \
-    INCLUDE_INST_PATH=${D}${includedir} \
-    "
-
-do_install:append() {
-    install -d ${D}${libdir}
-
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb
deleted file mode 100644
index 04860b79..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VDU"
-DESCRIPTION = "OMX IL Libraries,test application and headers for VDU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
-
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/Xilinx/vdu-omx-il.git;protocol=https"
-SRCREV ?= "811eefac953fd5e098c69cada97a0dd35f5e9015"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-           file://0001-libvdu-omxil-Fix-missing-definitions.patch \
-          "
-S  = "${WORKDIR}/git"
-
-inherit autotools features_check
-
-REQUIRED_MACHINE_FEATURES = "vdu"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-
-DEPENDS = "libvdu-ctrlsw"
-RDEPENDS:${PN} = "kernel-module-vdu libvdu-ctrlsw"
-
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vdu-ctrl-sw/include"
-
-do_compile[dirs] = "${S}"
-do_install[dirs] = "${S}"
-
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    INSTALL_PATH=${D}${bindir} \
-    INCLUDE_INST_PATH=${D}${includedir} \
-    "
-
-do_install:append() {
-    install -d ${D}${libdir}
-
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
deleted file mode 100755
index 419dd681..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "Firmware for VDU"
-DESCRIPTION = "Firmware binaries provider for VDU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c5784f63397086d836580d8785d1deb9"
-
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-
-S  = "${WORKDIR}/git"
-
-inherit autotools features_check
-
-REQUIRED_MACHINE_FEATURES = "vdu"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO ?= "git://github.com/Xilinx/vdu-firmware.git;protocol=https"
-SRCREV ?= "63fe2fce6e46d5bf03e33300a58a37d8568722ee"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
-
-do_compile[noexec] = "1"
-do_install[dirs] = "${S}"
-
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
deleted file mode 100644
index ade73a4e..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "Firmware for VDU"
-DESCRIPTION = "Firmware binaries provider for VDU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c5784f63397086d836580d8785d1deb9"
-
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-
-S  = "${WORKDIR}/git"
-
-inherit autotools features_check
-
-REQUIRED_MACHINE_FEATURES = "vdu"
-
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO ?= "git://github.com/Xilinx/vdu-firmware.git;protocol=https"
-SRCREV ?= "731897772730178f6a4e77eedeb4fb53faa1ab4d"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
-
-do_compile[noexec] = "1"
-do_install[dirs] = "${S}"
-
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch b/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch
deleted file mode 100644
index c7d4aefd..00000000
--- a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch
+++ /dev/null
@@ -1,370 +0,0 @@
-From 1128691f6e2709b44eccafb0b303b07da55a814e Mon Sep 17 00:00:00 2001
-From: Christian Kohn <chris.kohn@amd.com>
-Date: Mon, 17 Oct 2022 19:28:22 -0700
-Subject: [PATCH] Add initial support for Xilinx OEM FRU records
-
-The supported Xilinx OEM FRU records are MAC_ID and FREE_FORM. This FRU OEM
-extension parses these records and prints them with proper formatting.
-
-To use this feature, run the ipmi-fru command as follows:
-$ sudo ./ipmi-fru --fru-file=/sys/devices/platform/axi/ff030000.i2c/i2c-1/1-0051/eeprom \
-  --interpret-oem-data
-
-Note: The EEPROM address can vary between different platforms. This is just an
-      example.
-
-This feature has been tested with the Xilinx Kria KV260 and KR260 Starter Kits.
-
-Signed-off-by: Christian Kohn <chris.kohn@amd.com>
----
- ipmi-fru/Makefile.am                          |   2 +
- ipmi-fru/ipmi-fru-oem-xilinx.c                | 171 ++++++++++++++++++
- ipmi-fru/ipmi-fru-oem-xilinx.h                |  33 ++++
- ipmi-fru/ipmi-fru-output.c                    |  14 ++
- libfreeipmi/include/freeipmi/freeipmi.h.in    |   1 +
- .../oem/ipmi-fru-xilinx-oem-record-format.h   |  45 +++++
- .../spec/ipmi-iana-enterprise-numbers-spec.h  |   1 +
- 7 files changed, 267 insertions(+)
- create mode 100644 ipmi-fru/ipmi-fru-oem-xilinx.c
- create mode 100644 ipmi-fru/ipmi-fru-oem-xilinx.h
- create mode 100644 libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h
-
-diff --git a/ipmi-fru/Makefile.am b/ipmi-fru/Makefile.am
-index c92ba0e8c..c8545eede 100644
---- a/ipmi-fru/Makefile.am
-+++ b/ipmi-fru/Makefile.am
-@@ -25,6 +25,8 @@ ipmi_fru_SOURCES = \
-        ipmi-fru-argp.h \
-        ipmi-fru-oem-wistron.c \
-        ipmi-fru-oem-wistron.h \
-+       ipmi-fru-oem-xilinx.c \
-+       ipmi-fru-oem-xilinx.h \
-        ipmi-fru-output.c \
-        ipmi-fru-output.h
- 
-diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.c b/ipmi-fru/ipmi-fru-oem-xilinx.c
-new file mode 100644
-index 000000000..87bb18f00
---- /dev/null
-+++ b/ipmi-fru/ipmi-fru-oem-xilinx.c
-@@ -0,0 +1,171 @@
-+/*
-+ * Copyright (C) 2022, Advanced Micro Devices, Inc.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#if HAVE_CONFIG_H
-+#include "config.h"
-+#endif /* HAVE_CONFIG_H */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#if STDC_HEADERS
-+#include <string.h>
-+#endif /* STDC_HEADERS */
-+#include <assert.h>
-+
-+#include <freeipmi/freeipmi.h>
-+
-+#include "ipmi-fru_.h"
-+#include "ipmi-fru-oem-xilinx.h"
-+
-+#include "freeipmi-portability.h"
-+
-+static char *
-+_version_str (uint8_t version)
-+{
-+  switch (version)
-+    {
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_BOARD:
-+      return "Board";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_SYSCTL:
-+      return "System Controller";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_MODULE:
-+      return "Module";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_MAC:
-+      return "DUT - MAC";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT:
-+      return "DUT - EtherCAT";
-+    default:
-+      return "";
-+    }
-+
-+  return (NULL);                /* NOT REACHED */
-+}
-+
-+int
-+ipmi_fru_oem_xilinx_oem_record (ipmi_fru_state_data_t *state_data,
-+                                uint8_t record_type_id,
-+                                uint32_t manufacturer_id,
-+                                uint8_t *oem_data,
-+                                unsigned int oem_data_len)
-+{
-+  assert (state_data);
-+  assert (manufacturer_id == IPMI_IANA_ENTERPRISE_ID_XILINX);
-+  assert (oem_data);
-+
-+  /* The MAC_ID record type ID is 0xD2. The MAC ID record consists of a 1 byte
-+   * version ID followed by one or more 6-byte MAC addresses. If the MAC ID
-+   * version is set to "DUT - EtherCAT", a 4-byte EtherCAT ID is used instead of
-+   * a 6-byte MAC address.
-+   */
-+  if (record_type_id == IPMI_FRU_OEM_XILINX_MAC_ID && oem_data_len)
-+    {
-+      uint8_t version = oem_data[0];
-+      unsigned int len = oem_data_len - 1;
-+
-+      pstdout_printf (state_data->pstate,
-+                      "  FRU OEM MAC Version: %s (%xh)\n",
-+                      _version_str(version),
-+                      version);
-+
-+      /* The MAC_ID record can hold multiple MAC addresses that are 6 bytes long
-+       * each if version is set to 0x31.
-+       */
-+      if ((version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_BOARD ||
-+           version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_SYSCTL ||
-+           version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_MODULE ||
-+           version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_MAC ) &&
-+          (len % 6) == 0)
-+        {
-+          unsigned int i, j, start, stop;
-+          unsigned int mac_cnt = len / 6;
-+
-+          for (j = 0; j < mac_cnt; j++)
-+            {
-+              pstdout_printf (state_data->pstate, "  FRU OEM MAC ID %d: ", j);
-+
-+              start = j*6 + 1;
-+              stop = start + 5;
-+
-+              for (i = start; i < stop; i++)
-+                {
-+                  pstdout_printf (state_data->pstate, "%02x:", oem_data[i]);
-+                }
-+
-+              pstdout_printf (state_data->pstate, "%02x\n", oem_data[i]);
-+            }
-+
-+          return (1);
-+        }
-+
-+      /* The MAC_ID record holds one EtherCAT ID that is 4 bytes long if version
-+       * is set to 0x32. The assigned EtherCAT ID for Xilinx is 0x0000056F.
-+       */
-+      if (version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT &&
-+          len == 4)
-+        {
-+          pstdout_printf (state_data->pstate, "  FRU OEM EtherCAT ID: 0x");
-+
-+          for (unsigned int i = 1; i < len+1; i++)
-+            {
-+              pstdout_printf (state_data->pstate, "%02X", oem_data[i]);
-+            }
-+
-+          pstdout_printf (state_data->pstate, "\n");
-+
-+          return (1);
-+        }
-+    }
-+
-+  /* The free form data record type ID is 0xD3. It consists of one or more
-+   * fields where each field is split into N byte identifier and M byte data
-+   * followed by a 0x00 end of field delimiter. The below code parses the free
-+   * form record and prints each field on a new line prefixed with 'FRU OEM '.
-+   */
-+  if (record_type_id == IPMI_FRU_OEM_XILINX_FREE_FORM && oem_data_len)
-+    {
-+      unsigned int i;
-+      unsigned int new_field = 1;
-+
-+      for (i = 0; i < oem_data_len; i++)
-+        {
-+          /* 0x00 marks the end of the field */
-+          if (oem_data[i] == 0)
-+            {
-+              if (new_field == 0)
-+                {
-+                  pstdout_printf (state_data->pstate, "\n");
-+                }
-+              new_field = 1;
-+              continue;
-+            }
-+
-+          /* Start of a new field */
-+          if (new_field == 1)
-+            {
-+              new_field = 0;
-+              pstdout_printf (state_data->pstate, "  FRU OEM ");
-+            }
-+
-+          pstdout_printf (state_data->pstate, "%c", oem_data[i]);
-+        }
-+
-+      return (1);
-+    }
-+
-+  return (0);
-+}
-diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.h b/ipmi-fru/ipmi-fru-oem-xilinx.h
-new file mode 100644
-index 000000000..2484cd515
---- /dev/null
-+++ b/ipmi-fru/ipmi-fru-oem-xilinx.h
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright (C) 2022, Advanced Micro Devices, Inc.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#ifndef IPMI_FRU_OEM_XILINX_H
-+#define IPMI_FRU_OEM_XILINX_H
-+
-+#include <freeipmi/freeipmi.h>
-+
-+#include "ipmi-fru_.h"
-+
-+/* Returns 1 on interpretation, 0 if not, -1 on error */
-+int ipmi_fru_oem_xilinx_oem_record (ipmi_fru_state_data_t *state_data,
-+                                    uint8_t record_type_id,
-+                                    uint32_t manufacturer_id,
-+                                    uint8_t *oem_data,
-+                                    unsigned int oem_data_len);
-+
-+#endif /* IPMI_FRU_OEM_XILINX_H */
-diff --git a/ipmi-fru/ipmi-fru-output.c b/ipmi-fru/ipmi-fru-output.c
-index 845971018..d29c4470e 100644
---- a/ipmi-fru/ipmi-fru-output.c
-+++ b/ipmi-fru/ipmi-fru-output.c
-@@ -51,6 +51,7 @@
- #include "ipmi-fru_.h"
- #include "ipmi-fru-output.h"
- #include "ipmi-fru-oem-wistron.h"
-+#include "ipmi-fru-oem-xilinx.h"
- #include "tool-util-common.h"
- 
- #include "freeipmi-portability.h"
-@@ -1201,6 +1202,19 @@ ipmi_fru_output_oem_record (ipmi_fru_state_data_t *state_data,
-           if (ret)
-             return (0);
-         }
-+
-+      if (manufacturer_id == IPMI_IANA_ENTERPRISE_ID_XILINX)
-+        {
-+          if ((ret = ipmi_fru_oem_xilinx_oem_record (state_data,
-+                                                     record_type_id,
-+                                                     manufacturer_id,
-+                                                     oem_data,
-+                                                     oem_data_len)) < 0)
-+            return (-1);
-+
-+          if (ret)
-+            return (0);
-+        }
-     }
- 
-   if (oem_data_len)
-diff --git a/libfreeipmi/include/freeipmi/freeipmi.h.in b/libfreeipmi/include/freeipmi/freeipmi.h.in
-index a03178e97..fbd6749e9 100644
---- a/libfreeipmi/include/freeipmi/freeipmi.h.in
-+++ b/libfreeipmi/include/freeipmi/freeipmi.h.in
-@@ -82,6 +82,7 @@ extern "C" {
- #include <freeipmi/record-format/ipmi-sdr-record-format.h>
- #include <freeipmi/record-format/ipmi-sel-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-fru-wistron-oem-record-format.h>
-+#include <freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-sdr-oem-intel-node-manager-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-sdr-oem-intel-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-sel-oem-intel-record-format.h>
-diff --git a/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h b/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h
-new file mode 100644
-index 000000000..434e2031a
---- /dev/null
-+++ b/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h
-@@ -0,0 +1,45 @@
-+/*
-+ * Copyright (C) 2022, Advanced Micro Devices, Inc.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#ifndef IPMI_FRU_OEM_XILINX_RECORD_FORMAT_H
-+#define IPMI_FRU_OEM_XILINX_RECORD_FORMAT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <freeipmi/fiid/fiid.h>
-+
-+/* OEM multi-record IDs used by Xilinx */
-+#define IPMI_FRU_OEM_XILINX_THERMAL   0xD0
-+#define IPMI_FRU_OEM_XILINX_POWER     0xD1
-+#define IPMI_FRU_OEM_XILINX_MAC_ID    0xD2
-+#define IPMI_FRU_OEM_XILINX_FREE_FORM 0xD3
-+
-+/* OEM MAC ID versions used by Xilinx */
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_BOARD        0x01
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_SYSCTL       0x11
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_MODULE       0x21
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_MAC      0x31
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT 0x32
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* IPMI_FRU_OEM_XILINX_RECORD_FORMAT_H */
-diff --git a/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h b/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h
-index d286f33a4..4c24b5259 100644
---- a/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h
-+++ b/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h
-@@ -29,6 +29,7 @@ extern "C" {
- #define IPMI_IANA_ENTERPRISE_ID_SUN_MICROSYSTEMS         42
- #define IPMI_IANA_ENTERPRISE_ID_INTEL                   343
- #define IPMI_IANA_ENTERPRISE_ID_DELL                    674
-+#define IPMI_IANA_ENTERPRISE_ID_XILINX                 4314
- #define IPMI_IANA_ENTERPRISE_ID_MAGNUM_TECHNOLOGIES    5593
- #define IPMI_IANA_ENTERPRISE_ID_QUANTA                 7244
- #define IPMI_IANA_ENTERPRISE_ID_FUJITSU               10368
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch b/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch
deleted file mode 100644
index c0f36405..00000000
--- a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c578c999b7d9aabbd6e54b0310a609b8f96ae962 Mon Sep 17 00:00:00 2001
-From: Albert Chu <chu11@llnl.gov>
-Date: Tue, 8 Nov 2022 16:33:39 -0800
-Subject: [PATCH] ipmi-fru: fix compilation for non C99 compilation
-
----
- ipmi-fru/ipmi-fru-oem-xilinx.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.c b/ipmi-fru/ipmi-fru-oem-xilinx.c
-index 87bb18f00..937aa7614 100644
---- a/ipmi-fru/ipmi-fru-oem-xilinx.c
-+++ b/ipmi-fru/ipmi-fru-oem-xilinx.c
-@@ -118,9 +118,11 @@ ipmi_fru_oem_xilinx_oem_record (ipmi_fru_state_data_t *state_data,
-       if (version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT &&
-           len == 4)
-         {
-+          unsigned int i;
-+
-           pstdout_printf (state_data->pstate, "  FRU OEM EtherCAT ID: 0x");
- 
--          for (unsigned int i = 1; i < len+1; i++)
-+          for (i = 1; i < len+1; i++)
-             {
-               pstdout_printf (state_data->pstate, "%02X", oem_data[i]);
-             }
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb b/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
index a9d60465..5ac2f4a6 100644
--- a/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
+++ b/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
@@ -30,13 +30,11 @@ LIC_FILES_CHKSUM = " \
 
 BRANCH ?= "freeipmi-1-6-0-stable"
 SRC_URI = " \
-        git://git.savannah.gnu.org/freeipmi.git;iprotocol=https;branch=${BRANCH} \
-        file://0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch \
-        file://0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch \
+        git://git.savannah.gnu.org/git/freeipmi.git;protocol=https;branch=${BRANCH} \
         "
-SRCREV ?= "1f7eea294c2967802019100b07cf1e44b3160a2b"
+SRCREV ?= "816a69eb15a9034351381211d9cd15de81da10c7"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit autotools-brokensep pkgconfig systemd
 
diff --git a/meta-xilinx-core/recipes-support/libgpg-error/libgpg-error_%.bbappend b/meta-xilinx-core/recipes-support/libgpg-error/libgpg-error_%.bbappend
index f3e920c2..d7d2cb6c 100644
--- a/meta-xilinx-core/recipes-support/libgpg-error/libgpg-error_%.bbappend
+++ b/meta-xilinx-core/recipes-support/libgpg-error/libgpg-error_%.bbappend
@@ -3,6 +3,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI:append:microblaze = " file://lock-obj-pub.microblazeel-unknown-linux-gnu.h"
 
 do_configure:append:microblaze () {
-        cp ${WORKDIR}/lock-obj-pub.microblazeel-unknown-linux-gnu.h ${S}/src/syscfg/
+        cp ${UNPACKDIR}/lock-obj-pub.microblazeel-unknown-linux-gnu.h ${S}/src/syscfg/
 }
 
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..cf0c778d
--- /dev/null
+++ b/meta-xilinx-core/recipes-utils/mb-realoc/mb-realoc.bb
@@ -0,0 +1,37 @@
+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"
+S = "${UNPACKDIR}"
+B = "${WORKDIR}/build"
+
+PARALLEL_MAKE=""
+
+do_configure[noexec]="1"
+do_compile[depends] = "virtual/bootloader:do_deploy"
+
+do_compile() {
+        export CROSS_COMPILE="${TARGET_PREFIX}"
+        ${S}/mb-realoc -l ${ELF_LOAD_ADDR} -i ${ELF_INFILE} -o ${OUTFILE_NAME}
+}
+
+do_install[noexec] = "1"
+
+do_deploy() {
+        install -d ${DEPLOYDIR}
+        install -m 0644 ${B}/${OUTFILE_NAME}.bin ${DEPLOYDIR}/${OUTFILE_NAME}.bin
+}
+
+addtask deploy after do_compile
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb
new file mode 100644
index 00000000..c203aa10
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.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-202320.2.16.0.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 = "${UNPACKDIR}/git/src"
+
+inherit cmake pkgconfig native
+
+DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native"
+
+EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -Dm 0755 ${B}/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
+}
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.bb
new file mode 100644
index 00000000..a5fa0fa9
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.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 = "${UNPACKDIR}/git/src"
+
+inherit cmake pkgconfig native
+
+DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native"
+
+EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -Dm 0755 ${B}/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
+}
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..191de878
--- /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 = "${UNPACKDIR}/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 ${B}/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
+}
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202310.2.15.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202310.2.15.0.inc
new file mode 100644
index 00000000..2f6a5c6a
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202310.2.15.0.inc
@@ -0,0 +1,7 @@
+REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+BRANCH= "2023.1"
+SRCREV= "64c933573e7e50a8aba939a74209590c2b739e8b"
+
diff --git a/meta-xilinx-core/recipes-xrt/xrt/files/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202310.2.15.0/xrt-cstdint.patch
index 67ca68c6..67ca68c6 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/files/xrt-cstdint.patch
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202310.2.15.0/xrt-cstdint.patch
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202320.2.16.0.inc
index 14b2b968..0ef2b1e5 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202320.2.16.0.inc
@@ -4,7 +4,6 @@ SRC_URI = "${REPO};${BRANCHARG};name=xrt"
 
 BRANCH= "2023.2"
 SRCREV_xrt = "2865a62b6a417dea523d2d5646154aa94a2cbc28"
-PV = "202320.2.16.0"
 
 SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https"
 SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202320.2.16.0/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202320.2.16.0/xrt-cstdint.patch
new file mode 100644
index 00000000..67ca68c6
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202320.2.16.0/xrt-cstdint.patch
@@ -0,0 +1,117 @@
+Add cstdint as necessary
+
+In GCC 13.1 usage of uint64 and similar will result in an error without
+ #include <cstdint>
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
+diff --git a/src/runtime_src/core/common/time.h b/src/runtime_src/core/common/time.h
+index a4a96b11d..585d38756 100644
+--- a/src/runtime_src/core/common/time.h
++++ b/src/runtime_src/core/common/time.h
+@@ -19,6 +19,7 @@
+ 
+ #include "core/common/config.h"
+ #include <string>
++#include <cstdint>
+ 
+ namespace xrt_core {
+ 
+diff --git a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+index 196304765..36ce35e80
+--- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
++++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+@@ -18,6 +18,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ namespace adf
+ {
+diff --git a/src/runtime_src/core/edge/user/zynq_dev.h b/src/runtime_src/core/edge/user/zynq_dev.h
+index 6fe36c615..2abd7473b 100644
+--- a/src/runtime_src/core/edge/user/zynq_dev.h
++++ b/src/runtime_src/core/edge/user/zynq_dev.h
+@@ -19,6 +19,7 @@
+ #include <fstream>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ class zynq_device {
+ public:
+diff --git a/src/runtime_src/tools/xclbinutil/CBOR.h b/src/runtime_src/tools/xclbinutil/CBOR.h
+index 368459f59..acbf6ebae 100644
+--- a/src/runtime_src/tools/xclbinutil/CBOR.h
++++ b/src/runtime_src/tools/xclbinutil/CBOR.h
+@@ -22,6 +22,7 @@
+ // #includes here - please keep these to a bare minimum!
+ #include <string>
+ #include <sstream>
++#include <cstdint>
+ 
+ // ------------ F O R W A R D - D E C L A R A T I O N S ----------------------
+ // Forward declarations - use these instead whenever possible...
+diff --git a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
+index 361015962..1c3bca18d 100644
+--- a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
++++ b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
+@@ -19,6 +19,7 @@
+ 
+ // ----------------------- I N C L U D E S -----------------------------------
+ #include <sstream>
++#include <cstdint>
+ #include <string>
+ 
+ // ----------- C L A S S :   D T C S t r i n g s B l o c k -------------------
+diff --git a/src/runtime_src/tools/xclbinutil/XclBinSignature.h b/src/runtime_src/tools/xclbinutil/XclBinSignature.h
+index b19ab56a4..f1b72d4d2 100644
+--- a/src/runtime_src/tools/xclbinutil/XclBinSignature.h
++++ b/src/runtime_src/tools/xclbinutil/XclBinSignature.h
+@@ -18,6 +18,7 @@
+ #define __XclBinSignature_h_
+ 
+ #include <string>
++#include <cstdint>
+ 
+ // ----------------------- I N C L U D E S -----------------------------------
+ 
+diff --git a/src/runtime_src/xdp/profile/database/events/vtf_event.h b/src/runtime_src/xdp/profile/database/events/vtf_event.h
+index f8d0121db..b5f36554c 100644
+--- a/src/runtime_src/xdp/profile/database/events/vtf_event.h
++++ b/src/runtime_src/xdp/profile/database/events/vtf_event.h
+@@ -19,6 +19,7 @@
+ #define VTF_EVENT_DOT_H
+ 
+ #include <fstream>
++#include <cstdint>
+ 
+ #include "xdp/config.h"
+ 
+diff --git a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
+index 98c57de2e..6077bd247 100644
+--- a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
++++ b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
+@@ -17,7 +17,8 @@
+ #ifndef XDP_PROFILE_AIE_TRACE_LOGGER_H
+ #define XDP_PROFILE_AIE_TRACE_LOGGER_H
+ 
+-#include<iostream>
++#include <iostream>
++#include <cstdint>
+ 
+ namespace xdp {
+ 
+diff --git a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
+index a88597464..f392ec0e6 100644
+--- a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
++++ b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
+@@ -19,6 +19,7 @@
+ 
+ #include <fstream>
+ #include <string>
++#include <cstdint>
+ 
+ #include "xdp/config.h"
+ 
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.inc
new file mode 100644
index 00000000..8041e5be
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.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}"
+
+BRANCH= "2024.1"
+SRCREV = "2c7ff250504589bd1f934010e37bdcef86afaa54"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319/xrt-cstdint.patch
new file mode 100644
index 00000000..b83c5ef7
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319/xrt-cstdint.patch
@@ -0,0 +1,32 @@
+Add cstdint as necessary
+
+In GCC 13.1 usage of uint64 and similar will result in an error without
+ #include <cstdint>
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
+Index: src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+===================================================================
+--- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
++++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+@@ -18,6 +18,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ namespace adf
+ {
+Index: src/runtime_src/core/edge/user/zynq_dev.h
+===================================================================
+--- a/src/runtime_src/core/edge/user/zynq_dev.h
++++ b/src/runtime_src/core/edge/user/zynq_dev.h
+@@ -19,6 +19,7 @@
+ #include <fstream>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ class zynq_device {
+ public:
+ 
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
new file mode 100644
index 00000000..8a78d2f9
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
@@ -0,0 +1,57 @@
+SUMMARY  = "Xilinx Runtime(XRT) libraries"
+DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
+
+require xrt-${PV}.inc
+
+SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
+
+LICENSE = "GPL-2.0-or-later & Apache-2.0"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \
+                    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 "
+
+COMPATIBLE_MACHINE ?= "^$"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
+
+S = "${UNPACKDIR}/git/src"
+
+inherit cmake pkgconfig
+
+BBCLASSEXTEND = "native nativesdk"
+
+# util-linux is for libuuid-dev.
+DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson 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 \
+                "
+
+# 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/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
index ef3c7172..abb0190d 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
@@ -1,7 +1,7 @@
 SUMMARY  = "Xilinx Runtime(XRT) libraries"
 DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
 
-require xrt.inc
+require xrt-${PV}.inc
 
 SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
 
@@ -16,32 +16,28 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
 COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig
 
 BBCLASSEXTEND = "native nativesdk"
 
 # util-linux is for libuuid-dev.
-DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson"
+DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson 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 \
                 "
 
 # 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.
 
-EXTRA_OECMAKE:append:versal = " -DXRT_LIBDFX=true"
-EXTRA_OECMAKE:append:zynqmp = " -DXRT_LIBDFX=true"
-DEPENDS:append:versal = " libdfx"
-DEPENDS:append:zynqmp = " libdfx"
-
-
 FILES_SOLIBSDEV = ""
 FILES:${PN} += "\
     ${libdir}/lib*.so \
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
new file mode 100644
index 00000000..c88450c2
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb
@@ -0,0 +1,58 @@
+SUMMARY  = "Xilinx Runtime(XRT) libraries"
+DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
+
+require xrt-${PV}.inc
+
+SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
+
+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_MACHINE ?= "^$"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
+
+S = "${UNPACKDIR}/git/src"
+
+inherit cmake pkgconfig
+
+BBCLASSEXTEND = "native nativesdk"
+
+# util-linux is for libuuid-dev.
+DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson 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 \
+                "
+
+# 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/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..d9a44019
--- /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 = "${UNPACKDIR}/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/files/0001-Fixed-ZOCL-dtbo-path-len-issue-6966.patch b/meta-xilinx-core/recipes-xrt/zocl/files/0001-Fixed-ZOCL-dtbo-path-len-issue-6966.patch
new file mode 100644
index 00000000..0f5fc088
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/zocl/files/0001-Fixed-ZOCL-dtbo-path-len-issue-6966.patch
@@ -0,0 +1,84 @@
+From bc19f980cced50fc35f94905f2a99070871b9e93 Mon Sep 17 00:00:00 2001
+From: Saifuddin Kaijar <54270703+saifuddin-xilinx@users.noreply.github.com>
+Date: Mon, 29 Aug 2022 10:25:06 +0530
+Subject: [PATCH] Fixed ZOCL dtbo path len issue (#6966)
+
+---
+ src/runtime_src/core/edge/drm/zocl/include/zocl_xclbin.h | 3 ++-
+ src/runtime_src/core/edge/drm/zocl/zocl_xclbin.c         | 7 ++++---
+ src/runtime_src/core/edge/include/zynq_ioctl.h           | 1 +
+ src/runtime_src/core/edge/user/shim.cpp                  | 1 +
+ 4 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/runtime_src/core/edge/drm/zocl/include/zocl_xclbin.h b/src/runtime_src/core/edge/drm/zocl/include/zocl_xclbin.h
+index c9c9b4f9e..0335551bc 100644
+--- a/src/runtime_src/core/edge/drm/zocl/include/zocl_xclbin.h
++++ b/src/runtime_src/core/edge/drm/zocl/include/zocl_xclbin.h
+@@ -39,6 +39,7 @@ int zocl_xclbin_load_pdi(struct drm_zocl_dev *zdev, void *data,
+                        struct drm_zocl_slot *slot);
+ int zocl_xclbin_load_pskernel(struct drm_zocl_dev *zdev, void *data);
+ bool zocl_xclbin_accel_adapter(int kds_mask);
+-int zocl_xclbin_set_dtbo_path(struct drm_zocl_slot *slot, char *dtbo_path);
++int zocl_xclbin_set_dtbo_path(struct drm_zocl_slot *slot, char *dtbo_path,
++                     uint32_t len);
+ 
+ #endif /* _ZOCL_XCLBIN_H_ */
+diff --git a/src/runtime_src/core/edge/drm/zocl/zocl_xclbin.c b/src/runtime_src/core/edge/drm/zocl/zocl_xclbin.c
+index 7de733e38..fdedb70d5 100644
+--- a/src/runtime_src/core/edge/drm/zocl/zocl_xclbin.c
++++ b/src/runtime_src/core/edge/drm/zocl/zocl_xclbin.c
+@@ -1475,7 +1475,8 @@ zocl_xclbin_read_axlf(struct drm_zocl_dev *zdev, struct drm_zocl_axlf *axlf_obj,
+         */
+        slot->slot_xclbin->zx_refcnt = 0;
+        if(ZOCL_PLATFORM_ARM64)
+-               zocl_xclbin_set_dtbo_path(slot, axlf_obj->za_dtbo_path);
++               zocl_xclbin_set_dtbo_path(slot, axlf_obj->za_dtbo_path,
++                       axlf_obj->za_dtbo_path_len);
+        zocl_xclbin_set_uuid(slot, &axlf_head.m_header.uuid);
+ 
+        /*
+@@ -1725,7 +1726,8 @@ zocl_xclbin_fini(struct drm_zocl_dev *zdev, struct drm_zocl_slot *slot)
+  * @return      0 on success Error code on failure.
+  */
+ int
+-zocl_xclbin_set_dtbo_path(struct drm_zocl_slot *slot, char *dtbo_path)
++zocl_xclbin_set_dtbo_path(struct drm_zocl_slot *slot, char *dtbo_path,
++               uint32_t len)
+ {
+         char *path = slot->slot_xclbin->zx_dtbo_path;
+ 
+@@ -1735,7 +1737,6 @@ zocl_xclbin_set_dtbo_path(struct drm_zocl_slot *slot, char *dtbo_path)
+         }
+ 
+        if(dtbo_path) {
+-               uint32_t len = strlen(dtbo_path);
+                path = vmalloc(len + 1);
+                if (!path)
+                        return -ENOMEM;
+diff --git a/src/runtime_src/core/edge/include/zynq_ioctl.h b/src/runtime_src/core/edge/include/zynq_ioctl.h
+index a45113550..ad9ec86ab 100644
+--- a/src/runtime_src/core/edge/include/zynq_ioctl.h
++++ b/src/runtime_src/core/edge/include/zynq_ioctl.h
+@@ -429,6 +429,7 @@ struct drm_zocl_axlf {
+        char                    *za_kernels;
+        uint32_t                za_slot_id;
+        char                    *za_dtbo_path;
++       uint32_t                za_dtbo_path_len;
+        uint8_t                 hw_gen;
+        struct drm_zocl_kds     kds_cfg;
+ };
+diff --git a/src/runtime_src/core/edge/user/shim.cpp b/src/runtime_src/core/edge/user/shim.cpp
+index 11a8d86c9..058503187 100644
+--- a/src/runtime_src/core/edge/user/shim.cpp
++++ b/src/runtime_src/core/edge/user/shim.cpp
+@@ -732,6 +732,7 @@ xclLoadAxlf(const axlf *buffer)
+       .za_kernels = NULL,
+       .za_slot_id = 0, // TODO Cleanup: Once uuid interface id available we need to remove this
+       .za_dtbo_path = const_cast<char *>(dtbo_path.c_str()),
++      .za_dtbo_path_len = dtbo_path.length(),
+       .hw_gen = hw_gen,
+     };
+ 
+-- 
+2.17.1
+
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_git.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
index 6bd579f4..998ff99c 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_git.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 
 COMPATIBLE_MACHINE:microblaze = "none"
 
-require recipes-xrt/xrt/xrt.inc
+require recipes-xrt/xrt/xrt-${PV}.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
 LICENSE = "GPL-2.0-or-later & Apache-2.0"
@@ -11,8 +11,9 @@ 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"
+S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
new file mode 100644
index 00000000..998ff99c
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
@@ -0,0 +1,26 @@
+SUMMARY  = "Xilinx Runtime(XRT) driver module"
+DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
+
+COMPATIBLE_MACHINE:microblaze = "none"
+
+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 = "${UNPACKDIR}/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
+}
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb
new file mode 100644
index 00000000..998ff99c
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb
@@ -0,0 +1,26 @@
+SUMMARY  = "Xilinx Runtime(XRT) driver module"
+DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
+
+COMPATIBLE_MACHINE:microblaze = "none"
+
+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 = "${UNPACKDIR}/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
+}
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..9a1e3574
--- /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 = "${UNPACKDIR}/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
+}