135 files changed, 5493 insertions, 676 deletions

diff --git a/meta-xilinx-core/classes/xilinx-microblaze.bbclass b/meta-xilinx-core/classes-global/xilinx-microblaze.bbclass
index ed231a3a..ed231a3a 100644
--- a/meta-xilinx-core/classes/xilinx-microblaze.bbclass
+++ b/meta-xilinx-core/classes-global/xilinx-microblaze.bbclass
diff --git a/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass b/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
new file mode 100644
index 00000000..ed4c1f87
--- /dev/null
+++ b/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
@@ -0,0 +1,142 @@
+#
+# Copyright (C) 2023, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+
+QSPI_SIZE ?= "0x2280000"
+
+# Register values
+IDN_REG ?= "0x4D554241"
+VERSION_REG ?= "0x1"
+LENGTH_REG ?= "0x4"
+PERSISTENT_REG ?= "0x01010000"
+
+# QSPI Offsets
+IMAGE_SELECTOR_OFFSET ?= "0x0"
+IMAGE_SELECTOR_BACKUP_OFFSET ?= "0x80000"
+PERSISTENT_REG_OFFSET ?= "0x100000"
+PERSISTENT_REG_BACKUP_OFFSET ?= "0x120000"
+IMAGE_A_OFFSET ?= "0x200000"
+IMAGE_A_IMGSEL_OFFSET ?= "0xF00000"
+IMAGE_B_OFFSET ?= "0xF80000"
+IMAGE_B_IMGSEL_OFFSET ?= "0x1C80000"
+IMAGE_RCVRY_OFFSET ?= "0x1E00000"
+IMAGE_RCVRY_BACKUP_OFFSET ?= "0x2000000"
+VERSION_OFFSET ?= "0x2240000"
+CHECKSUM_OFFSET ?= "0x2250000"
+
+def generate_spi_image(d):
+
+    import io
+    import hashlib
+    import time
+
+    qspi_size = int(d.getVar("QSPI_SIZE") or '0', 0)
+    int(d.getVar("QSPI_SIZE") or '0', 0)
+
+    # Register values
+    idn_reg = int(d.getVar("IDN_REG") or '0', 0)
+    version_reg = int(d.getVar("VERSION_REG") or '0', 0)
+    length_reg = int(d.getVar("LENGTH_REG") or '0', 0)
+    persistent_reg = int(d.getVar("PERSISTENT_REG") or '0', 0)
+
+    # QSPI Offsets
+    image_selector_offset = int(d.getVar("IMAGE_SELECTOR_OFFSET") or '0', 0)
+    image_selector_backup_offset = int(d.getVar("IMAGE_SELECTOR_BACKUP_OFFSET") or '0', 0)
+    persistent_reg_offset = int(d.getVar("PERSISTENT_REG_OFFSET") or '0', 0)
+    persistent_reg_backup_offset = int(d.getVar("PERSISTENT_REG_BACKUP_OFFSET") or '0', 0)
+    image_a_offset = int(d.getVar("IMAGE_A_OFFSET") or '0', 0)
+    image_a_imgsel_offset = int(d.getVar("IMAGE_A_IMGSEL_OFFSET") or '0', 0)
+    image_b_offset = int(d.getVar("IMAGE_B_OFFSET") or '0', 0)
+    image_b_imgsel_offset = int(d.getVar("IMAGE_B_IMGSEL_OFFSET") or '0', 0)
+    image_rcvry_offset = int(d.getVar("IMAGE_RCVRY_OFFSET") or '0', 0)
+    image_rcvry_backup_offset = int(d.getVar("IMAGE_RCVRY_BACKUP_OFFSET") or '0', 0)
+    version_offset = int(d.getVar("VERSION_OFFSET") or '0', 0)
+    checksum_offset = int(d.getVar("CHECKSUM_OFFSET") or '0', 0)
+
+    # QSPI data
+    qspi_data = io.BytesIO()
+    qspi_data.write(b'\xFF' * qspi_size)
+
+    # Image Selector - Primary, Backup, Image A and Image B
+    imgsel_file = d.getVar("DEPLOY_DIR_IMAGE")+"/imgsel-"+d.getVar("MACHINE")+".bin"
+    try:
+        with open(imgsel_file, "rb") as il:
+            imgsel = il.read(-1)
+    except OSError as err:
+        bb.fatal("Unable to open imgsel file: " + str(err))
+
+    qspi_data.seek(image_selector_offset)
+    qspi_data.write(imgsel)
+    qspi_data.seek(image_selector_backup_offset)
+    qspi_data.write(imgsel)
+    qspi_data.seek(image_a_imgsel_offset)
+    qspi_data.write(imgsel)
+    qspi_data.seek(image_b_imgsel_offset)
+    qspi_data.write(imgsel)
+
+    # Persistent Registers - Primary and Backup
+    p_reg = [idn_reg, version_reg, length_reg, persistent_reg, \
+            image_a_offset, image_b_offset, image_rcvry_offset]
+    checksum = 0xffffffff - (0xffffffff & sum(p_reg))
+    p_reg.insert(3, checksum)
+
+    qspi_data.seek(persistent_reg_offset)
+    for value in p_reg:
+        qspi_data.write(value.to_bytes(4, byteorder="little"))
+
+    qspi_data.seek(persistent_reg_backup_offset)
+    for value in p_reg:
+        qspi_data.write(value.to_bytes(4, byteorder="little"))
+
+    # Image A and B - boot.bin
+    try:
+        with open(d.getVar("DEPLOY_DIR_IMAGE")+"/boot.bin", "rb") as bo:
+            bootbin = bo.read(-1)
+    except OSError as err:
+        bb.fatal("Unable to open boot.bin file: " + str(err))
+
+    qspi_data.seek(image_a_offset)
+    qspi_data.write(bootbin)
+    qspi_data.seek(image_b_offset)
+    qspi_data.write(bootbin)
+
+    # Recovery Image & Recovery Image Backup
+    imgrcry_file = d.getVar("DEPLOY_DIR_IMAGE")+"/imgrcry-"+d.getVar("MACHINE")+".bin"
+    try:
+        with open(imgrcry_file, "rb") as iy:
+            imgrcry = iy.read(-1)
+    except OSError as err:
+        bb.fatal("Unable to open imgrcry file: " + str(err))
+
+    qspi_data.seek(image_rcvry_offset)
+    qspi_data.write(imgrcry)
+    qspi_data.seek(image_rcvry_backup_offset)
+    qspi_data.write(imgrcry)
+
+    # Version string and checksum
+    version = d.getVar("QSPI_IMAGE_VERSION")
+    date = time.strftime("%m%d%H%M")
+    machine = d.getVar("MACHINE")[:3]
+    image_name = d.getVar("QSPI_IMAGE_NAME")
+
+    qspi_version = f"{image_name}-{machine}-v{version}-{date}\x00"
+    qspi_data.seek(version_offset)
+    qspi_data.write(qspi_version.encode())
+
+    qspi_sha = hashlib.sha256(qspi_data.getbuffer())
+    qspi_data.seek(checksum_offset)
+    qspi_data.write(qspi_sha.digest())
+
+    # Write the QSPI data to file
+    with open(d.getVar("B") + "/" + d.getVar("IMAGE_NAME") + ".bin", "wb") as sq:
+        sq.write(qspi_data.getbuffer())
+
+do_compile[depends] += "virtual/boot-bin:do_deploy virtual/imgsel:do_deploy virtual/imgrcry:do_deploy"
+
+python amd_spi_image_do_compile() {
+    generate_spi_image(d)
+}
+
+EXPORT_FUNCTIONS do_compile
diff --git a/meta-xilinx-core/classes/dfx_user_dts.bbclass b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
index 4404aa05..2b699d9d 100644
--- a/meta-xilinx-core/classes/dfx_user_dts.bbclass
+++ b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
@@ -1,3 +1,8 @@
+#
+# Copyright (C) 2023-2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
 # This bbclass is inherited by flat, DFx Static and DFx RP firmware recipes.
 # dfx_user_dts.bbclass expects user to generate pl dtsi for flat, DFx Static
 # and DFx RP xsa outside of yocto.
@@ -25,12 +30,23 @@ S ?= "${WORKDIR}"
 FW_DIR ?= ""
 DTSI_PATH ?= ""
 DTBO_PATH ?= ""
+BIT_PATH ?= ""
+BIN_PATH ?= ""
+PDI_PATH ?= ""
+JSON_PATH ?= ""
+XCl_PATH ?= ""
 DT_FILES_PATH = "${S}/${DTSI_PATH}"
 FIRMWARE_NAME_DT_FILE ?= ""
 USER_DTS_FILE ?= ""
 
 FIRMWARE_NAME_DT_FILE[doc] = "DT file which has firmware-name device-tree property"
 USER_DTS_FILE[doc] = "Final DTSI or DTS file which is used for packaging final DT overlay"
+DTSI_PATH[doc] = "Absolute '.dtsi' or ''.dts' file path as input to SRC_URI"
+DTBO_PATH[doc] = "Absolute '.dtbo' file path as input to SRC_URI"
+BIT_PATH[doc] = "Absolute '.bit' file path as input to SRC_URI"
+BIN_PATH[doc] = "Absolute '.bin' file path as input to SRC_URI"
+JSON_PATH[doc] = "Absolute '.json' file path as input to SRC_URI"
+XCL_PATH[doc] = "Absolute '.xclbin' file path as input to SRC_URI"
 
 python() {
     import re
@@ -45,37 +61,59 @@ python() {
         pdi_found = False
 
         # Required Inputs
-        if '.dtsi' in d.getVar("SRC_URI") or '.dts' in d.getVar("SRC_URI"):
-            dtsi_found = True
-            d.setVar("DTSI_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.dtsi' in a or '.dts' in a][0].lstrip('file://')))
-
-        if '.dtbo' in d.getVar("SRC_URI"):
-            dtbo_found = True
-            d.setVar("DTBO_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.dtbo' in a][0].lstrip('file://')))
-
-        if '.bit' in d.getVar("SRC_URI") and soc_family != "versal":
-            bit_found = True
-            d.setVar("BIT_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.bit' in a][0].lstrip('file://')))
+        for s in d.getVar("SRC_URI").split():
+            if s.endswith(('.dtsi', '.dts')):
+                dtsi_found = True
+                d.setVar("DTSI_PATH",os.path.dirname(s.lstrip('file://')))
+            if s.endswith('.dtbo'):
+                if dtbo_found:
+                    bb.warn("More then one '.dtbo' file specified in SRC_URI.")
+                dtbo_found = True
+                d.setVar("DTBO_PATH",os.path.dirname(s.lstrip('file://')))
+            if soc_family == "zynq" or soc_family == "zynqmp":
+                if s.endswith('.bit'):
+                    if bit_found:
+                        bb.warn("More then one '.bit' file specified in SRC_URI.")
+                    bit_found = True
+                    d.setVar("BIT_PATH",os.path.dirname(s.lstrip('file://')))
+                if s.endswith('.bin'):
+                    if bin_found:
+                        bb.warn("More then one '.bin' file specified in SRC_URI.")
+                    bin_found = True
+                    d.setVar("BIN_PATH",os.path.dirname(s.lstrip('file://')))
+            else:
+                if s.endswith('.pdi'):
+                    if pdi_found:
+                        bb.warn("More then one '.pdi' file specified in SRC_URI.")
+                    pdi_found = True
+                    d.setVar("PDI_PATH",os.path.dirname(s.lstrip('file://')))
 
-        if '.bin' in d.getVar("SRC_URI") and soc_family != "versal":
-            bin_found = True
-            d.setVar("BIT_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.bin' in a][0].lstrip('file://')))
+            # Optional input
+            if s.endswith('.json'):
+                d.setVar("JSON_PATH",os.path.dirname(s.lstrip('file://')))
 
-        if '.pdi' in d.getVar("SRC_URI") and soc_family == "versal":
-            pdi_found = True
-            d.setVar("PDI_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.pdi' in a][0].lstrip('file://')))
+            if s.endswith('.xclbin'):
+                d.setVar("XCL_PATH",os.path.dirname(s.lstrip('file://')))
 
         # Check for valid combination of input files in SRC_URI
-        if dtsi_found or dtbo_found:
-            bb.debug(2, "dtsi or dtbo found in SRC_URI")
-            if bit_found or pdi_found or bin_found:
-                bb.debug(2, "bitstream or pdi found in SRC_URI")
-            elif bit_found and bin_found:
+        # Skip recipe if any of the below conditions are not satisfied.
+        # 1. At least one bit or bin or pdi or dts or dtsi or dtbo should exists.
+        # 2. More than one dtbo.
+        # 3. More than one bit or bin or pdi.
+        # 4. More than one dts and zero dtsi.
+        # 5. More than one dtsi and zero dts.
+        if dtsi_found or dtbo_found or bit_found or bin_found or pdi_found:
+            bb.debug(2, "dtsi or dtbo or bitstream or pdi found in SRC_URI")
+            if bit_found and pdi_found :
+                raise bb.parse.SkipRecipe("Both '.bit' and '.pdi' file found in SRC_URI, this is invalid use case.")
+
+            if bin_found and pdi_found :
+                raise bb.parse.SkipRecipe("Both '.bin' and '.pdi' file found in SRC_URI, this is invalid use case.")
+
+            if bit_found and bin_found:
                 raise bb.parse.SkipRecipe("Both '.bit' and '.bin' file found in SRC_URI, either .bit or .bin file is supported but not both.")
-            else:
-                raise bb.parse.SkipRecipe("Need one '.bit' or one '.pdi' file added to SRC_URI ")
         else:
-            raise bb.parse.SkipRecipe("Need one '.dtsi' or one '.dtbo' file added to SRC_URI ")
+            raise bb.parse.SkipRecipe("Need one '.dtsi' or '.dtbo' or '.bit' or '.bin' or '.pdi' file added to SRC_URI ")
 
         # Check for valid combination of dtsi and dts files in SRC_URI
         # Following file combinations are not supported use case.
@@ -90,27 +128,14 @@ python() {
             raise bb.parse.SkipRecipe("Recipe has more than one '.dtsi' and zero '.dts' found, this is an unsupported use case")
         elif dts_count > 1:
             raise bb.parse.SkipRecipe("Recipe has more than one '.dts' and zero or more than one '.dtsi' found, this is an unsupported use case")
-
-        # Optional input
-        if '.json' in d.getVar("SRC_URI"):
-            d.setVar("JSON_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.json' in a][0].lstrip('file://')))
-
-        if '.xclbin' in d.getVar("SRC_URI"):
-            d.setVar("XCL_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.xclbin' in a][0].lstrip('file://')))
 }
 
-# Function to get dts or dtsi file count.
-def get_dt_count(d, dt_ext):
-    import glob
-    dt_count = sum(1 for f in glob.iglob((d.getVar('S') + (d.getVar('DTSI_PATH')) + '/*.' + dt_ext),recursive=True) if os.path.isfile(f))
-    return dt_count
-
 # Function to search for dt firmware-name property in dts or dtsi file.
 python find_firmware_file() {
     import glob
     pattern_fw = 'firmware-name'
     search_count = 0
-    for dt_files in glob.iglob((d.getVar('S') + (d.getVar('DTSI_PATH')) + '/*.dts*'),recursive=True):
+    for dt_files in glob.iglob((d.getVar('S') + '/' + (d.getVar('DTSI_PATH')) + '/*.dts*'),recursive=True):
         with open(dt_files, "r") as f:
             current_fd = f.read()
             if pattern_fw in current_fd:
@@ -129,20 +154,20 @@ python do_configure() {
     soc_family = d.getVar("SOC_FAMILY")
 
     if bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', False, True, d):
-        bb.warn("Using fpga-manager.bbclass requires fpga-overlay MACHINE_FEATURE to be enabled")
+        bb.warn("Using dfx_user_dts.bbclass requires fpga-overlay MACHINE_FEATURE to be enabled")
 
     # Renaming firmware-name using $PN as bitstream/PDI will be renamed using
     # $PN when generating the bin/pdi file.
-    if os.path.isfile(d.getVar('S') + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
-        orig_dtsi = glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE'))[0]
-        new_dtsi = d.getVar('S') + '/pl.dtsi_firmwarename'
+    if os.path.isfile(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
+        orig_dtsi = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE'))[0]
+        new_dtsi = d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/pl.dtsi_firmwarename'
         with open(new_dtsi, 'w') as newdtsi:
             with open(orig_dtsi) as olddtsi:
                 for line in olddtsi:
-                    if soc_family == 'versal':
-                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.pdi\"',line))
+                    if soc_family == 'zynq' or soc_family == 'zynqmp':
+                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.bin\"',line))
                     else:
-                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.bit.bin\"',line))
+                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.pdi\"',line))
         shutil.move(new_dtsi,orig_dtsi)
 }
 
@@ -153,38 +178,37 @@ python devicetree_do_compile:append() {
     soc_family = d.getVar("SOC_FAMILY")
 
     dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
-
-    # Skip devicetree do_compile task if input file is dtbo in SRC_URI
-    if not dtbo_count:
-        # Convert .bit to bit.bin format only if dtsi is input.
-        # In case of dtbo as input, bbclass doesn't know if firmware-name is .bit or
-        # .bit.bin format and corresponding file name. Hence we are not doing
-        # bit.bin conversion.
-        if soc_family != 'versal' and glob.glob(d.getVar('S') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
+    bin_count = sum(1 for f in glob.iglob((d.getVar('S') + '/*.bin'),recursive=True) if os.path.isfile(f))
+    # Skip devicetree do_compile task if input file is dtbo or bin in SRC_URI
+    if not dtbo_count and not bin_count:
+        # Convert .bit to .bin format only if dtsi is input.
+        # In case of dtbo as input, bbclass doesn't know if firmware-name is .bit
+        # or .bin format and corresponding file name. Hence we are not doing .bin
+        # conversion.
+        if soc_family == 'zynq' or soc_family == 'zynqmp' and glob.glob(d.getVar('S') + '/' +(d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
             pn = d.getVar('PN')
             biffile = pn + '.bif'
-
             with open(biffile, 'w') as f:
-                f.write('all:\n{\n\t' + glob.glob(d.getVar('S')+(d.getVar('BIT_PATH') or '') + '/*.bit')[0] + '\n}')
+                f.write('all:\n{\n\t' + glob.glob(d.getVar('S') + '/' + (d.getVar('BIT_PATH') or '') + '/*.bit')[0] + '\n}')
 
             bootgenargs = ["bootgen"] + (d.getVar("BOOTGEN_FLAGS") or "").split()
-            bootgenargs += ["-image", biffile, "-o", pn + ".bit.bin"]
+            bootgenargs += ["-image", biffile, "-o", pn + ".bin"]
             subprocess.run(bootgenargs, check = True)
 
             # In Zynq7k using both "-process_bitstream bin" and "-o" in bootgen flag,
             # to convert bit file to bin format, "-o" option will not be effective
-            # and generated output file name is ${S}+${BIT_PATH}/<bit_file_name>.bit.bin
-            # file, Hence we need to rename this file from <bit_file_name>.bit.bin to
-            # ${PN}.bit.bin which matches the firmware name in dtbo and move
-            # ${PN}.bit.bin to ${B} directory.
+            # and generated output file name is ${S}+${BIT_PATH}/<bit_file_name>.bin
+            # file, Hence we need to rename this file from <bit_file_name>.bin to
+            # ${PN}.bin which matches the firmware name in dtbo and move
+            # ${PN}.bin to ${B} directory.
             if soc_family == 'zynq':
-                src_bitbin_file = glob.glob(d.getVar('S') + (d.getVar('BIT_PATH') or '') + '/*.bit.bin')[0]
-                dst_bitbin_file = d.getVar('B') + '/' + pn + '.bit.bin'
+                src_bitbin_file = glob.glob(d.getVar('S') + '/' + (d.getVar('BIT_PATH') or '') + '/*.bin')[0]
+                dst_bitbin_file = d.getVar('B') + '/' + pn + '.bin'
                 shutil.move(src_bitbin_file, dst_bitbin_file)
 
-            if not os.path.isfile(pn + ".bit.bin"):
+            if not os.path.isfile(pn + ".bin"):
                 bb.fatal("Couldn't find %s file, Enable '-log trace' in BOOTGEN_FLAGS" \
-                    "and check bootgen_log.txt" % (d.getVar('B') + '/' + pn + '.bit.bin'))
+                    "and check bootgen_log.txt" % (d.getVar('B') + '/' + pn + '.bin'))
 }
 
 # If user inputs both dtsi and dts files then device-tree will generate dtbo
@@ -192,17 +216,23 @@ python devicetree_do_compile:append() {
 # overlay file.
 python find_user_dts_overlay_file() {
     import glob
-    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
-    # Skip if input file is dtbo in SRC_URI
-    if not dtbo_count:
-        dts_count = get_dt_count(d, 'dts')
-        dtsi_count = get_dt_count(d, 'dtsi')
+    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTBO_PATH') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
+    dts_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTSI_PATH') + '/*.dts'),recursive=True) if os.path.isfile(f))
+    dtsi_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTSI_PATH') + '/*.dtsi'),recursive=True) if os.path.isfile(f))
+    # Set USER_DTS_FILE if input file is dts/dtsi in SRC_URI else skip operation.
+    if not dtbo_count and dts_count or dtsi_count:
         if dtsi_count == 1 and dts_count == 0:
-            dts_file =glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/*.dtsi')[0]
+            dts_file = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/*.dtsi')[0]
         elif dtsi_count >=0 and dts_count == 1:
-            dts_file = glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/*.dts')[0]
+            dts_file = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/*.dts')[0]
+        else:
+            dts_file = ''
 
         d.setVar('USER_DTS_FILE', os.path.splitext(os.path.basename(dts_file))[0])
+    elif dtbo_count:
+        bb.debug(2, "Firmware recipe input file is dtbo in SRC_URI")
+    else:
+        bb.debug(2, "Firmware recipe input file is bit/bin/pdi in SRC_URI")
 }
 
 do_install[prefuncs] += "find_user_dts_overlay_file"
@@ -210,8 +240,12 @@ do_install[prefuncs] += "find_user_dts_overlay_file"
 do_install() {
     install -d ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
 
+    # Install dtbo
     # In case of dtbo as input, dtbo will be copied from directly from ${S}
     # In case of dtsi as input, dtbo will be copied from directly from ${B}
+    # If more than one dtbo file is found then fatal the task.
+    # If no dtbo file is found add warning message as in some use case if IP
+    # doesn't have any driver then user can load pdi/bit/bin file.
     if [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
         install -Dm 0644 ${S}/*.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
     elif [ `ls ${S}/*.dtbo | wc -l` -gt 1 ]; then
@@ -219,44 +253,56 @@ do_install() {
     elif [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
         install -Dm 0644 ${B}/${USER_DTS_FILE}.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.dtbo
     else
-        bbfatal "A dtbo ending '.dtbo' expected but not found"
+        bbnote "A dtbo ending '.dtbo' expected but not found in ${S} or ${B}, This means firmware can be loaded without dtbo dependency."
     fi
 
-    if [ "${SOC_FAMILY}" == "versal" ]; then
-        # In case of dtbo as input, pdi will be copied from directly from ${S}
-        # without renaming the pdi name to ${PN}.pdi
-        if [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
-            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ `ls ${S}/*.pdi | wc -l` -gt 1 ]; then
-            bbfatal "Multiple PDI found, use the right PDI in SRC_URI from the following:\n$(basename -a ${S}/*.pdi)"
-        elif [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
-            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.pdi
-        else
-            bbfatal "A PDI file with '.pdi' expected but not found"
-        fi
-    else
-        # In case of dtbo as input, .bit or .bin will be copied from directly
-        # from ${S} without renaming the .bit/.bin name to ${PN}.bit/${PN}.bin
-        # if more than one .bit/.bin file is found then fail the task.
+    # Install bit or bin if soc family is zynq-7000 or zynqmp.
+    # In case of dtbo as input or no dtbo exists in ${B}, then .bit or .bin will
+    # be copied from directly from ${S} without renaming the .bit/.bin name to
+    # ${PN}.bit/${PN}.bin.
+    # if more than one .bit/.bin file is found then fatal the task.
+    # if no .bit/.bin file is found then fatal the task.
+    if [ "${SOC_FAMILY}" = "zynq" ] || [ "${SOC_FAMILY}" = "zynqmp" ]; then
         if [ `ls ${S}/*.bit | wc -l` -gt 1 ]; then
             bbfatal "Multiple .bit found, use the right .bit in SRC_URI from the following:\n$(basename -a ${S}/*.bit)"
         elif [ `ls ${S}/*.bin | wc -l` -gt 1 ]; then
             bbfatal "Multiple .bin found, use the right .bin in SRC_URI from the following:\n$(basename -a ${S}/*.bin)"
-        elif [ `ls ${S}/*.bit | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
+        elif [ `ls ${S}/*.bit | wc -l` -eq 1 ] && [ ! -f ${B}/${USER_DTS_FILE}.dtbo ]; then
             install -Dm 0644 ${S}/*.bit ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ `ls ${S}/*.bin | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
+        elif [ `ls ${S}/*.bin | wc -l` -eq 1 ]; then
             install -Dm 0644 ${S}/*.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ -f ${B}/${PN}.bit.bin ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
-            install -Dm 0644 ${B}/${PN}.bit.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.bit.bin
+        elif [ -f ${B}/${PN}.bin ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${B}/${PN}.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.bin
         else
             bbfatal "A bitstream file with '.bit' or '.bin' expected but not found"
         fi
     fi
 
+    # Install pdi if soc family is versal or new silicon.
+    # In case of dtbo as input or no dtbo exists in ${B}, then .pdi will be copied
+    # from directly from ${S} without renaming the pdi name to ${PN}.pdi
+    # if more than one .pdi file is found then fail the task.
+    # In case of Versal DFx Static, only static dtbo can be loaded as BOOT.bin
+    # already contains static pdi. bbclass is not smart enough to determine
+    # whether it is static pdi or not, hence change fatal to warn if no PDI is found.
+    if [ "${SOC_FAMILY}" != "zynq" ] && [ "${SOC_FAMILY}" != "zynqmp" ]; then
+        if [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ ! -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+        elif [ `ls ${S}/*.pdi | wc -l` -gt 1 ]; then
+            bbfatal "Multiple PDI found, use the right PDI in SRC_URI from the following:\n$(basename -a ${S}/*.pdi)"
+        elif [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.pdi
+        else
+            bbwarn "A PDI file with '.pdi' expected but not found"
+        fi
+    fi
+
+    # Install xclbin
     if ls ${S}/${XCL_PATH}/*.xclbin >/dev/null 2>&1; then
         install -Dm 0644 ${S}/${XCL_PATH}/*.xclbin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.xclbin
     fi
 
+    # Install shell.json or accel.json
     if [ -f ${S}/${JSON_PATH}/shell.json ] || [ -f ${S}/${JSON_PATH}/accel.json ]; then
         install -Dm 0644 ${S}/${JSON_PATH}/*.json ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
     fi
diff --git a/meta-xilinx-core/classes-recipe/fw-package.bbclass b/meta-xilinx-core/classes-recipe/fw-package.bbclass
new file mode 100644
index 00000000..e9847d33
--- /dev/null
+++ b/meta-xilinx-core/classes-recipe/fw-package.bbclass
@@ -0,0 +1,94 @@
+#
+# Copyright (C) 2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This bbclass provides infrastructure to package and deploy firmware baremetal
+# or freertos application elf or bin files to linux root filesystem under
+# /lib/firmware directory.
+
+inherit deploy
+
+INHERIT_DEFAULT_DEPENDS = "1"
+
+# Since we're just copying, we can run any config.
+COMPATIBLE_HOST = ".*"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# Default expects the user to provide the fw app in the deploy directory.
+# A machine, multiconfig, or local.conf should override this.
+FW_NAME ??= ""
+TARGET_MC ??= ""
+FW_DEPENDS ??= ""
+FW_MCDEPENDS ??= ""
+FW_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+FW_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+FW_IMAGE_NAME ??= "${FW_NAME}-${MACHINE}-${TARGET_MC}"
+
+# Default is for the multilib case (without the extension .elf/.bin)
+FW_FILE ??= "${FW_DEPLOY_DIR}/${FW_IMAGE_NAME}"
+FW_FILE[vardepsexclude] = "FW_DEPLOY_DIR"
+
+do_fetch[depends] += "${FW_DEPENDS}"
+do_fetch[mcdepends] += "${FW_MCDEPENDS}"
+
+# Set default destination directory is /lib/firmware, user can change this value
+# to /boot directory depending on requirement.
+DESTDIR ??= "${nonarch_base_libdir}/firmware/xilinx"
+SYSROOT_DIRS += "/boot"
+
+INSANE_SKIP:${PN} = "arch"
+INSANE_SKIP:${PN}-dbg = "arch"
+
+# Disable buildpaths QA check warnings.
+INSANE_SKIP:${PN} += "buildpaths"
+
+do_install() {
+    if [ ! -e ${FW_FILE}.elf ]; then
+        echo "Unable to find FW_FILE (${FW_FILE}.elf)"
+        exit 1
+    fi
+
+    install -Dm 0644 ${FW_FILE}.elf ${D}${DESTDIR}/${FW_IMAGE_NAME}.elf
+}
+
+# If the item is already in OUR deploy_image_dir, nothing to deploy!
+SHOULD_DEPLOY = "${@'false' if (d.getVar('FW_FILE')).startswith(d.getVar('DEPLOY_DIR_IMAGE')) else 'true'}"
+do_deploy() {
+    # If the item is already in OUR deploy_image_dir, nothing to deploy!
+    if ${SHOULD_DEPLOY}; then
+        install -Dm 0644 ${FW_FILE}.elf ${DEPLOYDIR}/${FW_IMAGE_NAME}.elf
+        install -Dm 0644 ${FW_FILE}.bin ${DEPLOYDIR}/${FW_IMAGE_NAME}.bin
+    fi
+}
+
+FILES:${PN} += "${DESTDIR}/${FW_IMAGE_NAME}*"
+
+def check_fw_vars(d):
+    # If both are blank, the user MUST pass in the path to the firmware!
+    if not d.getVar('FW_DEPENDS') and not d.getVar('FW_MCDEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+
+        msg = ""
+        fail = False
+        if not os.path.exists(d.getVar('FW_FILE') + ".elf"):
+            msg = msg + "The expected file %s.elf is not available.  " % d.getVar('FW_FILE')
+            fail = True
+        if not os.path.exists(d.getVar('FW_FILE') + ".bin"):
+            msg = msg + "The expected file %s.bin is not available.  " % d.getVar('FW_FILE')
+            fail = True
+        if fail:
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("%s\nSee the meta-xilinx-core README." % msg)
+        else:
+            # We found the file, so be sure to track it
+            d.setVar('SRC_URI', 'file://${FW_FILE}.elf file://${FW_FILE}.bin')
+            d.setVarFlag('do_install', 'file-checksums', '${FW_FILE}.elf:True ${FW_FILE}.bin:True')
+            d.setVarFlag('do_deploy', 'file-checksums', '${FW_FILE}.elf:True ${FW_FILE}.bin:True')
+
+python() {
+    # Need to allow bbappends to change the check
+    check_fw_vars(d)
+}
diff --git a/meta-xilinx-core/classes/image-wic-utils.bbclass b/meta-xilinx-core/classes-recipe/image-wic-utils.bbclass
index 41ad8148..41ad8148 100644
--- a/meta-xilinx-core/classes/image-wic-utils.bbclass
+++ b/meta-xilinx-core/classes-recipe/image-wic-utils.bbclass
diff --git a/meta-xilinx-core/classes/kernel-simpleimage.bbclass b/meta-xilinx-core/classes-recipe/kernel-simpleimage.bbclass
index 110ee254..110ee254 100644
--- a/meta-xilinx-core/classes/kernel-simpleimage.bbclass
+++ b/meta-xilinx-core/classes-recipe/kernel-simpleimage.bbclass
diff --git a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
index 7466ab5e..7466ab5e 100644
--- a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
+++ b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
diff --git a/meta-xilinx-core/classes/xilinx-fetch-restricted.bbclass b/meta-xilinx-core/classes-recipe/xilinx-fetch-restricted.bbclass
index a778ec7d..a778ec7d 100644
--- a/meta-xilinx-core/classes/xilinx-fetch-restricted.bbclass
+++ b/meta-xilinx-core/classes-recipe/xilinx-fetch-restricted.bbclass
diff --git a/meta-xilinx-core/classes/xilinx-platform-init.bbclass b/meta-xilinx-core/classes-recipe/xilinx-platform-init.bbclass
index 99f7863a..99f7863a 100644
--- a/meta-xilinx-core/classes/xilinx-platform-init.bbclass
+++ b/meta-xilinx-core/classes-recipe/xilinx-platform-init.bbclass
diff --git a/meta-xilinx-core/classes/fpgamanager_custom.bbclass b/meta-xilinx-core/classes/fpgamanager_custom.bbclass
deleted file mode 100644
index 8c8997a1..00000000
--- a/meta-xilinx-core/classes/fpgamanager_custom.bbclass
+++ /dev/null
@@ -1,24 +0,0 @@
-# This class inherits dfx_user_dts.bbclass for below use cases.
-# Zynq-7000 and ZynqMP: Full bitstream loading.
-# ZynqMP: DFx Static and Partial bitstream loading.
-# Versal: DFx Static and Parial pdi loading.
-# Versal: Full PDI loading.
-
-inherit dfx_user_dts
-
-python fpgamanager_warn_msg () {
-    if not d.getVar("FPGAMANAGER_NO_WARN"):
-        arch = d.getVar('SOC_FAMILY')
-        pn = d.getVar('PN')        
-        warn_msg = 'Users should start using dfx_user_dts bbclass for '
-        if arch == 'zynq':
-            warn_msg += 'Zynq-7000 Full bitstream loading use case.'
-        elif arch == 'zynqmp':
-            warn_msg += 'ZynqMP Full or DFx Static or DFx Partial bitstream loading use case.'
-        elif arch == 'versal':
-            warn_msg += 'Versal DFx Static or DFx Partial or Full PDI loading use case.'
-
-        bb.warn("Recipe %s has inherited fpgamanager_custom bbclass which will be deprecated in 2024.1 release. \n%s" % (pn, warn_msg))
-}
-
-do_install[postfuncs] += "fpgamanager_warn_msg"
\ No newline at end of file
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index b9804261..d6b93f9d 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -42,7 +42,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   *->xserver-xorg \
 "
 
-XILINX_RELEASE_VERSION ??= "v2023.2"
+XILINX_RELEASE_VERSION ??= "v2024.1"
 
 BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION"
 
@@ -50,6 +50,8 @@ XILINX_QEMU_VERSION[v2022.1] = "v7.1.0-xilinx-v2022.1%"
 XILINX_QEMU_VERSION[v2022.2] = "v7.1.0-xilinx-v2022.2%"
 XILINX_QEMU_VERSION[v2023.1] = "v7.1.0-xilinx-v2023.1%"
 XILINX_QEMU_VERSION[v2023.2] = "v7.1.0-xilinx-v2023.2%"
+XILINX_QEMU_VERSION[v2024.1] = "v8.1.0-xilinx-v2024.1%"
+PREFERRED_VERSION_qemu ?= "${@ '7.1%' if not (d.getVar('XILINX_RELEASE_VERSION') or 'undefined').startswith('v2024') else '8.1%'}"
 PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
@@ -59,12 +61,18 @@ DEFAULT_XILINX_QEMU = "qemu-xilinx"
 DEFAULT_XILINX_QEMU:arm = "qemu"
 PREFERRED_PROVIDER_qemu ?= "${DEFAULT_XILINX_QEMU}"
 
+XILINX_ATF_VERSION[v2022.1] = "2.6-xilinx-v2022.1%"
+XILINX_ATF_VERSION[v2022.2] = "2.6-xilinx-v2022.2%"
 XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%"
 XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%"
+XILINX_ATF_VERSION[v2024.1] = "2.10-xilinx-v2024.1%"
 PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
+XILINX_UBOOT_VERSION[v2022.1] = "v2021.01-xilinx-v2022.1%"
+XILINX_UBOOT_VERSION[v2022.2] = "v2022.01-xilinx-v2022.2%"
 XILINX_UBOOT_VERSION[v2023.1] = "v2023.01-xilinx-v2023.1%"
 XILINX_UBOOT_VERSION[v2023.2] = "v2023.01-xilinx-v2023.2%"
+XILINX_UBOOT_VERSION[v2024.1] = "v2024.01-xilinx-v2024.1%"
 
 PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
@@ -73,6 +81,7 @@ XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%"
 XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%"
 XILINX_LINUX_VERSION[v2023.1] = "6.1.30-xilinx-v2023.1%"
 XILINX_LINUX_VERSION[v2023.2] = "6.1.60-xilinx-v2023.2%"
+XILINX_LINUX_VERSION[v2024.1] = "6.6.10-xilinx-v2024.1%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # Add support to eSDK for gen-machine-conf if it exists
diff --git a/meta-xilinx-core/conf/machine/include/arm/armv7r/tune-cortexr5hf.inc b/meta-xilinx-core/conf/machine/include/arm/armv7r/tune-cortexr5hf.inc
new file mode 100644
index 00000000..5679b989
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/include/arm/armv7r/tune-cortexr5hf.inc
@@ -0,0 +1,6 @@
+include conf/machine/include/arm/armv7r/tune-cortexr5.inc
+
+AVAILTUNES                            += "cortexr5hf"
+ARMPKGARCH:tune-cortexr5hf             = "cortexr5"
+TUNE_FEATURES:tune-cortexr5hf          = "${TUNE_FEATURES:tune-cortexr5} callconvention-hard"
+PACKAGE_EXTRA_ARCHS:tune-cortexr5hf    = "cortexr5hf-vfpv3d16"
diff --git a/meta-xilinx-core/conf/machine/include/arm/armv8-2a/tune-cortexa78.inc b/meta-xilinx-core/conf/machine/include/arm/armv8-2a/tune-cortexa78.inc
new file mode 100644
index 00000000..8c85d98e
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/include/arm/armv8-2a/tune-cortexa78.inc
@@ -0,0 +1,16 @@
+#
+# Tune Settings for Cortex-A78
+#
+DEFAULTTUNE                                        ?= "cortexa78"
+
+TUNEVALID[cortexa78] = "Enable Cortex-A78 specific processor optimizations"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexa78', ' -mcpu=cortex-a78', '', d)}"
+
+require conf/machine/include/arm/arch-armv8-2a.inc
+
+# Little Endian base configs
+AVAILTUNES                                         += "cortexa78"
+ARMPKGARCH:tune-cortexa78                           = "cortexa78"
+TUNE_FEATURES:tune-cortexa78                        = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa78"
+PACKAGE_EXTRA_ARCHS:tune-cortexa78                  = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa78"
+BASE_LIB:tune-cortexa78                             = "lib64"
diff --git a/meta-xilinx-core/conf/machine/include/arm/armv8r/tune-cortexr52hf.inc b/meta-xilinx-core/conf/machine/include/arm/armv8r/tune-cortexr52hf.inc
new file mode 100644
index 00000000..42c6fb37
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/include/arm/armv8r/tune-cortexr52hf.inc
@@ -0,0 +1,9 @@
+require conf/machine/include/arm/armv8r/tune-cortexr52.inc
+
+# simd is special, we don't pass this to the -mfpu, it's implied
+TUNE_CCARGS_MFLOAT = "${@ bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hard', 'softfp', d) if (d.getVar('TUNE_CCARGS_MFPU') != '' or bb.utils.contains('TUNE_FEATURES', 'simd', True, False, d)) else '' }"
+
+AVAILTUNES                             += "cortexr52hf"
+ARMPKGARCH:tune-cortexr52hf             = "cortexr52"
+TUNE_FEATURES:tune-cortexr52hf          = "${TUNE_FEATURES:tune-cortexr52} callconvention-hard"
+PACKAGE_EXTRA_ARCHS:tune-cortexr52hf    = "cortexr52hf"
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
index e99b1f0e..c732523c 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -28,8 +28,7 @@ do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC
 UBOOT_SUFFIX ?= "bin"
 
 UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
-UBOOT_ELF ?= "u-boot"
-UBOOT_ELF:aarch64 ?= "u-boot.elf"
+UBOOT_ELF ?= "u-boot.elf"
 
 # libmali is selected by DISTRO_FEATURE of libmali & MACHINE_FEATURES of mali400
 # lima is selected by DISTRO_FEATURE != libmali & MACHINE_FEATURES of mali400
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index 9945d301..eb450bbf 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -1,5 +1,3 @@
-XILINX_DEPRECATED[versal-net] = "Versal-net is not supported in 2023.2"
-
 #@TYPE: Machine
 #@NAME: versal-net-generic
 #@DESCRIPTION: Machine configuration for the versal-net-generic devices
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi
index 694a2fd0..a918faf2 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi
@@ -28,6 +28,24 @@
                         no-map;
                         reg = <0x0 0x3ed48000 0x0 0x100000>;
                 };
+
+                rproc_1_reserved: rproc@3ef00000 {
+                        no-map;
+                        reg = <0x0 0x3ef00000 0x0 0x40000>;
+                };
+                rpu1vdev0vring0: rpu1vdev0vring0@3ef40000 {
+                        no-map;
+                        reg = <0x0 0x3ef40000 0x0 0x4000>;
+                };
+                rpu1vdev0vring1: rpu1vdev0vring1@3ef44000 {
+                        no-map;
+                        reg = <0x0 0x3ef44000 0x0 0x4000>;
+                };
+                rpu1vdev0buffer: rpu1vdev0buffer@3ef48000 {
+                        no-map;
+                        compatible = "shared-dma-pool";
+                        reg = <0x0 0x3ef48000 0x0 0x100000>;
+                };
         };
 
         tcm_0a: tcm_0a@eba00000 {
@@ -54,6 +72,30 @@
                 power-domain = <&versal_net_firmware 0x183180cd>;
         };
 
+        tcm_1a: tcm_0a@eba40000 {
+                no-map;
+                reg = <0x0 0xeba40000 0x0 0x10000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domain = <&versal_net_firmware 0x183180ce>;
+        };
+
+        tcm_1b: tcm_0b@eba50000 {
+                no-map;
+                reg = <0x0 0xeba50000 0x0 0x8000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domain = <&versal_net_firmware 0x183180cf>;
+        };
+
+        tcm_1c: tcm_0b@eba60000 {
+                no-map;
+                reg = <0x0 0xeba60000 0x0 0x8000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domain = <&versal_net_firmware 0x183180d0>;
+        };
+
         r52ss {
                 compatible = "xlnx,versal-net-r52-remoteproc";
                 #address-cells = <0x2>;
@@ -72,7 +114,18 @@
                         mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>;
                         mbox-names = "tx", "rx";
                 };
-        };
+                r52_1 {
+                        compatible = "xilinx,r52";
+                        #address-cells = <0x2>;
+                        #size-cells = <0x2>;
+                        ranges;
+                        sram = <&tcm_1a>, <&tcm_1b>, <&tcm_1c>;
+                        memory-region = <&rproc_1_reserved>, <&rpu1vdev0buffer>, <&rpu1vdev0vring0>, <&rpu1vdev0vring1>;
+                        power-domain = <&versal_net_firmware 0x181100C0>;
+                        mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>;
+                        mbox-names = "tx", "rx";
+                };
+      };
 
         zynqmp_ipi1 {
                 compatible = "xlnx,zynqmp-ipi-mailbox";
@@ -93,5 +146,15 @@
                         #mbox-cells = <0x01>;
                         xlnx,ipi-id = <0x03>;
                 };
+                /* APU<->RPU1 IPI mailbox controller */
+                ipi_mailbox_rpu1: mailbox@eb3f0b00{
+                        reg = <0xeb3f0b00 0x20 0xeb3f0b20 0x20 0xeb3f0940 0x20 0xeb3f0960 0x20>;
+                        reg-names = "local_request_region",
+                                    "local_response_region",
+                                    "remote_request_region",
+                                    "remote_response_region";
+                        #mbox-cells = <0x01>;
+                        xlnx,ipi-id = <0x04>;
+                };
         };
 };
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi
index c8a60d81..8ef72656 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi
@@ -28,6 +28,23 @@
                         no-map;
                         reg = <0x0 0x3ed00000 0x0 0x40000>;
                 };
+                rpu1vdev0vring0: rpu0vdev0vring0@3ef40000 {
+                        no-map;
+                        reg = <0x0 0x3ef40000 0x0 0x4000>;
+                };
+                rpu1vdev0vring1: rpu0vdev0vring1@3ef44000 {
+                        no-map;
+                        reg = <0x0 0x3ef44000 0x0 0x4000>;
+                };
+                rpu1vdev0buffer: rpu0vdev0buffer@3ef48000 {
+                        no-map;
+                        reg = <0x0 0x3ef48000 0x0 0x100000>;
+                };
+                rproc_1_reserved: rproc@3ef00000 {
+                        no-map;
+                        reg = <0x0 0x3ef00000 0x0 0x40000>;
+                };
+
         };
 
         tcm_0a: tcm_0a@ffe00000 {
@@ -45,7 +62,21 @@
                 compatible = "mmio-sram";
                 power-domain = <&zynqmp_firmware 16>;
         };
+        tcm_1a: tcm_0a@ffe90000 {
+                no-map;
+                reg = <0x0 0xffe90000 0x0 0x10000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domain = <&zynqmp_firmware 17>;
+        };
 
+        tcm_1b: tcm_0b@ffeb0000 {
+                no-map;
+                reg = <0x0 0xffeb0000 0x0 0x10000>;
+                status = "okay";
+                compatible = "mmio-sram";
+                power-domain = <&zynqmp_firmware 18>;
+        };
         rf5ss@ff9a0000 {
                 compatible = "xlnx,zynqmp-r5-remoteproc";
                 xlnx,cluster-mode = <1>;
@@ -65,6 +96,18 @@
                         mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>;
                         mbox-names = "tx", "rx";
                 };
+                r5f_1: r5f@1 {
+                        compatible = "xilinx,r5f";
+                        #address-cells = <2>;
+                        #size-cells = <2>;
+                        ranges;
+                        sram = <&tcm_1a>, <&tcm_1b>;
+                        memory-region = <&rproc_1_reserved>, <&rpu1vdev0buffer>, <&rpu1vdev0vring0>, <&rpu1vdev0vring1>;
+                        power-domain = <&zynqmp_firmware 8>;
+                        mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>;
+                        mbox-names = "tx", "rx";
+                };
+
         };
 
         zynqmp_ipi1 {
@@ -90,4 +133,26 @@
                         xlnx,ipi-id = <1>;
                 };
         };
+        zynqmp_ipi2 {
+                compatible = "xlnx,zynqmp-ipi-mailbox";
+                interrupt-parent = <&gic>;
+                interrupts = <0 30 4>;
+                xlnx,ipi-id = <8>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                /* APU<->RPU1 IPI mailbox controller */
+                ipi_mailbox_rpu1: mailbox@ff990800 {
+                        reg = <0xff990800 0x20>,
+                              <0xff990820 0x20>,
+                              <0xff990200 0x20>,
+                              <0xff990220 0x20>;
+                        reg-names = "local_request_region",
+                                "local_response_region",
+                                "remote_request_region",
+                                "remote_response_region";
+                        #mbox-cells = <1>;
+                        xlnx,ipi-id = <2>;
+                };
+        };
 };
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb
new file mode 100644
index 00000000..ca447615
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb
@@ -0,0 +1,16 @@
+SRCBRANCH ?= "2024"
+SRCREV = "e2fdb4fecbebe41b4cd1c0b4fbfa3496bcded485"
+BRANCH = "2024"
+LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
+PV = "${SRCBRANCH}+git${SRCPV}"
+
+REPO = "git://github.com/Xilinx/libmetal.git;protocol=https"
+
+include ${LAYER_PATH_openamp-layer}/recipes-openamp/libmetal/libmetal.inc
+include ${LAYER_PATH_openamp-layer}/vendor/xilinx/recipes-openamp/libmetal/libmetal-xlnx.inc
+
+RPROVIDES:${PN}-dbg += "libmetal-dbg"
+RPROVIDES:${PN}-dev += "libmetal-dev"
+RPROVIDES:${PN}-lic += "libmetal-lic"
+RPROVIDES:${PN}-src += "libmetal-src"
+RPROVIDES:${PN}-staticdev += "libmetal-staticdev"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
new file mode 100644
index 00000000..01df6033
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
@@ -0,0 +1,16 @@
+SRCBRANCH ?= "2024"
+SRCREV = "f4a7bc0fca5b14bb8fd185918614bcc78ce93028"
+BRANCH = "2024"
+LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
+PV = "${SRCBRANCH}+git${SRCPV}"
+REPO = "git://github.com/Xilinx/open-amp.git;protocol=https"
+
+include ${LAYER_PATH_openamp-layer}/recipes-openamp/open-amp/open-amp.inc
+require ${LAYER_PATH_openamp-layer}/vendor/xilinx/recipes-openamp/open-amp/open-amp-xlnx.inc
+
+RPROVIDES:${PN}-dbg += "open-amp-dbg"
+RPROVIDES:${PN}-dev += "open-amp-dev"
+RPROVIDES:${PN}-lic += "open-amp-lic"
+RPROVIDES:${PN}-src += "open-amp-src"
+RPROVIDES:${PN}-staticdev += "open-amp-staticdev"
+
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend
index 2b96f152..e0de911f 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_git.bbappend
@@ -3,12 +3,12 @@
 PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
 EXTRA_OECMAKE:append:versal-ai-core = " -DXRT_AIE_BUILD=true"
 TARGET_CXXFLAGS:append:versal-ai-core = " -DXRT_ENABLE_AIE"
-DEPENDS:append:versal-ai-core = " libmetal libxaiengine aiefal"
+DEPENDS:append:versal-ai-core = " libxaiengine aiefal"
 RDEPENDS:${PN}:append:versal-ai-core = " libxaiengine aiefal"
 
 # For vek280 kind of devices
 PACKAGE_ARCH:versal-ai-edge = "${SOC_VARIANT_ARCH}"
 EXTRA_OECMAKE:append:versal-ai-edge = " -DXRT_AIE_BUILD=true"
 TARGET_CXXFLAGS:append:versal-ai-edge = " -DXRT_ENABLE_AIE"
-DEPENDS:append:versal-ai-edge = " libmetal libxaiengine aiefal"
+DEPENDS:append:versal-ai-edge = " libxaiengine aiefal"
 RDEPENDS:${PN}:append:versal-ai-edge = " libxaiengine aiefal"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split.inc b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-7.1.inc
index 2c73d931..d07090bd 100644
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split.inc
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-7.1.inc
@@ -10,27 +10,27 @@ PACKAGES:prepend:class-target = "${PN}-x86_64 \
                     "
 
 FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
-RDEPENDS:${PN}-x86_64:append:class-target = "${PN}"
+RDEPENDS:${PN}-x86_64:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps"
 
 FILES:${PN}-i386:class-target = "${bindir}/qemu-i386"
-RDEPENDS:${PN}-i386:append:class-target = "${PN}"
+RDEPENDS:${PN}-i386:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-i386:class-target = "file-rdeps"
 
 FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386"
-RDEPENDS:${PN}-system-i386:append:class-target = "${PN}"
+RDEPENDS:${PN}-system-i386:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps"
 
 FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
-RDEPENDS:${PN}-aarch64:append:class-target = "${PN}"
+RDEPENDS:${PN}-aarch64:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps"
 
 FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
-RDEPENDS:${PN}-arm:append:class-target = "${PN}"
+RDEPENDS:${PN}-arm:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
 
 FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
-RDEPENDS:${PN}-microblaze:append:class-target = "${PN}"
+RDEPENDS:${PN}-microblaze:append:class-target = " ${PN}"
 INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
 
 FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-8.1.inc b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-8.1.inc
new file mode 100644
index 00000000..42f054e6
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-8.1.inc
@@ -0,0 +1,71 @@
+# we have our own package splitting for qemu, inhbit the oe-core
+# split by overriding the split function
+python split_qemu_packages () {
+    print( "meta-virtualization: vmsplit: inhibiting core qemu package split" )
+}
+
+PACKAGES:prepend:class-target = "${PN}-x86_64 \
+                     ${PN}-aarch64 \
+                     ${PN}-arm \
+                     ${PN}-i386 \
+                     ${PN}-system-i386 \
+                     ${PN}-microblaze \
+                     ${PN}-support \
+                     ${PN}-keymaps \
+                     ${PN}-firmware \
+                    "
+
+FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
+RDEPENDS:${PN}-x86_64:append:class-target = " ${PN}"
+RPROVIDES:${PN}-x86_64:append:class-target = " ${PN}-system-x86_64"
+RPROVIDES:${PN}-x86_64:append:class-target = " ${PN}-user-x86_64"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-x86_64"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-x86_64"
+INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps"
+
+FILES:${PN}-i386:class-target = "${bindir}/qemu-i386"
+RDEPENDS:${PN}-i386:append:class-target = " ${PN}"
+RPROVIDES:${PN}-i386:append:class-target = " ${PN}-user-i386"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-i386"
+INSANE_SKIP:${PN}-i386:class-target = "file-rdeps"
+
+FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386"
+RDEPENDS:${PN}-system-i386:append:class-target = " ${PN}"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-system-i386"
+INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps"
+
+FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
+RDEPENDS:${PN}-aarch64:append:class-target = " ${PN}"
+RPROVIDES:${PN}-aarch64:append:class-target = " ${PN}-system-aarch64"
+RPROVIDES:${PN}-aarch64:append:class-target = " ${PN}-user-aarch64"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-aarch64"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-aarch64"
+INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps"
+
+FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
+RDEPENDS:${PN}-arm:append:class-target = " ${PN}"
+RPROVIDES:${PN}-arm:append:class-target = " ${PN}-system-arm"
+RPROVIDES:${PN}-arm:append:class-target = " ${PN}-user-arm"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-arm"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-arm"
+INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
+
+FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
+RDEPENDS:${PN}-microblaze:append:class-target = " ${PN}"
+RPROVIDES:${PN}-microblaze:append:class-target = " ${PN}-system-microblaze"
+RPROVIDES:${PN}-microblaze:append:class-target = " ${PN}-user-microblaze"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-microblaze"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-microblaze"
+INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
+
+FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*"
+RDEPENDS:${PN}-support:class-target = "${PN} bash"
+
+FILES:${PN}-firmware:class-target = "${datadir}/${PN}/*.bin ${datadir}/${PN}/*.rom ${datadir}/${PN}/*.img ${datadir}/${PN}/openbios* ${datadir}/${PN}/*.dtb ${datadir}/${PN}/u-boot*"
+RDEPENDS:${PN}-firmware:class-target = "${PN}"
+INSANE_SKIP:${PN}-firmware:class-target = "arch"
+
+FILES:${PN}-keymaps:class-target = "${datadir}/${PN}/keymaps/*"
+RDEPENDS:${PN}-keymaps:class-target = "${PN}"
+
+PACKAGECONFIG:append:class-target = " virtfs"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend
deleted file mode 100644
index 5cca9e1f..00000000
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', '${BPN}-package-split.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
new file mode 100644
index 00000000..c9f04327
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-7.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend
new file mode 100644
index 00000000..74aa15fb
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-8.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_7.1%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_7.1%.bbappend
new file mode 100644
index 00000000..c9f04327
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_7.1%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-7.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend
new file mode 100644
index 00000000..74aa15fb
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-8.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
index 56cb8a45..92af8a7a 100644
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
@@ -1,5 +1,5 @@
 SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master;protocol=https"
-SRCREV = "807435ae6fa0a07e8c84b458d138f3f54614eb5c"
+SRCREV = "4b687525d2c4785eedbcbd73431bc6d236cb5bc8"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/lopper:"
 
@@ -10,4 +10,5 @@ RDEPENDS:${PN} += " \
     python3-anytree \
     python3-six \
     python3-pyyaml \
+    python3-packaging \
     "
diff --git a/meta-xilinx-core/lib/devtool/boot-jtag.py b/meta-xilinx-core/lib/devtool/boot-jtag.py
new file mode 100644
index 00000000..53d70262
--- /dev/null
+++ b/meta-xilinx-core/lib/devtool/boot-jtag.py
@@ -0,0 +1,272 @@
+# Copyright (C) 2021-2022, Xilinx, Inc.  All rights reserved.
+# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This script uses devtool and creates a boot-jtag.tcl script in
+# ${DEPLOY_DIR_IMAGE} directory. This script is executed by xsdb tool to boot
+# yocto generated images on HW via jtag boot mode.
+
+import os
+import logging
+import argparse
+from devtool import setup_tinfoil, parse_recipe, DevtoolError
+import yaml
+import sys
+import glob
+
+logger = logging.getLogger('devtool')
+
+def bootjtag(args, config, basepath, workspace):
+    """Entry point for the devtool 'boot-jtag' subcommand"""
+
+    if not args.image:
+        print('\nINFO: Please specify the target image name. \n\nExample: --image core-image-minimal or petalinux-image-minimal')
+        return
+
+    # Get required boot variables
+    tinfoil = setup_tinfoil(basepath=basepath)
+    try:
+        rd = tinfoil.parse_recipe('u-boot-xlnx-scr')
+        deploy_dir = rd.getVar('DEPLOY_DIR_IMAGE')
+        machine = rd.getVar('MACHINE')
+        arch =  rd.getVar('TARGET_ARCH')
+        soc = rd.getVar("SOC_FAMILY")
+        soc_variant = rd.getVar("SOC_VARIANT")
+        ddr_base_addr = rd.getVar('DDR_BASEADDR')
+        kernel_img_name = rd.getVar('KERNEL_IMAGE')
+        kernel_load_addr = rd.getVar('KERNEL_LOAD_ADDRESS')
+        dtb_load_addr = rd.getVar('DEVICETREE_ADDRESS')
+        rootfs_load_addr = rd.getVar('RAMDISK_IMAGE_ADDRESS')
+        machine_features = rd.getVar('MACHINE_FEATURES')
+        boot_mode = rd.getVar('BOOTMODE')
+    finally:
+        tinfoil.shutdown()
+
+    if not args.hw_server:
+        print("\nINFO: --hw_server is null so default URL description of hw_server/TCF agent and port number is set to: " +  str(args.hw_server))
+
+    print("INFO: HW_SERVER Connected to: " + str(args.hw_server))
+    print("INFO: Using DISTRO IMAGE: " + str(args.image))
+
+    # Use arch for MB and SOC Family other devices.
+    if arch == 'microblazeel':
+        print("INFO: ARCH: " + arch)
+    else:
+        print("INFO: SOC FAMILY: " + soc)
+
+    # Load Address of boot.scr in DDR(Except for QSPI/OSPI/NAND boot)
+    # MB = (DDR base address + DDR Size) - 0xe00000
+    # Zynq 7000 = DDR base address + 0x3000000
+    # ZynqMP = DDR base address + 0x20000000
+    # Versal = DDR base address + 0x20000000
+    if arch == 'microblazeel':
+        # Assuming DDR size is 2GB
+        bootscr_addr = hex(int(ddr_base_addr, 16) + 0x80000000 - 0xe00000)
+    elif soc == 'zynq':
+        bootscr_addr = hex(int(ddr_base_addr, 16) + 0x3000000)
+    else:
+        bootscr_addr = hex(int(ddr_base_addr, 16) + 0x20000000)
+
+    print("INFO: MACHINE: " + machine)
+
+    if arch != 'microblazeel':
+        if "fpga-overaly" in machine_features:
+            print("INFO: fpga-overlay MACHINE_FEATURES is enabled, Hence PL bitstream or PDI will not be loaded at initial boot, User can load from u-boot or linux.")
+        else:
+            print("INFO: fpga-overlay MACHINE_FEATURES is not enabled, Hence PL bitstream or PDI will be loaded at initial boot.")
+
+    #dictionary with all required artifacts
+    data = {}
+
+    # For MB, Zynq 7000 and ZynqMP.
+    if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp':
+        if not "fpga-overaly" in machine_features:
+            data['bit'] = glob.glob(os.path.join(deploy_dir, '*' + machine + '.bit'))[0]
+        data['uboot'] = os.path.join(deploy_dir, 'u-boot.elf')
+        data['dtb'] = os.path.join(deploy_dir, machine + '-system.dtb')
+
+    if soc == 'zynq' or soc == 'zynqmp':
+        data['fsbl'] = os.path.join(deploy_dir, 'fsbl-' + machine + '.elf')
+
+    if soc == 'zynqmp':
+        data['atf'] = os.path.join(deploy_dir, 'arm-trusted-firmware.elf')
+        data['pmufw'] = os.path.join(deploy_dir, 'pmu-firmware-' + machine + '.elf')
+
+    if soc == 'versal':
+        data['bootbin'] = os.path.join(deploy_dir, 'boot.bin')
+
+    data['bootscr'] = os.path.join(deploy_dir, 'boot.scr')
+    data['kernel'] = os.path.join(deploy_dir, kernel_img_name)
+
+    if not args.norootfs:
+        data['rfs'] = os.path.join(deploy_dir, args.image + '-' + machine + '.cpio.gz.u-boot')
+
+    # Check if all the required boot images exists
+    for key in data:
+        if not os.path.isfile(data[key]):
+            print('INFO:' + key + ' does not exist.')
+            print('INFO: Please make sure you have run: \n\'MACHINE=' + machine + ' devtool build-image ' + args.image + '\'')
+            return
+
+    # Enable verbose mode
+    if args.verbose:
+        print("The following artifacts are being loaded:")
+        for key in data:
+            print('INFO: ' + key + ": " + data[key])
+
+    # Start writing xsdb script
+    lines = []
+    lines.append('# Run \'xsdb ' + deploy_dir + '/boot-jtag.tcl\' to execute this script.')
+    lines.append('connect -url ' + args.hw_server)
+
+    if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp':
+        lines.append('for {set i 0} {$i < 20} {incr i} {')
+        lines.append('    if { [ta] != "" } break;')
+        lines.append('    after 50')
+        lines.append('}')
+        if not "fpga-overaly" in machine_features:
+            lines.append('')
+            lines.append('puts stderr "INFO: Configuring the PL ..."')
+            lines.append('puts stderr "INFO: Downloading bitstream: ' + data['bit'] + '"')
+            lines.append('fpga -no-revision-check \"' + data['bit'] + '\"')
+
+    if soc == 'zynqmp':
+        # Disable Security gates to view PMU MB target
+        lines.append('')
+        lines.append('targets -set -nocase -filter {name =~ \"*PSU*\"}')
+
+        # By default, JTAG security gates are enabled. This disables security gates for DAP, PLTAP and PMU.
+        lines.append('mask_write 0xFFCA0038 0x1C0 0x1C0')
+        lines.append('targets -set -nocase -filter {name =~ \"*MicroBlaze PMU*\"}')
+        lines.append('')
+
+        # Check if the target is already stopped or cannot be stopped.
+        lines.append('catch {stop}; after 1000')
+        lines.append('')
+
+        # Download the pmufw.elf and run PMUFW
+        lines.append('puts stderr "INFO: Downloading PMUFW ELF file: ' + data['pmufw'] + '"')
+        lines.append('dow \"' + data['pmufw'] + '\"')
+        lines.append('con')
+
+        # Select A53 Core 0 to load and run FSBL
+        lines.append('targets -set -nocase -filter {name =~ \"*A53*#0\"}')
+
+        # Reset A53, If the reset is being triggered after powering on the device,
+        # write bootloop at reset vector address (0xffff0000), or use
+        # -clear-registers option, to avoid unpredictable behavior.
+        # Further warnings will be suppressed
+        lines.append('rst -processor -clear-registers')
+        lines.append('')
+    elif soc == 'versal':
+        # Download boot.bin to versal device
+        lines.append('targets -set -nocase -filter {name =~ \"*PMC*\"}')
+        lines.append('puts stderr "INFO: Downloading BOOT bin file: ' + data['bootbin'] + '"')
+        lines.append('device program \"' + data['bootbin'] + '\"')
+        lines.append('')
+
+        if soc_variant == 'net':
+            lines.append('targets -set -nocase -filter {name =~ \"*A78*#0\"}')
+        else:
+            lines.append('targets -set -nocase -filter {name =~ \"*A72*#0\"}')
+
+        lines.append('stop')
+        lines.append('')
+        lines.append('targets -set -nocase -filter {name =~ \"*Versal*\"}')
+    elif soc == 'zynq':
+        lines.append('targets -set -nocase -filter {name =~ \"arm*#0\"}')
+        # Check if the target is already stopped or cannot be stopped.
+        lines.append('catch {stop}; after 1000')
+        lines.append('')
+    else:
+        lines.append('targets -set -nocase -filter {name =~ \"microblaze*#0\"}')
+        # Check if the target is already stopped or cannot be stopped.
+        lines.append('catch {stop}; after 1000')
+        lines.append('')
+
+
+    if soc == 'zynq' or soc == 'zynqmp':
+        # Download FSBL for Zynq 7000 and ZynqMP
+        lines.append('puts stderr "INFO: Downloading FSBL ELF file: ' + data['fsbl'] + '"')
+        lines.append('dow \"' + data['fsbl'] + '\"')
+        lines.append('con')
+        lines.append('after 4000; stop')
+        lines.append('')
+
+    # Download U-boot and DTB for MB, Zynq 7000 and ZynqMP
+    if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp':
+        lines.append('puts stderr "INFO: Downloading U-boot ELF file: ' + data['uboot'] + '"')
+        lines.append('dow \"' + data['uboot'] + '\"')
+        lines.append('')
+        # For MB and Zynq 7000 we need to connect and stop before loading
+        # kernel images
+        if soc != 'zynqmp':
+            lines.append('con')
+            lines.append('after 1000; stop')
+        lines.append('puts stderr "INFO: Downloading DTB file: ' + data['dtb'] + ' at ' + dtb_load_addr + '"')
+        lines.append('dow -data \"' + data['dtb'] + '\" ' + dtb_load_addr)
+        lines.append('')
+
+    # Download Trusted Firmware-A(TF-A) for ZynqMP
+    # Note: TF-A elf should be loaded after u-boot elf in JTAG boot mode else
+    #       TF-A elf will not be loaded.
+    if soc == 'zynqmp':
+        lines.append('puts stderr "INFO: Downloading Trusted Firmware-A(TF-A) ELF file: ' + data['atf'] + '"')
+        lines.append('dow \"' + data['atf'] + '\"')
+        lines.append('')
+
+    # If BOOTMODE is xen then boot till u-boot only.
+    # Download Kernel Image for all architecture
+    if boot_mode != 'xen':
+        lines.append('puts stderr "INFO: Downloading Kernel Image file: ' + data['kernel'] + ' at ' + kernel_load_addr + '"')
+        lines.append('dow -data \"' + data['kernel'] + '\" ' + kernel_load_addr)
+        lines.append('')
+
+    # Download Rootfs
+    if not args.norootfs and boot_mode != 'xen':
+        lines.append('puts stderr "INFO: Downloading Rootfs file: ' + data['rfs'] + ' at ' + rootfs_load_addr + '"')
+        lines.append('dow -data \"' + data['rfs'] + '\" ' + rootfs_load_addr)
+        lines.append('')
+
+    lines.append('puts stderr "INFO: Downloading U-boot boot script: ' + data['bootscr'] + ' at ' + bootscr_addr + '"')
+    lines.append('dow -data \"' + data['bootscr'] + '\" ' + bootscr_addr)
+    lines.append('')
+
+    # Select A72 Core 0 to load and run Versal images
+    if soc == 'versal':
+        if soc_variant == 'net':
+            lines.append('targets -set -nocase -filter {name =~ \"*A78*#0\"}')
+        else:
+            lines.append('targets -set -nocase -filter {name =~ \"*A72*#0\"}')
+
+    lines.append('con')
+    lines.append('exit\n')
+
+    script = os.path.join(deploy_dir, "boot-jtag.tcl")
+    with open(script, "w") as f:
+            f.write('\n'.join(lines))
+
+    print('INFO: HW JTAG boot tcl script written to '+ script + "\n" \
+        + 'INFO: User can run \'xsdb ' + script + '\' to execute.')
+
+    return 0
+
+def register_commands(subparsers, context):
+    """Register devtool subcommands from this plugin"""
+    parser_bootjtag = subparsers.add_parser('boot-jtag', 
+                                            help='Script to deploy target images on HW via JTAG boot mode.',
+                                            description='Script to deploy target images on HW via JTAG boot mode. \
+                                                Example command: MACHINE=zcu102-zynqmp devtool boot-jtag --image ${image_name} --hw_server ${hw_server}')
+    required = parser_bootjtag.add_argument_group('required arguments')
+    required.add_argument('--image', 
+                          help='Specify target image name. Example: core-image-minimal or petalinux-image-minimal')
+    parser_bootjtag.add_argument('--hw_server', nargs='?', default='TCP:localhost:3121',
+                                 help='URL description of hw_server/TCF agent and port number. (default: %(default)s) \
+                                     Example: --hw_server TCP:puffball12:3121')
+
+    parser_bootjtag.add_argument('-v', '--verbose',  
+                                 help='verbose mode', action="store_true")
+    parser_bootjtag.add_argument('-n', '--norootfs', 
+                                 help='Don\'t include rootfs', action='store_true')
+    parser_bootjtag.set_defaults(func=bootjtag, no_workspace=True)
diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
new file mode 100644
index 00000000..f7e18273
--- /dev/null
+++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Image update is used to update alternate images on compatible firmware."
+SUMMARY = "Image update is used to update alternate image on compatible firmware. \
+        If the current image is ImageA, ImageB will get updated and vice versa. \
+        Usage: image_update <Input Image File>"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b"
+
+BRANCH = "master"
+SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https"
+SRCREV = "a68308f329578d3585fd335071a9184aa7f46d2e"
+
+RDEPENDS:${PN} += "freeipmi"
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+
+PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}"
+
+# Force the make system to use the flags we want!
+EXTRA_OEMAKE = 'CC="${CC} ${TARGET_CFLAGS} ${TARGET_LDFLAGS}" all'
+
+do_install () {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/image_update ${D}${bindir}/
+}
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
index f86c5985..f86c5985 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc
index 11059465..0541a7a3 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc
@@ -2,8 +2,8 @@ SECTION	= "libs"
 
 REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https"
 
-BRANCH ?= "xlnx_rel_v2023.2"
-SRCREV ?= "84debe5d22c144fb09269b8410df4cb8a6aa3b2a"
+BRANCH ?= "main-aie"
+SRCREV ?= "5621d74d5efa99fdddd9eca47de3294804c62c24"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM ?= "file://license.txt;md5=04a153cae61a8a606fc79dff49c2c897"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
index 2c6c9cd1..2c6c9cd1 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2024.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2024.1.bb
new file mode 100644
index 00000000..fee8e069
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2024.1.bb
@@ -0,0 +1,8 @@
+ATF_VERSION = "2.10"
+SRCREV = "4f82b6134e7b43722616c855e5016d42a3ea26d2"
+BRANCH = "xlnx_rebase_v2.10"
+LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
+
+
+include arm-trusted-firmware.inc
+
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
new file mode 100644
index 00000000..98eebc3e
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Bootbin version string file"
+SUMMARY = "The BIF file for bootbin requires a version file in a specific format"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+COMPATIBLE_MACHINE = "^$"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BOOTBIN_VER_MAIN ?= ""
+
+BOOTBIN_VER_SUFFIX ?= "${@(d.getVar('XILINX_VER_BUILD') or '')[:8] if d.getVar('XILINX_VER_UPDATE') != 'release' and not d.getVar('XILINX_VER_UPDATE').startswith('update') else ''}"
+BOOTBIN_VER_FILE = "bootbin-version-header.txt"
+BOOTBIN_VER_MAX_LEN = "36"
+
+BOOTBIN_MANIFEST_FILE ?= "bootbin-version-header.manifest"
+
+inherit deploy image-artifact-names
+
+python do_configure() {
+    if d.getVar("BOOTBIN_VER_SUFFIX"):
+        version = version + "-" + d.getVar("BOOTBIN_VER_SUFFIX")
+
+    if len(version) > int(d.getVar("BOOTBIN_VER_MAX_LEN")):
+        bb.error("version string too long")
+
+    with open(d.expand("${B}/${BOOTBIN_VER_FILE}"), "w") as f:
+        f.write(version.encode("utf-8").hex())
+
+    with open(d.expand("${B}/${BOOTBIN_MANIFEST_FILE}"), "w") as f:
+        f.write("* %s\n" % d.getVar('PN'))
+        f.write("VERSION: %s\n" % version)
+        f.write("PV: %s\n" % d.getVar('PV'))
+        f.write("XILINX_VER_MAIN: %s\n" % d.getVar('XILINX_VER_MAIN'))
+        f.write("XILINX_VER_UPDATE: %s\n" % d.getVar('XILINX_VER_UPDATE'))
+        f.write("XILINX_VER_BUILD: %s\n\n" % d.getVar('XILINX_VER_BUILD'))
+}
+
+do_install() {
+    install -d ${D}/boot
+    install -m 0644 ${B}/${BOOTBIN_VER_FILE} ${D}/boot/
+}
+
+do_deploy() {
+    install -m 0644 ${B}/${BOOTBIN_VER_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.txt
+    ln -s ${IMAGE_NAME}.txt ${DEPLOYDIR}/${IMAGE_LINK_NAME}.txt
+    install -m 0644 ${B}/${BOOTBIN_MANIFEST_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.manifest
+    ln -s ${IMAGE_NAME}.manifest ${DEPLOYDIR}/${IMAGE_LINK_NAME}.manifest
+}
+
+addtask deploy after do_compile
+
+SYSROOT_DIRS += "/boot"
+FILES:${PN} += "/boot/${BOOTBIN_VER_FILE}"
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
index 8d7211f5..1f8ae2e3 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -23,7 +23,7 @@ inherit devicetree image-artifact-names
 SYSTEM_DTFILE ??= ""
 CONFIG_DTFILE ??= "${SYSTEM_DTFILE}"
 
-BASE_DTS ?= "${@os.path.basename(d.getVar('CONFIG_DTFILE') or '').rstrip('.dtb').rstrip('.dts') or 'system-top'}"
+BASE_DTS ?= "${@os.path.splitext(os.path.basename(d.getVar('CONFIG_DTFILE') or ''))[0] or 'system-top'}"
 
 EXTRA_DT_FILES ?= ""
 EXTRA_DTFILE_PREFIX ?= "system-top"
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb
new file mode 100644
index 00000000..b0acf0ef
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb
@@ -0,0 +1,72 @@
+SUMMARY  = "Xilinx dfx-mgr libraries"
+DESCRIPTION = "Xilinx Runtime User Space Libraries and Binaries"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d67bcef754e935bf77b6d7051bd62b5e"
+
+REPO ?= "git://github.com/Xilinx/dfx-mgr.git;protocol=https"
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+BRANCH = "master"
+SRCREV = "ec70363a2a878737057995f922a9460d18aafa26"
+SOMAJOR = "1"
+SOMINOR = "0"
+SOVERSION = "${SOMAJOR}.${SOMINOR}"
+
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+
+S = "${WORKDIR}/git"
+
+inherit cmake update-rc.d systemd
+
+DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm systemd"
+RDEPENDS:${PN} += " freeipmi"
+EXTRA_OECMAKE += " \
+               -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \
+                "
+
+INITSCRIPT_NAME = "dfx-mgr.sh"
+INITSCRIPT_PARAMS = "start 99 S ."
+
+SYSTEMD_PACKAGES="${PN}"
+SYSTEMD_SERVICE:${PN}="dfx-mgr.service"
+SYSTEMD_AUTO_ENABLE:${PN}="enable"
+
+
+do_install(){
+        install -d ${D}${bindir}
+        install -d ${D}${libdir}
+        install -d ${D}${includedir}
+        install -d ${D}${base_libdir}/firmware/xilinx
+        install -d ${D}${sysconfdir}/dfx-mgrd
+
+        cp ${B}/example/sys/linux/dfx-mgrd-static ${D}${bindir}/dfx-mgrd
+        cp ${B}/example/sys/linux/dfx-mgr-client-static ${D}${bindir}/dfx-mgr-client
+        chrpath -d ${D}${bindir}/dfx-mgrd
+        chrpath -d ${D}${bindir}/dfx-mgr-client
+        install -m 0644 ${S}/src/dfxmgr_client.h ${D}${includedir}
+
+        oe_soinstall ${B}/src/libdfx-mgr.so.${SOVERSION} ${D}${libdir}
+
+        install -m 0755 ${S}/src/daemon.conf ${D}${sysconfdir}/dfx-mgrd/
+
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+                install -d ${D}${sysconfdir}/init.d/
+                install -m 0755 ${S}/src/dfx-mgr.sh ${D}${sysconfdir}/init.d/
+        fi
+
+        install -m 0755 ${S}/src/dfx-mgr.sh ${D}${bindir}
+        install -m 0755 ${S}/src/scripts/xlnx-firmware-detect ${D}${bindir}
+
+        install -d ${D}${systemd_system_unitdir}
+        install -m 0644 ${S}/src/dfx-mgr.service ${D}${systemd_system_unitdir}
+}
+
+PACKAGES =+ "libdfx-mgr"
+
+FILES:${PN} += "${base_libdir}/firmware/xilinx"
+FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${sysconfdir}/init.d/dfx-mgr.sh', '', d)} ${systemd_system_unitdir}"
+FILES:libdfx-mgr = "${libdir}/libdfx-mgr.so.${SOVERSION} ${libdir}/libdfx-mgr.so.${SOMAJOR}"
diff --git a/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c b/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c
index 04777a91..281e1828 100644
--- a/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c
+++ b/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Copyright (C) 2019-2022 Xilinx, Inc.  All rights reserved.
- * Copyright (C) 2022 Advanced Micro Devices, Inc.  All rights reserved.
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc.  All rights reserved.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -75,6 +75,20 @@ int fpga_getplatform()
 
 }
 
+static bool file_exists(const char *filename)
+{
+        FILE *fp = fopen(filename, "r");
+        bool is_exist = false;
+
+        if (fp != NULL)
+        {
+                is_exist = true;
+                fclose(fp); // close the file
+        }
+
+        return is_exist;
+}
+
 void print_usage(char *prg)
 {
         int iszynqmp = fpga_getplatform();
@@ -252,6 +266,12 @@ int main(int argc, char **argv)
         struct stat sb;
         double time;
         struct timeval t1, t0;
+        uid_t euid = geteuid();
+
+        if (euid) {
+                printf("Error: This binary requires root access to execute. \n");
+                return 0;
+        }
 
         if (argc == 1) {
                 print_usage(basename(argv[0]));
@@ -262,10 +282,18 @@ int main(int argc, char **argv)
                 switch (opt) {
                 case 'o':
                         overlay = optarg;
+                        if (!file_exists(overlay)) {
+                                printf("Error: User provided Overlay file doesn't exist\r\n");
+                                return 1;
+                        }
                         flow = OVERLAY;
                         break;
                 case 'b':
                         binfile = optarg;
+                        if (!file_exists(binfile)) {
+                                printf("Error: User provided bitstream file doesn't exist\r\n");
+                                return 1;
+                        }
                         if (!(flow == OVERLAY))
                                 flow = FPGA_SYSFS;
                         break;
@@ -415,7 +443,11 @@ int main(int argc, char **argv)
                 if (binfile != NULL) {
                         if (!fpga_state()) {
                                 printf("Time taken to load BIN is %f Milli Seconds\n\r", time);
-                                printf("BIN FILE loaded through FPGA manager successfully\n\r");
+                                if (ret) {
+                                        printf("BIN FILE loaded through FPGA manager successfull but failed to apply Overlay\n\r");
+                                } else {
+                                        printf("BIN FILE loaded through FPGA manager successfully\n\r");
+                                }
                         } else {
                                 printf("BIN FILE loading through FPGA manager failed\n\r");
                         }
diff --git a/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb b/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
index d22c995c..b9a36d77 100644
--- a/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Install user script to support fpga-manager"
 DESCRIPTION = "Install user script that loads and unloads overlays using kernel fpga-manager"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/fpgautil.c;beginline=1;endline=24;md5=0c02eabf57dba52842c5df9b96bccfae"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/fpgautil.c;beginline=1;endline=24;md5=0dbf04c2c1026b3d120136e728b7a09f"
 
 SRC_URI = "\
         file://fpgautil.c \
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
new file mode 100644
index 00000000..0cbcaac7
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Xilinx libdfx library"
+DESCRIPTION = "Xilinx libdfx Library and headers"
+
+LICENSE = "MIT & GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=94aba86aec117f003b958a52f019f1a7"
+
+BRANCH ?= "master"
+REPO ?= "git://github.com/Xilinx/libdfx.git;protocol=https"
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+SRCREV = "c8275891ead62b3dfce68c00cf466715f0ac75f1"
+
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+# Due to an update where the soname/version was defined, we need to use an RREPLACES
+# so updates will work properly.
+RREPLACES:${PN} = "libdfx"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch b/meta-xilinx-core/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
deleted file mode 100644
index 7091098c..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8127b19aa42ccfb3faae1173a12b3eb0cebf8941 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 30 Jan 2020 09:37:15 +0000
-Subject: [PATCH] Remove redundant YYLOC global declaration
-
-Same as the upstream fix for building dtc with gcc 10.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
-State: upstream (e33a814e772cdc36436c8c188d8c42d019fda639)
----
- scripts/dtc/dtc-lexer.l | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
-index fd825ebba6..24af549977 100644
---- a/scripts/dtc/dtc-lexer.l
-+++ b/scripts/dtc/dtc-lexer.l
-@@ -38,7 +38,6 @@ LINECOMMENT   "//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
- 
--YYLTYPE yylloc;
- extern bool treesource_error;
- 
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
--- 
-2.29.2
-
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend
index 65b6ad9d..8df497db 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend
@@ -1,5 +1,5 @@
 # Skip processing of this recipe if it is not explicitly specified as the
-# PREFERRED_PROVIDER for libmetal. This avoids network access required by
+# PREFERRED_PROVIDER for u-boot-tools. This avoids network access required by
 # the use of AUTOREV SRCREVs, which may be the default for some recipes.
 python () {
     if bb.data.inherits_class('native', d):
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.1.bb
index fe5ecf79..590d1755 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.1.bb
@@ -1,5 +1,5 @@
 require u-boot-tools-xlnx.inc
-require u-boot-xlnx-2023.1.inc
+require u-boot-xlnx-2024.1.inc
 
 # MUST clear CONFIG_VIDEO to avoid a compilation failure trying to construct
 # bmp_logo.h
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2024.01/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2024.01/microblaze-generic.cfg
new file mode 100644
index 00000000..033fb197
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2024.01/microblaze-generic.cfg
@@ -0,0 +1,83 @@
+# SPDX-License-Identifier: MIT
+
+#........................................................................
+#                                WARNING
+#
+# This file is a u-boot configuration fragment, and not a full u-boot
+# configuration file. The final u-boot configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on u-boot configuration, please
+# refer the product documentation.
+#
+#.......................................................................
+
+#
+# Definitions for Generic Microbalze machine.
+#
+CONFIG_BOOTDELAY=4
+CONFIG_TEXT_BASE=0x80100000
+CONFIG_SYS_PROMPT="U-Boot>"
+CONFIG_SYS_CONFIG_NAME="microblaze-generic"
+CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000
+# CONFIG_SYS_NS16550 is not set
+# CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set
+# CONFIG_SYS_FLASH_CFI is not set
+# CONFIG_FLASH_CFI_DRIVER is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_MTD_NOR_FLASH is not set
+# CONFIG_MTD_DEVICE is not set
+# CONFIG_SYS_FLASH_PROTECTION is not set
+# CONFIG_SPI_FLASH_SST is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_PHY_VITESSE is not set
+# CONFIG_CMD_EXT2 is not set
+# CONFIG_CMD_EXT4 is not set
+# CONFIG_CMD_EXT4_WRITE is not set
+# CONFIG_CMD_FAT is not set
+# CONFIG_DOS_PARTITION is not set
+# CONFIG_FAT_WRITE is not set
+CONFIG_DM=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_XILINX_UARTLITE=y
+CONFIG_XILINX_AXIEMAC=y
+CONFIG_PHY_XILINX=y
+CONFIG_PHY_TI=y
+CONFIG_NET=y
+CONFIG_PHY_GIGE=y
+CONFIG_NETDEVICES=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_DHCP=y
+CONFIG_PHYLIB=y
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_NFS=y
+CONFIG_CMD_MII=y
+CONFIG_PHY_MARVELL=y
+CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NATSEMI=y
+CONFIG_XILINX_SPI=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_SF=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_DM_SPI=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI=y
+CONFIG_SPI_FLASH_ISSI=y
+# CONFIG_BOOTARGS is not set
+# CONFIG_USE_BOOTARGS is not set
+# CONFIG_SPL is not set
+# CONFIG_I2C_EEPROM is not set
+# CONFIG_CMD_EEPROM is not set
+# CONFIG_SYS_I2C_EEPROM_ADDR is not set
+# CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set
+CONFIG_DCACHE=y
+CONFIG_ICACHE=y
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
index 72f43f71..56d65113 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
@@ -1,8 +1,8 @@
-UBOOT_VERSION = "v2023.01"
+UBOOT_VERSION = "v2024.01"
 
-UBRANCH = "xlnx_rebase_v2023.01_update"
+UBRANCH = "xlnx_rebase_v2024.01"
 
-SRCREV = "1689570b68dd3827e527a520805aa0bb7f58ee09"
+SRCREV = "19348a61f408d61afd7997adf511895d87b0d3ac"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
index 2ef7b9cf..57c00c6e 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
@@ -1,11 +1,6 @@
 SRC_URI += " \
     file://microblaze-generic.cfg \
-    file://microblaze-generic-top.h \
     "
 
-do_configure:prepend () {
-    install ${WORKDIR}/microblaze-generic-top.h ${S}/include/configs/
-}
-
-# Disable buildpaths QA check warnings for u-boot-xlnx.elf.
-INSANE_SKIP:${PN}-elf += "buildpaths"
+# Disable buildpaths and arch QA check warnings for u-boot-xlnx.elf.
+INSANE_SKIP:${PN}-elf += "buildpaths arch"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
index 6410fc25..c3af0185 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
@@ -65,6 +65,7 @@ UBOOTPXE_CONFIG ?= "pxelinux.cfg"
 UBOOTPXE_CONFIG_NAME = "${UBOOTPXE_CONFIG}${IMAGE_VERSION_SUFFIX}"
 
 DEVICETREE_ADDRESS ?= "${@append_baseaddr(d,d.getVar('DEVICETREE_OFFSET'))}"
+DEVICETREE_ADDRESS_SD ?= "${DEVICETREE_ADDRESS}"
 
 DEVICETREE_OFFSET:microblaze ??= "0x1e00000"
 DEVICETREE_OFFSET:zynqmp ??= "0x100000"
@@ -214,6 +215,7 @@ do_compile() {
         -e 's/@@KERNEL_LOAD_ADDRESS@@/${KERNEL_LOAD_ADDRESS}/' \
         -e 's/@@DEVICE_TREE_NAME@@/${DEVICE_TREE_NAME}/' \
         -e 's/@@DEVICETREE_ADDRESS@@/${DEVICETREE_ADDRESS}/' \
+        -e 's/@@DEVICETREE_ADDRESS_SD@@/${DEVICETREE_ADDRESS_SD}/' \
         -e 's/@@DEVICETREE_OVERLAY_ADDRESS@@/${DEVICETREE_OVERLAY_ADDRESS}/' \
         -e 's/@@RAMDISK_IMAGE@@/${RAMDISK_IMAGE}/' \
         -e 's/@@RAMDISK_IMAGE_ADDRESS@@/${RAMDISK_IMAGE_ADDRESS}/' \
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic
index d99932ed..e09bdfa9 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.generic
@@ -39,25 +39,25 @@ do
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@KERNEL_LOAD_ADDRESS@@ ${kernel_name};
                 fi
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /system.dtb; then
-                        fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_ADDRESS@@ system.dtb;
-                        setenv fdtcontroladdr @@DEVICETREE_ADDRESS@@
+                        fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_ADDRESS_SD@@ system.dtb;
+                        setenv fdtcontroladdr @@DEVICETREE_ADDRESS_SD@@
                 fi
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /devicetree/openamp.dtbo; then
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_OVERLAY_ADDRESS@@ devicetree/openamp.dtbo;
-                        fdt addr @@DEVICETREE_ADDRESS@@
+                        fdt addr @@DEVICETREE_ADDRESS_SD@@
                         fdt resize 8192
                         fdt apply @@DEVICETREE_OVERLAY_ADDRESS@@
                 fi
                 run update_bootargs
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /${ramdisk_name} && test "${skip_tinyramdisk}" != "yes"; then
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@RAMDISK_IMAGE_ADDRESS@@ ${ramdisk_name};
-                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@
+                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS_SD@@
                 fi
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /${rootfs_name} && test "${skip_ramdisk}" != "yes"; then
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@RAMDISK_IMAGE_ADDRESS@@ ${rootfs_name};
-                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@
+                        @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS_SD@@
                 fi
-                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ - @@DEVICETREE_ADDRESS@@
+                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ - @@DEVICETREE_ADDRESS_SD@@
         fi
         if test "${boot_target}" = "xspi0" || test "${boot_target}" = "xspi1" || test "${boot_target}" = "qspi" || test "${boot_target}" = "qspi0"; then
                 sf probe 0 0 0;
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal
index d726187a..36a8f92d 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.versal
@@ -1,7 +1,7 @@
 @@PRE_BOOTENV@@
 
 setenv sdbootdev @@SDBOOTDEV@@
-setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon clk_ignore_unused
+setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon
 fatload mmc $sdbootdev @@DEVICETREE_ADDRESS@@ @@DEVICE_TREE_NAME@@
 fatload mmc $sdbootdev:$partid @@KERNEL_LOAD_ADDRESS@@ @@KERNEL_IMAGETYPE@@
 @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ - @@DEVICETREE_ADDRESS@@
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp
index bddab5d0..ac7438bb 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.sd.zynqmp
@@ -1,7 +1,7 @@
 @@PRE_BOOTENV@@
 
 setenv sdbootdev @@SDBOOTDEV@@
-setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon clk_ignore_unused
+setenv bootargs $bootargs root=/dev/mmcblk${sdbootdev}p2 rw rootwait earlycon
 if test -n "@@BITSTREAM@@"; then
    fatload mmc $sdbootdev @@BITSTREAM_LOAD_ADDRESS@@ @@BITSTREAM_IMAGE@@ && fpga @@BITSTREAM_LOAD_TYPE@@ 0 @@BITSTREAM_LOAD_ADDRESS@@ ${filesize}
 fi
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
index 228396eb..1efc5392 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
@@ -83,7 +83,7 @@ DEPENDS:append := " virtual/kernel ${@remove_task_from_depends(d)}"
 
 # bootargs, default to booting with the rootfs device being partition 2
 KERNEL_BOOTARGS:zynq = "earlyprintk console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait"
-KERNEL_BOOTARGS:zynqmp = "earlycon clk_ignore_unused root=/dev/mmcblk${devnum}p2 rw rootwait"
+KERNEL_BOOTARGS:zynqmp = "earlycon root=/dev/mmcblk${devnum}p2 rw rootwait"
 
 KERNEL_LOAD_ADDRESS:zynq = "0x2080000"
 KERNEL_LOAD_ADDRESS:zynqmp = "0x200000"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
index 4c7ea934..bd9711f5 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -7,7 +7,7 @@ require u-boot-xlnx-common.inc
 
 SYSROOT_DIRS += "/boot"
 
-BASE_DTS ?= "${@os.path.basename(d.getVar('CONFIG_DTFILE') or '').rstrip('.dtb').rstrip('.dts') or 'system-top'}"
+BASE_DTS ?= "${@os.path.splitext(os.path.basename(d.getVar('CONFIG_DTFILE') or ''))[0] or 'system-top'}"
 DTB_PATH ?= "boot/devicetree/"
 DTB_FILE_NAME ?= ""
 
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.1.bb
index fd76bc51..718ad9d4 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.1.bb
@@ -1,4 +1,4 @@
 
 require u-boot-xlnx.inc
 require u-boot-spl-zynq-init.inc
-require u-boot-xlnx-2023.1.inc
+require u-boot-xlnx-2024.1.inc
diff --git a/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb b/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb
new file mode 100644
index 00000000..334b786b
--- /dev/null
+++ b/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb
@@ -0,0 +1,18 @@
+SUMMARY = "A general purpose TCP-IP emulator"
+DESCRIPTION = "A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
+HOMEPAGE = "https://gitlab.freedesktop.org/slirp/libslirp"
+LICENSE = "BSD-3-Clause & MIT"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727"
+
+SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
+SRCREV = "3ad1710a96678fe79066b1469cead4058713a1d9"
+PV = "4.7.0"
+S = "${WORKDIR}/git"
+
+DEPENDS = " \
+    glib-2.0 \
+"
+
+inherit meson pkgconfig
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch b/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
index 370e694b..1dcac990 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
+++ b/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
@@ -13,58 +13,77 @@ mach_path = tempfile.mkdtemp()
 
 # Separate PMU and APU arguments
 APU_args = sys.argv[1:]
-mbtype=''
+PMU_args = []
+PLM_args = []
 
 if '-pmu-args' in APU_args:
-    MB_args = APU_args[APU_args.index('-pmu-args')+1]
-    APU_args.remove('-pmu-args')
-    APU_args.remove(MB_args)
-    MB_args = MB_args.split()
-    PMU_rom = MB_args[MB_args.index('-kernel')+1]
-    mbtype='PMU'
-elif '-plm-args' in APU_args:
-    MB_args = APU_args[APU_args.index('-plm-args')+1]
-    APU_args.remove('-plm-args')
-    APU_args.remove(MB_args)
-    MB_args = MB_args.split()
-    mbtype='PLM'
-elif '--help' in APU_args:
-    mbtype='help'
-else:
-    error_msg = '\nMultiarch not setup properly.'
-    sys.exit(error_msg)
-
-error_msg = None
-if (mbtype == 'PMU' and os.path.exists(PMU_rom)) or mbtype == 'PLM':
-
-    # We need to switch tcp serial arguments (if they exist, e.g. qemurunner) to get the output correctly
-    tcp_serial_ports = [i for i, s in enumerate(APU_args) if 'tcp:127.0.0.1:' in s]
-
-    #NEED TO FIX for next yocto release (dont need to switch ports anymore, they will be provided correctly upstream
-    # We can only switch these if there are exactly two, otherwise we can't assume what is being executed so we leave it as is
-    if len(tcp_serial_ports) == 2:
-        APU_args[tcp_serial_ports[0]],APU_args[tcp_serial_ports[1]] = APU_args[tcp_serial_ports[1]],APU_args[tcp_serial_ports[0]]
-
-    mb_cmd =  binpath + '/qemu-system-microblazeel ' + ' '.join(MB_args) + ' -machine-path ' + mach_path
-    apu_cmd =  binpath + '/qemu-system-aarch64 ' + ' '.join(APU_args) + ' -machine-path ' + mach_path
-
-    # Debug prints
-    print('\n%s instance cmd: %s\n' % (mbtype, mb_cmd))
-    print('APU instance cmd: %s\n' % apu_cmd)
-
-
-    # Invoke QEMU pmu instance
-    process_pmu = subprocess.Popen(mb_cmd, shell=True, stderr=subprocess.PIPE)
-
-    # Invoke QEMU APU instance
-    process_apu = subprocess.Popen(apu_cmd, shell=True, stderr=subprocess.PIPE)
-    if process_apu.wait():
-        error_msg = '\nQEMU APU instance failed:\n%s' % process_apu.stderr.read().decode()
+    pmu_args_idx = APU_args.index('-pmu-args')
+    PMU_args = APU_args[pmu_args_idx+1].split()
+    del APU_args[pmu_args_idx:pmu_args_idx+2]
+
+if '-plm-args' in APU_args:
+    plm_args_idx = APU_args.index('-plm-args')
+    PLM_args = APU_args[plm_args_idx+1].split()
+    del APU_args[plm_args_idx:plm_args_idx+2]
+
+if PMU_args and PLM_args:
+    sys.exit("\nError: -pmu-args can not be used with -plm-args\n")
+
+if ('--help' in APU_args) or (not PMU_args and not PLM_args):
+    print("AMD FPGA QEMU multiarch wrapper\n")
+    print("Version 2024.1")
+    print("")
+    print("Usage:")
+    print("  %s <APU options> [-pmu-args <pmu options>]" % (sys.argv[0]))
+    print("  %s <APU options> [-plm-args <plm options>]" % (sys.argv[0]))
+    print("")
+    sys.exit(1)
+
+if PMU_args:
+    PMU_rom = PMU_args[PMU_args.index('-kernel')+1]
 
-else:
-    if mbtype == 'PMU':
+    if not os.path.exists(PMU_rom):
         error_msg = '\nError: Missing PMU ROM: %s' % PMU_rom
         error_msg += '\nSee "meta-xilinx/README.qemu.md" for more information on accquiring the PMU ROM.\n'
+        sys.exit(error_msg)
+
+# We need to switch tcp serial arguments (if they exist, e.g. qemurunner) to get the output correctly
+tcp_serial_ports = [i for i, s in enumerate(APU_args) if 'tcp:127.0.0.1:' in s]
+
+#NEED TO FIX for next yocto release (dont need to switch ports anymore, they will be provided correctly upstream
+# We can only switch these if there are exactly two, otherwise we can't assume what is being executed so we leave it as is
+if len(tcp_serial_ports) == 2:
+    APU_args[tcp_serial_ports[0]],APU_args[tcp_serial_ports[1]] = APU_args[tcp_serial_ports[1]],APU_args[tcp_serial_ports[0]]
+
+mb_cmd = ""
+if PMU_args:
+    mb_cmd =  binpath + '/qemu-system-microblazeel ' + ' '.join(PMU_args) + ' -machine-path ' + mach_path
+
+    print("PMU instance cmd: %s\n" % mb_cmd)
+
+if PLM_args:
+    mb_cmd =  binpath + '/qemu-system-microblazeel ' + ' '.join(PLM_args) + ' -machine-path ' + mach_path
+
+    print("PLM instance cmd: %s\n" % mb_cmd)
+
+apu_cmd =  binpath + '/qemu-system-aarch64 ' + ' '.join(APU_args) + ' -machine-path ' + mach_path
+
+print("APU instance cmd: %s\n" % apu_cmd)
+
+
+if mb_cmd:
+    process_mb = subprocess.Popen(mb_cmd, shell=True, stderr=subprocess.PIPE)
+
+if apu_cmd:
+    process_apu = subprocess.Popen(apu_cmd, shell=True, stderr=subprocess.PIPE)
+
+error_msg = ""
+if apu_cmd and process_apu.wait():
+    # We only check for failures on the MB instance if APU fails
+    error_msg += '\nQEMU APU instance failed:\n%s' % process_apu.stderr.read().decode()
+
+    if mb_cmd and process_mb.wait():
+        error_msg += '\nQEMU MB instance failed:\n%s' % process_mb.stderr.read().decode()
 
 shutil.rmtree(mach_path)
 sys.exit(error_msg)
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
new file mode 100644
index 00000000..5154e247
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
@@ -0,0 +1,290 @@
+SUMMARY = "Fast open source processor emulator"
+DESCRIPTION = "QEMU is a hosted virtual machine monitor: it emulates the \
+machine's processor through dynamic binary translation and provides a set \
+of different hardware and device models for the machine, enabling it to run \
+a variety of guest operating systems"
+HOMEPAGE = "http://qemu.org"
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+
+DEPENDS += "bison-native meson-native ninja-native"
+
+RDEPENDS:${PN}-ptest = "bash"
+
+require qemu-targets-8.1.inc
+# https://gitlab.com/qemu-project/qemu/-/commit/81e2b198a8cb4ee5fdf108bd438f44b193ee3a36 means
+# we need a full python3-native setup
+inherit pkgconfig ptest update-rc.d systemd python3native
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+                    file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
+
+SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
+           file://powerpc_rom.bin \
+           file://run-ptest \
+           file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \
+           file://0003-apic-fixup-fallthrough-to-PIC.patch \
+           file://0004-configure-Add-pkg-config-handling-for-libgcrypt.patch \
+           file://0005-qemu-Do-not-include-file-if-not-exists.patch \
+           file://0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \
+           file://0007-qemu-Determinism-fixes.patch \
+           file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \
+           file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \
+           file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \
+           file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \
+           file://fixedmeson.patch \
+           file://fixmips.patch \
+           file://no-pip.patch \
+           file://qemu-guest-agent.init \
+           file://qemu-guest-agent.udev \
+           "
+UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
+
+
+SRC_URI[sha256sum] = "541526a764576eb494d2ff5ec46aeb253e62ea29035d1c23c0a8af4e6cd4f087"
+
+SRC_URI:append:class-target = " file://cross.patch"
+SRC_URI:append:class-nativesdk = " file://cross.patch"
+
+CVE_STATUS[CVE-2017-5957] = "cpe-incorrect: Applies against virglrender < 0.6.0 and not qemu itself"
+
+CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default."
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11
+CVE_STATUS[CVE-2018-18438] = "disputed: The issues identified by this CVE were determined to not constitute a vulnerability."
+
+# As per https://nvd.nist.gov/vuln/detail/CVE-2023-0664
+# https://bugzilla.redhat.com/show_bug.cgi?id=2167423
+CVE_STATUS[CVE-2023-0664] = "not-applicable-platform: Issue only applies on Windows"
+
+# As per https://bugzilla.redhat.com/show_bug.cgi?id=2203387
+CVE_STATUS[CVE-2023-2680] = "not-applicable-platform: RHEL specific issue."
+
+COMPATIBLE_HOST:mipsarchn32 = "null"
+COMPATIBLE_HOST:mipsarchn64 = "null"
+COMPATIBLE_HOST:riscv32 = "null"
+
+# Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html
+# upstream states qemu doesn't work without optimization
+DEBUG_BUILD = "0"
+
+do_install:append() {
+    # Prevent QA warnings about installed ${localstatedir}/run
+    if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
+}
+
+do_install_ptest() {
+        cp -rL ${B}/tests ${D}${PTEST_PATH}
+        find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcodp]" | xargs -i rm -rf {}
+
+        # Don't check the file genreated by configure
+        sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh
+
+        # Strip the paths from the QEMU variable, we can use PATH
+        makfiles=$(find ${D}${PTEST_PATH} -name "*.mak")
+        sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" $makfiles
+
+        # Strip compiler flags as they break reproducibility
+        sed -i -e "s,^CC=.*,CC=gcc," \
+               -e "s,^CCAS=.*,CCAS=gcc," \
+               -e "s,^LD=.*,LD=ld," $makfiles
+
+        # Update SRC_PATH variable to the right place on target
+        sed -i -e "s#^SRC_PATH=.*#SRC_PATH=${PTEST_PATH}#g" $makfiles
+
+        # https://gitlab.com/qemu-project/qemu/-/issues/1403
+        rm ${D}${PTEST_PATH}/tests/unit/test-io-channel-command
+}
+
+# QEMU_TARGETS is overridable variable
+QEMU_TARGETS ?= "arm aarch64 i386 loongarch64 mips mipsel mips64 mips64el ppc ppc64 ppc64le riscv32 riscv64 sh4 x86_64"
+
+EXTRA_OECONF = " \
+    --prefix=${prefix} \
+    --bindir=${bindir} \
+    --includedir=${includedir} \
+    --libdir=${libdir} \
+    --mandir=${mandir} \
+    --datadir=${datadir} \
+    --docdir=${docdir}/${BPN} \
+    --sysconfdir=${sysconfdir} \
+    --libexecdir=${libexecdir} \
+    --localstatedir=${localstatedir} \
+    --with-suffix=${BPN} \
+    --disable-strip \
+    --disable-werror \
+    --extra-cflags='${CFLAGS}' \
+    --extra-ldflags='${LDFLAGS}' \
+    --disable-download \
+    --disable-docs \
+    --host-cc='${BUILD_CC}' \
+    ${PACKAGECONFIG_CONFARGS} \
+    "
+
+EXTRA_OECONF:append:class-target = " --cross-prefix=${HOST_PREFIX}"
+EXTRA_OECONF:append:class-nativesdk = " --cross-prefix=${HOST_PREFIX}"
+
+B = "${WORKDIR}/build"
+
+#EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3"
+
+do_configure:prepend:class-native() {
+        # Append build host pkg-config paths for native target since the host may provide sdl
+        BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
+        if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
+                export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
+        fi
+}
+
+do_configure() {
+    export PKG_CONFIG=pkg-config
+    ${S}/configure ${EXTRA_OECONF}
+}
+do_configure[cleandirs] += "${B}"
+
+do_install () {
+        export STRIP=""
+        oe_runmake 'DESTDIR=${D}' install
+
+        # If we built the guest agent, also install startup/udev rules
+        if [ -e "${D}${bindir}/qemu-ga" ]; then
+                install -d ${D}${sysconfdir}/init.d/
+                install -m 0755 ${WORKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent
+                sed -i 's:@bindir@:${bindir}:' ${D}${sysconfdir}/init.d/qemu-guest-agent
+
+                install -d ${D}${sysconfdir}/udev/rules.d/
+                install -m 0644 ${WORKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules
+
+                install -d ${D}${systemd_unitdir}/system/
+                install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service ${D}${systemd_unitdir}/system
+                sed -i -e 's,-/usr/bin/,-${bindir}/,g' ${D}${systemd_unitdir}/system/qemu-guest-agent.service
+        fi
+        # ELF binary /usr/share/qemu/s390-netboot.img has relocations in .text
+        rm ${D}${datadir}/qemu/s390-netboot.img -f
+        # ELF binary /usr/share/qemu/s390-ccw.img has relocations in .text [textrel]
+        rm ${D}${datadir}/qemu/s390-ccw.img -f
+}
+
+# The following fragment will create a wrapper for qemu-mips user emulation
+# binary in order to work around a segmentation fault issue. Basically, by
+# default, the reserved virtual address space for 32-on-64 bit is set to 4GB.
+# This will trigger a MMU access fault in the virtual CPU. With this change,
+# the qemu-mips works fine.
+# IMPORTANT: This piece needs to be removed once the root cause is fixed!
+do_install:append() {
+        if [ -e "${D}/${bindir}/qemu-mips" ]; then
+                create_wrapper ${D}/${bindir}/qemu-mips \
+                        QEMU_RESERVED_VA=0x0
+        fi
+}
+# END of qemu-mips workaround
+
+# Disable kvm/virgl/mesa on targets that do not support it
+PACKAGECONFIG:remove:darwin = "kvm virglrenderer epoxy gtk+"
+PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+ pie"
+
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2"
+PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
+PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr,"
+PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio,"
+PACKAGECONFIG[uring] = "--enable-linux-io-uring,--disable-linux-io-uring,liburing"
+PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen-tools,xen-tools-libxenstore xen-tools-libxenctrl xen-tools-libxenguest"
+PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl,"
+PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg,"
+PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,curl,"
+PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss,"
+PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
+PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+3 gettext-native"
+PACKAGECONFIG[vte] = "--enable-vte,--disable-vte,vte gettext-native"
+PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
+PACKAGECONFIG[ssh] = "--enable-libssh,--disable-libssh,libssh,"
+PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
+PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle"
+PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1"
+PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc"
+PACKAGECONFIG[alsa] = "--audio-drv-list=default,,alsa-lib"
+PACKAGECONFIG[epoxy] = "--enable-opengl,--disable-opengl,libepoxy"
+PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo"
+PACKAGECONFIG[dax] = "--enable-libdaxctl,--disable-libdaxctl,ndctl"
+PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl"
+PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls"
+PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2"
+PACKAGECONFIG[libiscsi] = "--enable-libiscsi,--disable-libiscsi"
+PACKAGECONFIG[kvm] = "--enable-kvm,--disable-kvm"
+PACKAGECONFIG[virglrenderer] = "--enable-virglrenderer,--disable-virglrenderer,virglrenderer"
+# spice will be in meta-networking layer
+PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice"
+# usbredir will be in meta-networking layer
+PACKAGECONFIG[dbus-display] = "--enable-dbus-display,--disable-dbus-display,glib-2.0-native,dbus"
+PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir"
+PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy"
+PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs,glusterfs"
+PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
+PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,udev"
+PACKAGECONFIG[attr] = "--enable-attr,--disable-attr,attr,"
+PACKAGECONFIG[rbd] = "--enable-rbd,--disable-rbd,ceph,ceph"
+PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,,"
+PACKAGECONFIG[ust] = "--enable-trace-backends=ust,,lttng-ust,"
+PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,,"
+PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp"
+# libnfs is currently provided by meta-kodi
+PACKAGECONFIG[libnfs] = "--enable-libnfs,--disable-libnfs,libnfs"
+PACKAGECONFIG[pmem] = "--enable-libpmem,--disable-libpmem,pmdk"
+PACKAGECONFIG[pulseaudio] = "--enable-pa,--disable-pa,pulseaudio"
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux"
+PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf"
+PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone"
+PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma"
+PACKAGECONFIG[vde] = "--enable-vde,--disable-vde"
+PACKAGECONFIG[fuse] = "--enable-fuse --enable-fuse-lseek,--disable-fuse --disable-fuse-lseek,fuse3"
+PACKAGECONFIG[slirp] = "--enable-slirp,--disable-slirp,libslirp"
+PACKAGECONFIG[brlapi] = "--enable-brlapi,--disable-brlapi"
+PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack,"
+PACKAGECONFIG[debuginfo] = "--enable-libdw,--disable-libdw,elfutils"
+PACKAGECONFIG[pipewire] = "--enable-pipewire,--disable-pipewire,pipewire"
+PACKAGECONFIG[sndio] = "--enable-sndio,--disable-sndio,sndio"
+
+INSANE_SKIP:${PN}-common = "arch"
+
+FILES:${PN} += "${datadir}/icons"
+
+# For user who want to install all arch packages
+PACKAGES =+ "${PN}-common"
+RDEPENDS:${PN} += "${PN}-common"
+
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN} = ""
+
+FILES:${PN}-common = "${bindir}/* ${includedir}/* ${libexecdir}/* ${datadir}/* ${localstatedir}"
+
+PACKAGES_DYNAMIC += "^${PN}-user-.*  ^${PN}-system-.*"
+
+PACKAGESPLITFUNCS =+ "split_qemu_packages"
+
+python split_qemu_packages () {
+    archdir = d.expand('${bindir}/')
+    subpackages = do_split_packages(d, archdir, r'^qemu-system-(.*)$', '${PN}-system-%s', 'QEMU full system emulation binaries(%s)' , prepend=True, extra_depends='${PN}-common')
+
+    subpackages += do_split_packages(d, archdir, r'^qemu-((?!system|edid|ga|img|io|nbd|pr-helper|storage-daemon).*)$', '${PN}-user-%s', 'QEMU full user emulation binaries(%s)' , prepend=True, extra_depends='${PN}-common')
+    if subpackages:
+        d.appendVar('RDEPENDS:' + d.getVar('PN'), ' ' + ' '.join(subpackages))
+    mipspackage = d.getVar('PN') + "-user-mips"
+    if mipspackage in ' '.join(subpackages):
+        d.appendVar('RDEPENDS:' + mipspackage, ' ' + d.getVar("MLPREFIX") + 'bash')
+}
+
+# Put the guest agent in a separate package
+PACKAGES =+ "${PN}-guest-agent"
+SUMMARY:${PN}-guest-agent = "QEMU guest agent"
+FILES:${PN}-guest-agent += " \
+    ${bindir}/qemu-ga \
+    ${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules \
+    ${sysconfdir}/init.d/qemu-guest-agent \
+    ${systemd_unitdir}/system/qemu-guest-agent.service \
+"
+
+INITSCRIPT_PACKAGES = "${PN}-guest-agent"
+INITSCRIPT_NAME:${PN}-guest-agent = "qemu-guest-agent"
+INITSCRIPT_PARAMS:${PN}-guest-agent = "defaults"
+
+SYSTEMD_PACKAGES = "${PN}-guest-agent"
+SYSTEMD_SERVICE:${PN}-guest-agent = "qemu-guest-agent.service"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
new file mode 100644
index 00000000..c6550801
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
@@ -0,0 +1,33 @@
+From de64af82950a6908f9407dfc92b83c17e2af3eab Mon Sep 17 00:00:00 2001
+From: Jason Wessel <jason.wessel@windriver.com>
+Date: Fri, 28 Mar 2014 17:42:43 +0800
+Subject: [PATCH 01/12] qemu: Add addition environment space to boot loader
+ qemu-system-mips
+
+Upstream-Status: Inappropriate - OE uses deep paths
+
+If you create a project with very long directory names like 128 characters
+deep and use NFS, the kernel arguments will be truncated. The kernel will
+accept longer strings such as 1024 bytes, but the qemu boot loader defaulted
+to only 256 bytes. This patch expands the limit.
+
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+
+---
+ hw/mips/malta.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-8.0.0/hw/mips/malta.c
+===================================================================
+--- qemu-8.0.0.orig/hw/mips/malta.c
++++ qemu-8.0.0/hw/mips/malta.c
+@@ -64,7 +64,7 @@
+ #define ENVP_PADDR          0x2000
+ #define ENVP_VADDR          cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR)
+ #define ENVP_NB_ENTRIES     16
+-#define ENVP_ENTRY_SIZE     256
++#define ENVP_ENTRY_SIZE     1024
+ 
+ /* Hardware addresses */
+ #define FLASH_ADDRESS       0x1e000000ULL
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch
new file mode 100644
index 00000000..ceae67be
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch
@@ -0,0 +1,355 @@
+From 71f14902256e3c3529710b713e1ea43100bf4c40 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 17 Dec 2022 08:37:46 -0800
+Subject: [PATCH 2/2] linux-user: Replace use of lfs64 related functions and
+ macros
+
+Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
+anf macros behave same as their 64 suffixed counterparts. This also
+helps in compiling with latest musl C library, where these macros and
+functions are no more available under _GNU_SOURCE feature macro
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2022-12/msg02841.html]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Laurent Vivier <laurent@vivier.eu>
+---
+ linux-user/syscall.c | 153 +++++++++++--------------------------------
+ 1 file changed, 39 insertions(+), 114 deletions(-)
+
+Index: qemu-8.0.0/linux-user/syscall.c
+===================================================================
+--- qemu-8.0.0.orig/linux-user/syscall.c
++++ qemu-8.0.0/linux-user/syscall.c
+@@ -761,8 +761,8 @@ safe_syscall6(ssize_t, copy_file_range,
+  */
+ #define safe_ioctl(...) safe_syscall(__NR_ioctl, __VA_ARGS__)
+ /* Similarly for fcntl. Note that callers must always:
+- *  pass the F_GETLK64 etc constants rather than the unsuffixed F_GETLK
+- *  use the flock64 struct rather than unsuffixed flock
++ *  pass the F_GETLK etc constants rather than the unsuffixed F_GETLK
++ *  use the flock struct rather than unsuffixed flock
+  * This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts.
+  */
+ #ifdef __NR_fcntl64
+@@ -6813,13 +6813,13 @@ static int target_to_host_fcntl_cmd(int
+         ret = cmd;
+         break;
+     case TARGET_F_GETLK:
+-        ret = F_GETLK64;
++        ret = F_GETLK;
+         break;
+     case TARGET_F_SETLK:
+-        ret = F_SETLK64;
++        ret = F_SETLK;
+         break;
+     case TARGET_F_SETLKW:
+-        ret = F_SETLKW64;
++        ret = F_SETLKW;
+         break;
+     case TARGET_F_GETOWN:
+         ret = F_GETOWN;
+@@ -6833,17 +6833,6 @@ static int target_to_host_fcntl_cmd(int
+     case TARGET_F_SETSIG:
+         ret = F_SETSIG;
+         break;
+-#if TARGET_ABI_BITS == 32
+-    case TARGET_F_GETLK64:
+-        ret = F_GETLK64;
+-        break;
+-    case TARGET_F_SETLK64:
+-        ret = F_SETLK64;
+-        break;
+-    case TARGET_F_SETLKW64:
+-        ret = F_SETLKW64;
+-        break;
+-#endif
+     case TARGET_F_SETLEASE:
+         ret = F_SETLEASE;
+         break;
+@@ -6895,8 +6884,8 @@ static int target_to_host_fcntl_cmd(int
+      * them to 5, 6 and 7 before making the syscall(). Since we make the
+      * syscall directly, adjust to what is supported by the kernel.
+      */
+-    if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
+-        ret -= F_GETLK64 - 5;
++    if (ret >= F_GETLK && ret <= F_SETLKW) {
++        ret -= F_GETLK - 5;
+     }
+ #endif
+ 
+@@ -6929,55 +6918,11 @@ static int host_to_target_flock(int type
+     return type;
+ }
+ 
+-static inline abi_long copy_from_user_flock(struct flock64 *fl,
+-                                            abi_ulong target_flock_addr)
+-{
+-    struct target_flock *target_fl;
+-    int l_type;
+-
+-    if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
+-        return -TARGET_EFAULT;
+-    }
+-
+-    __get_user(l_type, &target_fl->l_type);
+-    l_type = target_to_host_flock(l_type);
+-    if (l_type < 0) {
+-        return l_type;
+-    }
+-    fl->l_type = l_type;
+-    __get_user(fl->l_whence, &target_fl->l_whence);
+-    __get_user(fl->l_start, &target_fl->l_start);
+-    __get_user(fl->l_len, &target_fl->l_len);
+-    __get_user(fl->l_pid, &target_fl->l_pid);
+-    unlock_user_struct(target_fl, target_flock_addr, 0);
+-    return 0;
+-}
+-
+-static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
+-                                          const struct flock64 *fl)
+-{
+-    struct target_flock *target_fl;
+-    short l_type;
+-
+-    if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
+-        return -TARGET_EFAULT;
+-    }
+-
+-    l_type = host_to_target_flock(fl->l_type);
+-    __put_user(l_type, &target_fl->l_type);
+-    __put_user(fl->l_whence, &target_fl->l_whence);
+-    __put_user(fl->l_start, &target_fl->l_start);
+-    __put_user(fl->l_len, &target_fl->l_len);
+-    __put_user(fl->l_pid, &target_fl->l_pid);
+-    unlock_user_struct(target_fl, target_flock_addr, 1);
+-    return 0;
+-}
+-
+-typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
+-typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
++typedef abi_long from_flock_fn(struct flock *fl, abi_ulong target_addr);
++typedef abi_long to_flock_fn(abi_ulong target_addr, const struct flock *fl);
+ 
+ #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
+-struct target_oabi_flock64 {
++struct target_oabi_flock {
+     abi_short l_type;
+     abi_short l_whence;
+     abi_llong l_start;
+@@ -6985,10 +6930,10 @@ struct target_oabi_flock64 {
+     abi_int   l_pid;
+ } QEMU_PACKED;
+ 
+-static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
++static inline abi_long copy_from_user_oabi_flock(struct flock *fl,
+                                                    abi_ulong target_flock_addr)
+ {
+-    struct target_oabi_flock64 *target_fl;
++    struct target_oabi_flock *target_fl;
+     int l_type;
+ 
+     if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
+@@ -7009,10 +6954,10 @@ static inline abi_long copy_from_user_oa
+     return 0;
+ }
+ 
+-static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
+-                                                 const struct flock64 *fl)
++static inline abi_long copy_to_user_oabi_flock(abi_ulong target_flock_addr,
++                                                 const struct flock *fl)
+ {
+-    struct target_oabi_flock64 *target_fl;
++    struct target_oabi_flock *target_fl;
+     short l_type;
+ 
+     if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
+@@ -7030,10 +6975,10 @@ static inline abi_long copy_to_user_oabi
+ }
+ #endif
+ 
+-static inline abi_long copy_from_user_flock64(struct flock64 *fl,
++static inline abi_long copy_from_user_flock(struct flock *fl,
+                                               abi_ulong target_flock_addr)
+ {
+-    struct target_flock64 *target_fl;
++    struct target_flock *target_fl;
+     int l_type;
+ 
+     if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
+@@ -7054,10 +6999,10 @@ static inline abi_long copy_from_user_fl
+     return 0;
+ }
+ 
+-static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
+-                                            const struct flock64 *fl)
++static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
++                                            const struct flock *fl)
+ {
+-    struct target_flock64 *target_fl;
++    struct target_flock *target_fl;
+     short l_type;
+ 
+     if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
+@@ -7076,7 +7021,7 @@ static inline abi_long copy_to_user_floc
+ 
+ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
+ {
+-    struct flock64 fl64;
++    struct flock fl64;
+ #ifdef F_GETOWN_EX
+     struct f_owner_ex fox;
+     struct target_f_owner_ex *target_fox;
+@@ -7089,6 +7034,7 @@ static abi_long do_fcntl(int fd, int cmd
+ 
+     switch(cmd) {
+     case TARGET_F_GETLK:
++    case TARGET_F_OFD_GETLK:
+         ret = copy_from_user_flock(&fl64, arg);
+         if (ret) {
+             return ret;
+@@ -7098,32 +7044,11 @@ static abi_long do_fcntl(int fd, int cmd
+             ret = copy_to_user_flock(arg, &fl64);
+         }
+         break;
+-
+     case TARGET_F_SETLK:
+     case TARGET_F_SETLKW:
+-        ret = copy_from_user_flock(&fl64, arg);
+-        if (ret) {
+-            return ret;
+-        }
+-        ret = get_errno(safe_fcntl(fd, host_cmd, &fl64));
+-        break;
+-
+-    case TARGET_F_GETLK64:
+-    case TARGET_F_OFD_GETLK:
+-        ret = copy_from_user_flock64(&fl64, arg);
+-        if (ret) {
+-            return ret;
+-        }
+-        ret = get_errno(safe_fcntl(fd, host_cmd, &fl64));
+-        if (ret == 0) {
+-            ret = copy_to_user_flock64(arg, &fl64);
+-        }
+-        break;
+-    case TARGET_F_SETLK64:
+-    case TARGET_F_SETLKW64:
+     case TARGET_F_OFD_SETLK:
+     case TARGET_F_OFD_SETLKW:
+-        ret = copy_from_user_flock64(&fl64, arg);
++        ret = copy_from_user_flock(&fl64, arg);
+         if (ret) {
+             return ret;
+         }
+@@ -7348,7 +7273,7 @@ static inline abi_long target_truncate64
+         arg2 = arg3;
+         arg3 = arg4;
+     }
+-    return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
++    return get_errno(truncate(arg1, target_offset64(arg2, arg3)));
+ }
+ #endif
+ 
+@@ -7362,7 +7287,7 @@ static inline abi_long target_ftruncate6
+         arg2 = arg3;
+         arg3 = arg4;
+     }
+-    return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
++    return get_errno(ftruncate(arg1, target_offset64(arg2, arg3)));
+ }
+ #endif
+ 
+@@ -8598,7 +8523,7 @@ static int do_getdents(abi_long dirfd, a
+     void *tdirp;
+     int hlen, hoff, toff;
+     int hreclen, treclen;
+-    off64_t prev_diroff = 0;
++    off_t prev_diroff = 0;
+ 
+     hdirp = g_try_malloc(count);
+     if (!hdirp) {
+@@ -8651,7 +8576,7 @@ static int do_getdents(abi_long dirfd, a
+              * Return what we have, resetting the file pointer to the
+              * location of the first record not returned.
+              */
+-            lseek64(dirfd, prev_diroff, SEEK_SET);
++            lseek(dirfd, prev_diroff, SEEK_SET);
+             break;
+         }
+ 
+@@ -8685,7 +8610,7 @@ static int do_getdents64(abi_long dirfd,
+     void *tdirp;
+     int hlen, hoff, toff;
+     int hreclen, treclen;
+-    off64_t prev_diroff = 0;
++    off_t prev_diroff = 0;
+ 
+     hdirp = g_try_malloc(count);
+     if (!hdirp) {
+@@ -8727,7 +8652,7 @@ static int do_getdents64(abi_long dirfd,
+              * Return what we have, resetting the file pointer to the
+              * location of the first record not returned.
+              */
+-            lseek64(dirfd, prev_diroff, SEEK_SET);
++            lseek(dirfd, prev_diroff, SEEK_SET);
+             break;
+         }
+ 
+@@ -11158,7 +11083,7 @@ static abi_long do_syscall1(CPUArchState
+                 return -TARGET_EFAULT;
+             }
+         }
+-        ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
++        ret = get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)));
+         unlock_user(p, arg2, ret);
+         return ret;
+     case TARGET_NR_pwrite64:
+@@ -11175,7 +11100,7 @@ static abi_long do_syscall1(CPUArchState
+                 return -TARGET_EFAULT;
+             }
+         }
+-        ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
++        ret = get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5)));
+         unlock_user(p, arg2, 0);
+         return ret;
+ #endif
+@@ -11998,14 +11923,14 @@ static abi_long do_syscall1(CPUArchState
+     case TARGET_NR_fcntl64:
+     {
+         int cmd;
+-        struct flock64 fl;
+-        from_flock64_fn *copyfrom = copy_from_user_flock64;
+-        to_flock64_fn *copyto = copy_to_user_flock64;
++        struct flock fl;
++        from_flock_fn *copyfrom = copy_from_user_flock;
++        to_flock_fn *copyto = copy_to_user_flock;
+ 
+ #ifdef TARGET_ARM
+         if (!cpu_env->eabi) {
+-            copyfrom = copy_from_user_oabi_flock64;
+-            copyto = copy_to_user_oabi_flock64;
++            copyfrom = copy_from_user_oabi_flock;
++            copyto = copy_to_user_oabi_flock;
+         }
+ #endif
+ 
+@@ -12015,7 +11940,7 @@ static abi_long do_syscall1(CPUArchState
+         }
+ 
+         switch(arg2) {
+-        case TARGET_F_GETLK64:
++        case TARGET_F_GETLK:
+             ret = copyfrom(&fl, arg3);
+             if (ret) {
+                 break;
+@@ -12026,8 +11951,8 @@ static abi_long do_syscall1(CPUArchState
+             }
+            break;
+ 
+-        case TARGET_F_SETLK64:
+-        case TARGET_F_SETLKW64:
++        case TARGET_F_SETLK:
++        case TARGET_F_SETLKW:
+             ret = copyfrom(&fl, arg3);
+             if (ret) {
+                 break;
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0003-apic-fixup-fallthrough-to-PIC.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0003-apic-fixup-fallthrough-to-PIC.patch
new file mode 100644
index 00000000..e85f8202
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0003-apic-fixup-fallthrough-to-PIC.patch
@@ -0,0 +1,44 @@
+From dc2a8ccd440ee3741b61606eafed3f7e092f4312 Mon Sep 17 00:00:00 2001
+From: Mark Asselstine <mark.asselstine@windriver.com>
+Date: Tue, 26 Feb 2013 11:43:28 -0500
+Subject: [PATCH 03/12] apic: fixup fallthrough to PIC
+
+Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC
+interrupts through the local APIC if the local APIC config says so.]
+missed a check to ensure the local APIC is enabled. Since if the local
+APIC is disabled it doesn't matter what the local APIC config says.
+
+If this check isn't done and the guest has disabled the local APIC the
+guest will receive a general protection fault, similar to what is seen
+here:
+
+https://lists.gnu.org/archive/html/qemu-devel/2012-12/msg02304.html
+
+The GPF is caused by an attempt to service interrupt 0xffffffff. This
+comes about since cpu_get_pic_interrupt() calls apic_accept_pic_intr()
+(with the local APIC disabled apic_get_interrupt() returns -1).
+apic_accept_pic_intr() returns 0 and thus the interrupt number which
+is returned from cpu_get_pic_interrupt(), and which is attempted to be
+serviced, is -1.
+
+Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg00878.html]
+Signed-off-by: He Zhe <zhe.he@windriver.com>
+
+---
+ hw/intc/apic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-8.0.0/hw/intc/apic.c
+===================================================================
+--- qemu-8.0.0.orig/hw/intc/apic.c
++++ qemu-8.0.0/hw/intc/apic.c
+@@ -607,7 +607,7 @@ int apic_accept_pic_intr(DeviceState *de
+     APICCommonState *s = APIC(dev);
+     uint32_t lvt0;
+ 
+-    if (!s)
++    if (!s || !(s->spurious_vec & APIC_SV_ENABLE))
+         return -1;
+ 
+     lvt0 = s->lvt[APIC_LVT_LINT0];
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch
new file mode 100644
index 00000000..f981a64a
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch
@@ -0,0 +1,29 @@
+From d8265abdce5dc2bf74b3fccdf2b7257b4f3894f0 Mon Sep 17 00:00:00 2001
+From: He Zhe <zhe.he@windriver.com>
+Date: Wed, 28 Aug 2019 19:56:28 +0800
+Subject: [PATCH 04/12] configure: Add pkg-config handling for libgcrypt
+
+libgcrypt may also be controlled by pkg-config, this patch adds pkg-config
+handling for libgcrypt.
+
+Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html]
+
+Signed-off-by: He Zhe <zhe.he@windriver.com>
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-8.1.0/meson.build
+===================================================================
+--- qemu-8.1.0.orig/meson.build
++++ qemu-8.1.0/meson.build
+@@ -1481,7 +1481,7 @@ endif
+ if not gnutls_crypto.found()
+   if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled()
+     gcrypt = dependency('libgcrypt', version: '>=1.8',
+-                        method: 'config-tool',
++                        method: 'pkg-config',
+                         required: get_option('gcrypt'))
+     # Debian has removed -lgpg-error from libgcrypt-config
+     # as it "spreads unnecessary dependencies" which in
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0005-qemu-Do-not-include-file-if-not-exists.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0005-qemu-Do-not-include-file-if-not-exists.patch
new file mode 100644
index 00000000..38aa4c3b
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0005-qemu-Do-not-include-file-if-not-exists.patch
@@ -0,0 +1,32 @@
+From f39e7bfc5ed07b5ecaeb705c4eae4855ca120d47 Mon Sep 17 00:00:00 2001
+From: Oleksiy Obitotskyy <oobitots@cisco.com>
+Date: Wed, 25 Mar 2020 21:21:35 +0200
+Subject: [PATCH 05/12] qemu: Do not include file if not exists
+
+Script configure checks for if_alg.h and check failed but
+if_alg.h still included.
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2020-03/msg07188.html]
+Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
+
+[update patch context]
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+
+---
+ linux-user/syscall.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: qemu-8.0.0/linux-user/syscall.c
+===================================================================
+--- qemu-8.0.0.orig/linux-user/syscall.c
++++ qemu-8.0.0/linux-user/syscall.c
+@@ -115,7 +115,9 @@
+ #include <linux/blkpg.h>
+ #include <netpacket/packet.h>
+ #include <linux/netlink.h>
++#if defined(CONFIG_AF_ALG)
+ #include <linux/if_alg.h>
++#endif
+ #include <linux/rtc.h>
+ #include <sound/asound.h>
+ #ifdef HAVE_BTRFS_H
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
new file mode 100644
index 00000000..5d1d7c68
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
@@ -0,0 +1,49 @@
+From 375cae3dd6151ef33cae8f243f6a2c2da6c0c356 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Fri, 8 Jan 2021 17:27:06 +0000
+Subject: [PATCH 06/12] qemu: Add some user space mmap tweaks to address musl
+ 32 bit
+
+When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an
+infinite loop of mremap calls of ever decreasing/increasing addresses.
+
+I suspect something in the musl memory allocation code loops indefinitely
+if it only sees ENOMEM and only exits when it hits EFAULT.
+
+According to the docs, trying to mremap outside the address space
+can/should return EFAULT and changing this allows the build to succeed.
+
+A better return value for the other cases of invalid addresses is EINVAL
+rather than ENOMEM so adjust the other part of the test to this.
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
+
+---
+ linux-user/mmap.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+Index: qemu-8.0.0/linux-user/mmap.c
+===================================================================
+--- qemu-8.0.0.orig/linux-user/mmap.c
++++ qemu-8.0.0/linux-user/mmap.c
+@@ -776,12 +776,16 @@ abi_long target_mremap(abi_ulong old_add
+     int prot;
+     void *host_addr;
+ 
+-    if (!guest_range_valid_untagged(old_addr, old_size) ||
+-        ((flags & MREMAP_FIXED) &&
++    if (!guest_range_valid_untagged(old_addr, old_size)) {
++        errno = EFAULT;
++        return -1;
++    }
++    
++    if (((flags & MREMAP_FIXED) &&
+          !guest_range_valid_untagged(new_addr, new_size)) ||
+         ((flags & MREMAP_MAYMOVE) == 0 &&
+          !guest_range_valid_untagged(old_addr, new_size))) {
+-        errno = ENOMEM;
++        errno = EINVAL;
+         return -1;
+     }
+ 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0007-qemu-Determinism-fixes.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0007-qemu-Determinism-fixes.patch
new file mode 100644
index 00000000..d3f965e0
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0007-qemu-Determinism-fixes.patch
@@ -0,0 +1,31 @@
+From 50bab5c2605b609ea7ea154f57a9be96d656725a Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Mon, 1 Mar 2021 13:00:47 +0000
+Subject: [PATCH 07/12] qemu: Determinism fixes
+
+When sources are included within debug information, a couple of areas of the
+qemu build are not reproducible due to either full buildpaths or timestamps.
+
+Replace the full paths with relative ones. I couldn't figure out how to get
+meson to pass relative paths but we can fix that in the script.
+
+Upstream-Status: Pending [some version of all/part of this may be accepted]
+RP 2021/3/1
+
+---
+ scripts/decodetree.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-8.0.0/scripts/decodetree.py
+===================================================================
+--- qemu-8.0.0.orig/scripts/decodetree.py
++++ qemu-8.0.0/scripts/decodetree.py
+@@ -1328,7 +1328,7 @@ def main():
+     toppat = ExcMultiPattern(0)
+ 
+     for filename in args:
+-        input_file = filename
++        input_file = os.path.relpath(filename)
+         f = open(filename, 'rt', encoding='utf-8')
+         parse_file(f, toppat)
+         f.close()
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch
new file mode 100644
index 00000000..a84364cc
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch
@@ -0,0 +1,41 @@
+From 2bf9388b801d4389e2d57e95a7897bfc1c42786e Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 14 Jan 2021 06:33:04 +0000
+Subject: [PATCH 08/12] tests/meson.build: use relative path to refer to files
+
+Fix error like:
+Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long
+
+when build path is too long, use meson.source_root() will make this
+filename too long. Fixed by using relative path to refer to files
+
+Upstream-Status: Submitted [send to qemu-devel]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+
+---
+ tests/unit/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: qemu-8.0.0/tests/unit/meson.build
+===================================================================
+--- qemu-8.0.0.orig/tests/unit/meson.build
++++ qemu-8.0.0/tests/unit/meson.build
+@@ -46,7 +46,7 @@ tests = {
+   'test-keyval': [testqapi],
+   'test-logging': [],
+   'test-uuid': [],
+-  'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'],
++  'ptimer-test': ['ptimer-test-stubs.c', '../../hw/core/ptimer.c'],
+   'test-qapi-util': [],
+   'test-interval-tree': [],
+   'test-xs-node': [qom],
+@@ -136,7 +136,7 @@ if have_system
+     'test-util-sockets': ['socket-helpers.c'],
+     'test-base64': [],
+     'test-bufferiszero': [],
+-    'test-smp-parse': [qom, meson.project_source_root() / 'hw/core/machine-smp.c'],
++    'test-smp-parse': [qom, '../../hw/core/machine-smp.c'],
+     'test-vmstate': [migration, io],
+     'test-yank': ['socket-helpers.c', qom, io, chardev]
+   }
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
new file mode 100644
index 00000000..4de6cc24
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
@@ -0,0 +1,46 @@
+From ebf4bb2f51da83af0c61480414cfa156f7308b34 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 21 Mar 2022 10:09:38 -0700
+Subject: [PATCH 09/12] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
+ systems
+
+linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures
+which include asm-generic/mman.h and mips/powerpc are not including this
+file in linux/mman.h, therefore these should be defined for such
+architectures on Linux as well. This fixes build on mips/musl/linux
+
+Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg05298.html]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Zhang Yi <yi.z.zhang@linux.intel.com>
+Cc: Michael S. Tsirkin <mst@redhat.com>
+
+---
+ util/mmap-alloc.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+Index: qemu-8.0.0/util/mmap-alloc.c
+===================================================================
+--- qemu-8.0.0.orig/util/mmap-alloc.c
++++ qemu-8.0.0/util/mmap-alloc.c
+@@ -10,14 +10,18 @@
+  * later.  See the COPYING file in the top-level directory.
+  */
+ 
++#include "qemu/osdep.h"
+ #ifdef CONFIG_LINUX
+ #include <linux/mman.h>
+-#else  /* !CONFIG_LINUX */
++#endif  /* CONFIG_LINUX */
++
++#ifndef MAP_SYNC
+ #define MAP_SYNC              0x0
++#endif /* MAP_SYNC */
++#ifndef MAP_SHARED_VALIDATE
+ #define MAP_SHARED_VALIDATE   0x0
+-#endif /* CONFIG_LINUX */
++#endif /* MAP_SHARED_VALIDATE */
+ 
+-#include "qemu/osdep.h"
+ #include "qemu/mmap-alloc.h"
+ #include "qemu/host-utils.h"
+ #include "qemu/cutils.h"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch
new file mode 100644
index 00000000..6caf35b6
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch
@@ -0,0 +1,40 @@
+CVE: CVE-2022-1050
+Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20220403095234.2210-1-yuval.shaia.ml@gmail.com/]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From dbdef95c272e8f3ec037c3db4197c66002e30995 Mon Sep 17 00:00:00 2001
+From: Yuval Shaia <yuval.shaia.ml@gmail.com>
+Date: Sun, 3 Apr 2022 12:52:34 +0300
+Subject: [PATCH] hw/pvrdma: Protect against buggy or malicious guest driver
+
+Guest driver might execute HW commands when shared buffers are not yet
+allocated.
+This could happen on purpose (malicious guest) or because of some other
+guest/host address mapping error.
+We need to protect againts such case.
+
+Fixes: CVE-2022-1050
+
+Reported-by: Raven <wxhusst@gmail.com>
+Signed-off-by: Yuval Shaia <yuval.shaia.ml@gmail.com>
+---
+ hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: qemu-8.0.0/hw/rdma/vmw/pvrdma_cmd.c
+===================================================================
+--- qemu-8.0.0.orig/hw/rdma/vmw/pvrdma_cmd.c
++++ qemu-8.0.0/hw/rdma/vmw/pvrdma_cmd.c
+@@ -782,6 +782,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev)
+             goto out;
+     }
+ 
++    if (!dsr_info->dsr) {
++            /* Buggy or malicious guest driver */
++            rdma_error_report("Exec command without dsr, req or rsp buffers");
++            goto out;
++    }
++
+     if (dsr_info->req->hdr.cmd >= sizeof(cmd_handlers) /
+                       sizeof(struct cmd_handler)) {
+         rdma_error_report("Unsupported command");
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/cross.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/cross.patch
new file mode 100644
index 00000000..112eb925
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/cross.patch
@@ -0,0 +1,38 @@
+From 76c3fc4c87231bed32974ebbbdb5079cff45a6b7 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Tue, 5 Jan 2021 23:00:14 +0000
+Subject: [PATCH 12/12] qemu: Upgrade 5.1.0->5.2.0
+
+We need to be able to trigger configure's cross code but we don't want
+to set cross_prefix as it does other things we don't want. Patch things
+so we can do what we need in the target config case.
+
+Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+---
+ configure | 4 ----
+ 1 file changed, 4 deletions(-)
+
+Index: qemu-8.0.0/configure
+===================================================================
+--- qemu-8.0.0.orig/configure
++++ qemu-8.0.0/configure
+@@ -2590,7 +2590,6 @@ if test "$skip_meson" = no; then
+   echo "widl = [$(meson_quote $widl)]" >> $cross
+   echo "windres = [$(meson_quote $windres)]" >> $cross
+   echo "windmc = [$(meson_quote $windmc)]" >> $cross
+-  if test "$cross_compile" = "yes"; then
+     cross_arg="--cross-file config-meson.cross"
+     echo "[host_machine]" >> $cross
+     echo "system = '$targetos'" >> $cross
+@@ -2608,9 +2607,6 @@ if test "$skip_meson" = no; then
+     else
+         echo "endian = 'little'" >> $cross
+     fi
+-  else
+-    cross_arg="--native-file config-meson.cross"
+-  fi
+   mv $cross config-meson.cross
+ 
+   rm -rf meson-private meson-info meson-logs
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixedmeson.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixedmeson.patch
new file mode 100644
index 00000000..0cbaea07
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixedmeson.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
+
+Index: qemu-8.1.0/configure
+===================================================================
+--- qemu-8.1.0.orig/configure
++++ qemu-8.1.0/configure
+@@ -1032,12 +1032,7 @@ then
+     exit 1
+ fi
+ 
+-# At this point, we expect Meson to be installed and available.
+-# We expect mkvenv or pip to have created pyvenv/bin/meson for us.
+-# We ignore PATH completely here: we want to use the venv's Meson
+-# *exclusively*.
+-
+-meson="$(cd pyvenv/bin; pwd)/meson"
++meson=`which meson`
+ 
+ # Conditionally ensure Sphinx is installed.
+ 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixmips.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixmips.patch
new file mode 100644
index 00000000..01546d10
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/fixmips.patch
@@ -0,0 +1,18 @@
+Patch to fix mips boot hangs where virtio appears broken. Patch under discussion upstream. 
+Regression is introduced by other fixes to 8.1.0 to get x86 boots working.
+
+Upstream-Status: Pending [https://lore.kernel.org/qemu-devel/6c956b90-5a13-db96-9c02-9834a512fe6f@linaro.org/]
+
+Index: qemu-8.1.0/softmmu/physmem.c
+===================================================================
+--- qemu-8.1.0.orig/softmmu/physmem.c
++++ qemu-8.1.0/softmmu/physmem.c
+@@ -2517,7 +2517,7 @@ static void tcg_commit(MemoryListener *l
+      * That said, the listener is also called during realize, before
+      * all of the tcg machinery for run-on is initialized: thus halt_cond.
+      */
+-    if (cpu->halt_cond) {
++    if (cpu->halt_cond && !qemu_cpu_is_self(cpu)) {
+         async_run_on_cpu(cpu, tcg_commit_cpu, RUN_ON_CPU_HOST_PTR(cpuas));
+     } else {
+         tcg_commit_cpu(cpu, RUN_ON_CPU_HOST_PTR(cpuas));
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/no-pip.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/no-pip.patch
new file mode 100644
index 00000000..09e13e8b
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/no-pip.patch
@@ -0,0 +1,45 @@
+qemu: Ensure pip and the python venv aren't used for meson
+
+Qemu wants to use a supported python version and a specific meson version
+to "help" users and uses pip and creates a venv to do this. This is a nightmare
+for us. Our versions stay up to date and should be supported so we don't
+really need/want this wrapping. Tweak things to disable it.
+
+There was breakage from the wrapper shown by:
+
+bitbake qemu-system-native
+<add DISTRO_FEATURES:remove = "opengl" to local.conf>
+bitbake qemu-system-native -c configure
+
+which would crash. The issue is the change in configuration removes pieces
+from the sysroot but pyc files remainm as do pieces of pip which causes
+problems.
+
+Ideally we'd convince upstream to allow some way to disable the venv on
+the understanding that if/when it breaks, we keep the pieces. The patch
+as it stands is a workaround.
+
+Upstream-Status: Inappropriate [oe specific]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: qemu-8.1.2/configure
+===================================================================
+--- qemu-8.1.2.orig/configure
++++ qemu-8.1.2/configure
+@@ -1009,7 +1009,7 @@ python="$(command -v "$python")"
+ echo "python determined to be '$python'"
+ echo "python version: $($python --version)"
+ 
+-python="$($python -B "${source_path}/python/scripts/mkvenv.py" create pyvenv)"
++python=python3
+ if test "$?" -ne 0 ; then
+     error_exit "python venv creation failed"
+ fi
+@@ -1017,6 +1017,7 @@ fi
+ # Suppress writing compiled files
+ python="$python -B"
+ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
++mkvenv=true
+ 
+ mkvenv_flags=""
+ if test "$download" = "enabled" ; then
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/powerpc_rom.bin b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/powerpc_rom.bin
new file mode 100644
index 00000000..c4044296
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/powerpc_rom.bin
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.init b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.init
new file mode 100644
index 00000000..5ebaadde
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.init
@@ -0,0 +1,75 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Initially written by: Michael Tokarev <mjt@tls.msk.ru>
+# For QEMU Debian downstream package
+
+set -e
+
+. /etc/init.d/functions
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="QEMU Guest Agent"
+NAME=qemu-ga
+DAEMON=@bindir@/$NAME
+PIDFILE=/var/run/$NAME.pid
+
+# config
+DAEMON_ARGS=""
+# default transport
+TRANSPORT=virtio-serial:/dev/virtio-ports/org.qemu.guest_agent.0
+NO_START=0
+
+test ! -r /etc/default/qemu-guest-agent || . /etc/default/qemu-guest-agent
+test "$NO_START" = "0" || exit 0
+test -x "$DAEMON" || exit 0
+
+#
+# Function that checks whenever system has necessary environment
+# It also splits $TRANSPORT into $method and $path
+#
+do_check_transport() {
+        method=${TRANSPORT%%:*};
+        path=${TRANSPORT#*:}
+        case "$method" in
+            virtio-serial | isa-serial)
+                if [ ! -e "$path" ]; then
+                    echo "$NAME: transport endpoint not found, not starting"
+                    return 1
+                fi
+                ;;
+        esac
+}
+
+case "$1" in
+  start)
+        do_check_transport || exit 0
+        echo -n "Starting $DESC: "
+        start-stop-daemon -S -p $PIDFILE -x "$DAEMON" -- \
+                $DAEMON_ARGS -d -m "$method" -p "$path"
+        echo "$NAME."
+        ;;
+  stop)
+        echo -n "Stopping $DESC: "
+        start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
+        echo "$NAME."
+        ;;
+  status)
+        status "$DAEMON"
+        exit $?
+        ;;
+  restart|force-reload)
+        do_check_transport || exit 0
+        echo -n "Restarting $DESC: "
+        start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
+        sleep 1
+        start-stop-daemon -S -p $PIDFILE -x "$DAEMON" -- \
+                $DAEMON_ARGS -d -m "$method" -p "$path"
+        echo "$NAME."
+        ;;
+  *)
+        N=/etc/init.d/$NAME
+        echo "Usage: $N {start|stop|status|restart|force-reload}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.udev b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.udev
new file mode 100644
index 00000000..47097057
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/qemu-guest-agent.udev
@@ -0,0 +1,2 @@
+SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/run-ptest b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/run-ptest
new file mode 100644
index 00000000..f9a4e8fb
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1/run-ptest
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+#This script is used to run qemu test suites
+#
+
+ptestdir=$(dirname "$(readlink -f "$0")")
+export SRC_PATH=$ptestdir
+
+cd $ptestdir/tests
+tests=$(find . -name "test-*" ! -name "*.p")
+for f in $tests; do
+    $f  | sed '/^ok/ s/ok/PASS:/g'
+done
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2024.1.bb
new file mode 100644
index 00000000..c4fc180e
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2024.1.bb
@@ -0,0 +1,6 @@
+
+require qemu-devicetrees.inc
+
+BRANCH ?= "master"
+SRCREV ?= "c54a1cfb7076aaf8abdfe50e89245b37cdb1c077"
+
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-native-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-native-8.1.inc
new file mode 100644
index 00000000..22fa9685
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-native-8.1.inc
@@ -0,0 +1,7 @@
+require qemu-8.1.inc
+
+inherit native
+
+EXTRA_OEMAKE:append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'"
+
+LDFLAGS:append = " -fuse-ld=bfd"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-targets-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-targets-8.1.inc
new file mode 100644
index 00000000..24f9a039
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-targets-8.1.inc
@@ -0,0 +1,28 @@
+# possible arch values are:
+#    aarch64 arm armeb alpha cris i386 x86_64 m68k microblaze
+#    mips mipsel mips64 mips64el ppc ppc64 ppc64abi32 ppcemb
+#    riscv32 riscv64 sparc sparc32 sparc32plus
+
+def get_qemu_target_list(d):
+    import bb
+    archs = d.getVar('QEMU_TARGETS').split()
+    tos = d.getVar('HOST_OS')
+    softmmuonly = ""
+    for arch in ['ppcemb', 'lm32']:
+        if arch in archs:
+            softmmuonly += arch + "-softmmu,"
+            archs.remove(arch)
+    linuxuseronly = ""
+    for arch in ['armeb', 'alpha', 'ppc64abi32', 'ppc64le', 'sparc32plus', 'aarch64_be']:
+        if arch in archs:
+            linuxuseronly += arch + "-linux-user,"
+            archs.remove(arch)
+    if 'linux' not in tos:
+        return softmmuonly + ''.join([arch + "-softmmu" + "," for arch in archs]).rstrip(',')
+    return softmmuonly + linuxuseronly + ''.join([arch + "-linux-user" + "," + arch + "-softmmu" + "," for arch in archs]).rstrip(',')
+
+def get_qemu_usermode_target_list(d):
+    return ",".join(filter(lambda i: "-linux-user" in i, get_qemu_target_list(d).split(',')))
+
+def get_qemu_system_target_list(d):
+    return ",".join(filter(lambda i: "-linux-user" not in i, get_qemu_target_list(d).split(',')))
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc
new file mode 100644
index 00000000..ffaf3cdf
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc
@@ -0,0 +1,3 @@
+XILINX_QEMU_VERSION = "v8.1.0"
+BRANCH = "master"
+SRCREV = "aa05b83770c0cd5a4f7fcbcef7efc806ae2abe9f"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
new file mode 100644
index 00000000..ad2af244
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
@@ -0,0 +1,79 @@
+SUMMARY = "Xilinx's fork of a fast open source processor emulator"
+HOMEPAGE = "https://github.com/xilinx/qemu/"
+
+# This qemu fork is NOT compatible with running on a 32-bit system
+# See: https://github.com/Xilinx/qemu/issues/35
+COMPATIBLE_HOST:arm = "null"
+
+# x86_64 is needed to build nativesdks
+QEMU_TARGETS = "aarch64 arm microblaze microblazeel riscv32 x86_64"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+                    file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-8.1.0:"
+
+PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG};name=qemu"
+SRCREV_qemu = "${SRCREV}"
+SRCREV_FORMAT = "qemu"
+
+FILESEXTRAPATHS:append := ":${THISDIR}/qemu-8.1"
+
+# Deal with the broken --disable-download
+SRCREV_berkeley-softfloat-3 = "b64af41c3276f97f0e181920400ee056b9c88037"
+SRCREV_berkeley-testfloat-3 = "40619cbb3bf32872df8c53cc457039229428a263"
+SRCREV_dtc = "b6910bec11614980a21e46fbccc35934b671bd81"
+SRCREV_keycodemapdb = "f5772a62ec52591ff6870b7e8ef32482371f22c6"
+SRCREV_libvfio-user = "0b28d205572c80b568a1003db2c8f37ca333e4d7"
+SRCREV_slirp = "26be815b86e8d49add8c9a8b320239b9594ff03d"
+SRC_URI += "\
+           git://gitlab.com/qemu-project/berkeley-softfloat-3;protocol=https;nobranch=1;destsuffix=git/subprojects/berkeley-softfloat-3;name=berkeley-softfloat-3 \
+           git://gitlab.com/qemu-project/berkeley-testfloat-3;protocol=https;nobranch=1;destsuffix=git/subprojects/berkeley-testfloat-3;name=berkeley-testfloat-3 \
+           git://gitlab.com/qemu-project/dtc.git;protocol=https;nobranch=1;destsuffix=git/subprojects/dtc;name=dtc \
+           git://gitlab.com/qemu-project/keycodemapdb.git;protocol=https;nobranch=1;destsuffix=git/subprojects/keycodemapdb;name=keycodemapdb \
+           git://gitlab.com/qemu-project/libvfio-user.git;protocol=https;nobranch=1;destsuffix=git/subprojects/libvfio-user;name=libvfio-user \
+           git://gitlab.freedesktop.org/slirp/libslirp;protocol=https;nobranch=1;destsuffix=git/subprojects/slirp;name=slirp \
+"
+
+# Configure meson for disable-download
+do_configure:prepend() {
+        cp ${S}/subprojects/packagefiles/berkeley-softfloat-3/* ${S}/subprojects/berkeley-softfloat-3/.
+        cp ${S}/subprojects/packagefiles/berkeley-testfloat-3/* ${S}/subprojects/berkeley-testfloat-3/.
+}
+
+
+# Keep this in sync with the main YP QEMU integration
+SRC_URI += "\
+           file://powerpc_rom.bin \
+           file://run-ptest \
+           file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \
+           file://0003-apic-fixup-fallthrough-to-PIC.patch \
+           file://0004-configure-Add-pkg-config-handling-for-libgcrypt.patch \
+           file://0005-qemu-Do-not-include-file-if-not-exists.patch \
+           file://0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \
+           file://0007-qemu-Determinism-fixes.patch \
+           file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \
+           file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \
+           file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \
+           file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \
+           file://fixedmeson.patch \
+           file://no-pip.patch \
+           file://qemu-guest-agent.init \
+           file://qemu-guest-agent.udev \
+           "
+
+# Patch doesn't apply to 8.1.0
+#           file://fixmips.patch 
+
+S = "${WORKDIR}/git"
+
+# Based on qemu settings in poky/meta/conf/distro/include/no-static-libs.inc
+DISABLE_STATIC:pn-qemu-xilinx = ""
+DISABLE_STATIC:pn-qemu-xilinx-native = ""
+DISABLE_STATIC:pn-nativesdk-qemu-xilinx = ""
+DISABLE_STATIC:pn-qemu-xilinx-system-native = ""
+
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-8.1.inc
new file mode 100644
index 00000000..ad00453f
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-8.1.inc
@@ -0,0 +1,2 @@
+require qemu-native-8.1.inc
+require qemu-xilinx-8.1.inc
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb
new file mode 100644
index 00000000..5ffdeb98
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb
@@ -0,0 +1,11 @@
+BPN = "qemu-xilinx"
+
+DEPENDS += "glib-2.0-native zlib-native"
+
+require qemu-xilinx-2024.1.inc
+require qemu-xilinx-native-8.1.inc
+require qemu-native-alt.inc
+
+EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-install-blobs --disable-guest-agent"
+
+PACKAGECONFIG ??= "pie"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb
new file mode 100644
index 00000000..7e985088
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb
@@ -0,0 +1,35 @@
+BPN = "qemu-xilinx"
+
+require qemu-system-native-alt.inc
+require qemu-xilinx-2024.1.inc
+require qemu-xilinx-native-8.1.inc
+
+# As some of the files installed by qemu-native and qemu-system-native
+# are the same, we depend on qemu-native to get the full installation set
+# and avoid file clashes
+DEPENDS += "glib-2.0-native zlib-native pixman-native qemu-native"
+
+DEPENDS += "qemu-xilinx-multiarch-helper-native"
+
+EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
+
+PACKAGECONFIG ??= "fdt alsa kvm pie slirp png gcrypt \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+"
+
+# Handle distros such as CentOS 5 32-bit that do not have kvm support
+PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
+
+do_install:append() {
+    install -Dm 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu-xilinx
+
+    # The following is also installed by qemu-native
+    rm -f ${D}${datadir}/qemu-xilinx/trace-events-all
+    rm -rf ${D}${datadir}/qemu-xilinx/keymaps
+    rm -rf ${D}${datadir}/icons/
+    rm -rf ${D}${includedir}/qemu-plugin.h
+
+    # Install qmp.py to be used with testimage
+    install -d ${D}${libdir}/qemu-python/qmp/
+    install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/
+}
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb
new file mode 100644
index 00000000..cff60bd6
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb
@@ -0,0 +1,38 @@
+BBCLASSEXTEND = "nativesdk"
+
+require qemu-xilinx-2024.1.inc
+require qemu-8.1.inc
+require qemu-xilinx-8.1.inc
+require qemu-alt.inc
+
+# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
+DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
+MALI_PACKAGE_ARCH[vardepsexclude] = "MACHINE_ARCH"
+MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"
+PACKAGE_ARCH[vardepsexclude] = "MALI_PACKAGE_ARCH"
+PACKAGE_ARCH:class-target = "${@bb.utils.contains_any('DEPENDS', 'libepoxy virglrenderer', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"
+
+
+DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native"
+
+DEPENDS:append:libc-musl = " libucontext"
+
+CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}"
+
+RDEPENDS:${PN}-common:class-target += "bash"
+
+EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
+EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
+EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
+
+PACKAGECONFIG ??= " \
+    fdt sdl kvm pie slirp gcrypt \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio xen', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \
+"
+PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie slirp gcrypt \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+"
+# ppc32 hosts are no longer supported in qemu
+COMPATIBLE_HOST:powerpc = "null"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu_8.1.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu_8.1.2.bb
new file mode 100644
index 00000000..4722e1f5
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu_8.1.2.bb
@@ -0,0 +1,29 @@
+BBCLASSEXTEND = "nativesdk"
+
+FILESEXTRAPATHS:append := ":${THISDIR}/qemu-8.1"
+
+require qemu-8.1.inc
+
+DEPENDS += "glib-2.0 zlib pixman"
+
+DEPENDS:append:libc-musl = " libucontext"
+
+CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}"
+
+RDEPENDS:${PN}-common:class-target += "bash"
+
+EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
+EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
+EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
+
+PACKAGECONFIG ??= " \
+    fdt sdl kvm pie slirp \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio xen', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \
+"
+PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie slirp \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
+"
+# ppc32 hosts are no longer supported in qemu
+COMPATIBLE_HOST:powerpc = "null"
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch b/meta-xilinx-core/recipes-graphics/drm/files/0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch
new file mode 100644
index 00000000..5f7df974
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch
@@ -0,0 +1,37 @@
+From 7edb14622061e87bb4810fb648017b43e767d4c6 Mon Sep 17 00:00:00 2001
+From: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
+Date: Mon, 1 Nov 2021 12:59:36 -0700
+Subject: [PATCH 1/5] [PATCH] libdrm: Update drm header file with XV15 and XV20
+
+This patch updates drm header file with YUV 420 and
+YUV422 10 bit formats.
+
+Signed-off-by: Satish Kumar Nagireddy <satish.nagireddy.nagireddy@xilinx.com>
+Upstream-Status: Pending
+Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
+---
+ include/drm/drm_fourcc.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
+index ed0258c..c5cdaed 100644
+--- a/include/drm/drm_fourcc.h
++++ b/include/drm/drm_fourcc.h
+@@ -318,6 +318,14 @@ extern "C" {
+ #define DRM_FORMAT_Q401                fourcc_code('Q', '4', '0', '1')
+ 
+ /*
++ * 2 plane 10 bit per component YCbCr
++ * index 0 = Y plane, [31:0] x:Y2:Y1:Y0 2:10:10:10 little endian
++ * index 1 = Cb:Cr plane, [63:0] x:Cb2:Cr2:Cb1:x:Cr1:Cb0:Cr0 2:10:10:10:2:10:10:10 little endian
++ */
++#define DRM_FORMAT_XV15                fourcc_code('X', 'V', '1', '5') /* 2x2 subsampled Cb:Cr plane 2:10:10:10 */
++#define DRM_FORMAT_XV20                fourcc_code('X', 'V', '2', '0') /* 2x1 subsampled Cb:Cr plane 2:10:10:10 */
++
++/*
+  * 3 plane YCbCr
+  * index 0: Y plane, [7:0] Y
+  * index 1: Cb plane, [7:0] Cb
+-- 
+2.7.4
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0001-headers-Sync-with-HDR-from-v5.15.patch b/meta-xilinx-core/recipes-graphics/drm/files/0001-headers-Sync-with-HDR-from-v5.15.patch
new file mode 100644
index 00000000..77a457ce
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0001-headers-Sync-with-HDR-from-v5.15.patch
@@ -0,0 +1,207 @@
+From d159e3f782d33988e52db462948e2e0eab2b9a03 Mon Sep 17 00:00:00 2001
+From: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Date: Thu, 17 Mar 2022 08:21:41 -0700
+Subject: [PATCH] headers: Sync with HDR from v5.15
+
+Sync drm_mode.h with linux-xlnx/include/uapi/drm/drm_mode.h for HDR
+
+Upstream-Status: Pending
+
+Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com>
+---
+ include/drm/drm_mode.h | 129 +++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 125 insertions(+), 4 deletions(-)
+
+diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
+index 9b6722d..bbce882 100644
+--- a/include/drm/drm_mode.h
++++ b/include/drm/drm_mode.h
+@@ -312,16 +312,48 @@ struct drm_mode_set_plane {
+        __u32 src_w;
+ };
+ 
++/**
++ * struct drm_mode_get_plane - Get plane metadata.
++ *
++ * Userspace can perform a GETPLANE ioctl to retrieve information about a
++ * plane.
++ *
++ * To retrieve the number of formats supported, set @count_format_types to zero
++ * and call the ioctl. @count_format_types will be updated with the value.
++ *
++ * To retrieve these formats, allocate an array with the memory needed to store
++ * @count_format_types formats. Point @format_type_ptr to this array and call
++ * the ioctl again (with @count_format_types still set to the value returned in
++ * the first ioctl call).
++ */
+ struct drm_mode_get_plane {
++       /**
++        * @plane_id: Object ID of the plane whose information should be
++        * retrieved. Set by caller.
++        */
+        __u32 plane_id;
+ 
++       /** @crtc_id: Object ID of the current CRTC. */
+        __u32 crtc_id;
++       /** @fb_id: Object ID of the current fb. */
+        __u32 fb_id;
+ 
++       /**
++        * @possible_crtcs: Bitmask of CRTC's compatible with the plane. CRTC's
++        * are created and they receive an index, which corresponds to their
++        * position in the bitmask. Bit N corresponds to
++        * :ref:`CRTC index<crtc_index>` N.
++        */
+        __u32 possible_crtcs;
++       /** @gamma_size: Never used. */
+        __u32 gamma_size;
+ 
++       /** @count_format_types: Number of formats. */
+        __u32 count_format_types;
++       /**
++        * @format_type_ptr: Pointer to ``__u32`` array of formats that are
++        * supported by the plane. These formats do not require modifiers.
++        */
+        __u64 format_type_ptr;
+ };
+ 
+@@ -509,22 +541,74 @@ struct drm_mode_get_connector {
+  */
+ #define DRM_MODE_PROP_ATOMIC        0x80000000
+ 
++/**
++ * struct drm_mode_property_enum - Description for an enum/bitfield entry.
++ * @value: numeric value for this enum entry.
++ * @name: symbolic name for this enum entry.
++ *
++ * See struct drm_property_enum for details.
++ */
+ struct drm_mode_property_enum {
+        __u64 value;
+        char name[DRM_PROP_NAME_LEN];
+ };
+ 
++/**
++ * struct drm_mode_get_property - Get property metadata.
++ *
++ * User-space can perform a GETPROPERTY ioctl to retrieve information about a
++ * property. The same property may be attached to multiple objects, see
++ * "Modeset Base Object Abstraction".
++ *
++ * The meaning of the @values_ptr field changes depending on the property type.
++ * See &drm_property.flags for more details.
++ *
++ * The @enum_blob_ptr and @count_enum_blobs fields are only meaningful when the
++ * property has the type &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK. For
++ * backwards compatibility, the kernel will always set @count_enum_blobs to
++ * zero when the property has the type &DRM_MODE_PROP_BLOB. User-space must
++ * ignore these two fields if the property has a different type.
++ *
++ * User-space is expected to retrieve values and enums by performing this ioctl
++ * at least twice: the first time to retrieve the number of elements, the
++ * second time to retrieve the elements themselves.
++ *
++ * To retrieve the number of elements, set @count_values and @count_enum_blobs
++ * to zero, then call the ioctl. @count_values will be updated with the number
++ * of elements. If the property has the type &DRM_MODE_PROP_ENUM or
++ * &DRM_MODE_PROP_BITMASK, @count_enum_blobs will be updated as well.
++ *
++ * To retrieve the elements themselves, allocate an array for @values_ptr and
++ * set @count_values to its capacity. If the property has the type
++ * &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK, allocate an array for
++ * @enum_blob_ptr and set @count_enum_blobs to its capacity. Calling the ioctl
++ * again will fill the arrays.
++ */
+ struct drm_mode_get_property {
+-       __u64 values_ptr; /* values and blob lengths */
+-       __u64 enum_blob_ptr; /* enum and blob id ptrs */
++       /** @values_ptr: Pointer to a ``__u64`` array. */
++       __u64 values_ptr;
++       /** @enum_blob_ptr: Pointer to a struct drm_mode_property_enum array. */
++       __u64 enum_blob_ptr;
+ 
++       /**
++        * @prop_id: Object ID of the property which should be retrieved. Set
++        * by the caller.
++        */
+        __u32 prop_id;
++       /**
++        * @flags: ``DRM_MODE_PROP_*`` bitfield. See &drm_property.flags for
++        * a definition of the flags.
++        */
+        __u32 flags;
++       /**
++        * @name: Symbolic property name. User-space should use this field to
++        * recognize properties.
++        */
+        char name[DRM_PROP_NAME_LEN];
+ 
++       /** @count_values: Number of elements in @values_ptr. */
+        __u32 count_values;
+-       /* This is only used to count enum values, not blobs. The _blobs is
+-        * simply because of a historical reason, i.e. backwards compat. */
++       /** @count_enum_blobs: Number of elements in @enum_blob_ptr. */
+        __u32 count_enum_blobs;
+ };
+ 
+@@ -578,6 +662,8 @@ struct drm_mode_fb_cmd {
+ 
+ #define DRM_MODE_FB_INTERLACED (1<<0) /* for interlaced framebuffers */
+ #define DRM_MODE_FB_MODIFIERS  (1<<1) /* enables ->modifer[] */
++#define DRM_MODE_FB_ALTERNATE_TOP      (1<<2) /* for alternate top field */
++#define DRM_MODE_FB_ALTERNATE_BOTTOM   (1<<3) /* for alternate bottom field */
+ 
+ struct drm_mode_fb_cmd2 {
+        __u32 fb_id;
+@@ -733,6 +819,20 @@ struct drm_color_lut {
+        __u16 reserved;
+ };
+ 
++enum drm_hdr_type {
++       /*
++        * This is for the gen_hdr_output_metadata structure.
++        * MSB differentiates static (0) or dynamic (1) metadata.
++        * Other 15 bits represent specific HDR standards.
++        */
++
++       /* static HDR */
++       DRM_HDR_TYPE_HDR10     = 0x0000,
++
++       /* dynamic HDR */
++       DRM_HDR_TYPE_HDR10P    = 1 << 15 | DRM_HDR_TYPE_HDR10,
++};
++
+ /**
+  * struct hdr_metadata_infoframe - HDR Metadata Infoframe Data.
+  *
+@@ -819,6 +919,27 @@ struct hdr_output_metadata {
+        };
+ };
+ 
++/**
++ * struct gen_hdr_output_metadata - Generic HDR output metadata
++ *
++ * Generic HDR Metadata Information to be passed from userspace
++ */
++struct gen_hdr_output_metadata {
++       /**
++        * @metadata_type: HDR type.
++        */
++       __u16 metadata_type;
++       /**
++        * @size: size of payload/metadata.
++        */
++       __u16 size;
++       /**
++        * @payload: Actual metadata - HDR Metadata Infoframe.
++        * Currently the largest extended HDR infoframe is 4000 bytes.
++        */
++       __u8 payload[4000];
++};
++
+ #define DRM_MODE_PAGE_FLIP_EVENT 0x01
+ #define DRM_MODE_PAGE_FLIP_ASYNC 0x02
+ #define DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE 0x4
+-- 
+2.17.1
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch b/meta-xilinx-core/recipes-graphics/drm/files/0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch
new file mode 100644
index 00000000..c517221a
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch
@@ -0,0 +1,433 @@
+From de3fffbf7af9d28b5f9d9e118de448a54e2628dd Mon Sep 17 00:00:00 2001
+From: Anil Kumar Mamidala <anil.mamidala@xilinx.com>
+Date: Wed, 27 Oct 2021 16:04:47 +0530
+Subject: [PATCH] modetest: Add YUV444 and X403 format support for modetest
+
+Add YUV44 8-bit and X403 10-bit formats support to modetest
+for generating color bar pattern.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anil Kumar Mamidala <anil.mamidala@xilinx.com>
+---
+ include/drm/drm_fourcc.h |   7 +
+ tests/modetest/buffers.c |  32 +++++
+ tests/util/format.c      |   4 +
+ tests/util/pattern.c     | 270 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 313 insertions(+)
+
+Index: libdrm-2.4.118/include/drm/drm_fourcc.h
+===================================================================
+--- libdrm-2.4.118.orig/include/drm/drm_fourcc.h
++++ libdrm-2.4.118/include/drm/drm_fourcc.h
+@@ -405,6 +405,13 @@ extern "C" {
+ #define DRM_FORMAT_YUV444      fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */
+ #define DRM_FORMAT_YVU444      fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */
+ 
++/* 3 plane non-subsampled (444) YCbCr
++ * 10 bits per component
++ * index 0: Y plane, [31:0] x:Y2:Y1:Y0 [2:10:10:10] little endian
++ * index 1: Cb plane, [31:0] x:Cb2:Cb1:Cb0 [2:10:10:10] little endian
++ * index 2: Cr plane, [31:0] x:Cr2:Cr1:Cr0 [2:10:10:10] little endian
++ */
++#define DRM_FORMAT_X403                fourcc_code('X', '4', '0', '3') /* non-subsampled Cb:Cr plane, 10 bit per channel */
+ 
+ /*
+  * Format Modifiers:
+Index: libdrm-2.4.118/tests/modetest/buffers.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/modetest/buffers.c
++++ libdrm-2.4.118/tests/modetest/buffers.c
+@@ -145,6 +145,7 @@ bo_create(int fd, unsigned int format,
+        case DRM_FORMAT_NV42:
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
++       case DRM_FORMAT_YUV444:
+                bpp = 8;
+                break;
+ 
+@@ -156,6 +157,7 @@ bo_create(int fd, unsigned int format,
+ 
+        case DRM_FORMAT_XV15:
+        case DRM_FORMAT_XV20:
++       case DRM_FORMAT_X403:
+                bpp = 10;
+                break;
+ 
+@@ -242,6 +244,11 @@ bo_create(int fd, unsigned int format,
+                virtual_height = height * 2;
+                break;
+ 
++       case DRM_FORMAT_X403:
++               virtual_width = (width * 32) / 30;
++               virtual_height = height * 3;
++               break;
++
+        case DRM_FORMAT_NV16:
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV20:
+@@ -249,6 +256,11 @@ bo_create(int fd, unsigned int format,
+                virtual_height = height * 2;
+                break;
+ 
++       case DRM_FORMAT_YUV444:
++               virtual_width = width;
++               virtual_height = height * 3;
++               break;
++
+        case DRM_FORMAT_NV24:
+        case DRM_FORMAT_NV42:
+        case DRM_FORMAT_NV30:
+@@ -322,6 +334,24 @@ bo_create(int fd, unsigned int format,
+                planes[1] = virtual + offsets[1];
+                break;
+ 
++       case DRM_FORMAT_X403:
++       case DRM_FORMAT_YUV444:
++               offsets[0] = 0;
++               handles[0] = bo->handle;
++               pitches[0] = bo->pitch;
++               pitches[1] = pitches[0];
++               offsets[1] = pitches[0] * height;
++               handles[1] = bo->handle;
++               pitches[2] = pitches[1];
++               offsets[2] = offsets[1] + pitches[1] * height;
++               handles[2] = bo->handle;
++
++
++               planes[0] = virtual;
++               planes[1] = virtual + offsets[1];
++               planes[2] = virtual + offsets[2];
++               break;
++
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
+                offsets[0] = 0;
+Index: libdrm-2.4.118/tests/util/format.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/format.c
++++ libdrm-2.4.118/tests/util/format.c
+@@ -64,6 +64,10 @@ static const struct util_format_info for
+        /* YUV planar */
+        { DRM_FORMAT_YUV420, "YU12", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 1) },
+        { DRM_FORMAT_YVU420, "YV12", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 1) },
++       { DRM_FORMAT_YUV444, "YU24", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 1) },
++       { DRM_FORMAT_YVU444, "YV24", MAKE_YUV_INFO(YUV_YCrCb, 1, 1, 1) },
++       { DRM_FORMAT_X403, "X403", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 1) },
++
+        /* RGB16 */
+        { DRM_FORMAT_ARGB4444, "AR12", MAKE_RGB_INFO(4, 8, 4, 4, 4, 0, 4, 12) },
+        { DRM_FORMAT_XRGB4444, "XR12", MAKE_RGB_INFO(4, 8, 4, 4, 4, 0, 0, 0) },
+Index: libdrm-2.4.118/tests/util/pattern.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/pattern.c
++++ libdrm-2.4.118/tests/util/pattern.c
+@@ -596,6 +596,175 @@ static void fill_smpte_yuv_semiplanar_10
+        }
+ }
+ 
++static void fill_smpte_yuv_planar_x403(
++                               const struct util_yuv_info *yuv,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem,
++                               unsigned int width,
++                               unsigned int height, unsigned int stride)
++{
++       const struct color_yuv colors_top[] = {
++               MAKE_YUV_601(191, 192, 192),    /* grey */
++               MAKE_YUV_601(192, 192, 0),      /* yellow */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(0, 192, 0),        /* green */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(192, 0, 0),        /* red */
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++       };
++       const struct color_yuv colors_middle[] = {
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 192, 192),    /* grey */
++       };
++       const struct color_yuv colors_bottom[] = {
++               MAKE_YUV_601(0, 33, 76),        /* in-phase */
++               MAKE_YUV_601(255, 255, 255),    /* super white */
++               MAKE_YUV_601(50, 0, 106),       /* quadrature */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(9, 9, 9),          /* 3.5% */
++               MAKE_YUV_601(19, 19, 19),       /* 7.5% */
++               MAKE_YUV_601(29, 29, 29),       /* 11.5% */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++       };
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int xsub = yuv->xsub;
++       unsigned int ysub = yuv->ysub;
++       unsigned int x;
++       unsigned int y;
++       unsigned int cval = 0;
++
++       for (y = 0; y < height * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_top[x * 7 / width].y << 2 |
++                               colors_top[(x+1) * 7 / width].y << 12 |
++                               colors_top[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_middle[x * 7 / width].y << 2 |
++                               colors_middle[(x+1) * 7 / width].y << 12 |
++                               colors_middle[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[x * 4 / (width * 5 / 7)].y << 2 |
++                               colors_bottom[(x + 1) * 4 / (width * 5 / 7)]
++                               .y << 12 | colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].y << 22;
++
++               for (; x < width * 6 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 2 |
++                               colors_bottom[((x + 1) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 12 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 22;
++
++               for (; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] = colors_bottom[7].y << 2 |
++                               colors_bottom[7].y << 12 |
++                               colors_bottom[7].y << 22;
++               y_mem += stride;
++       }
++
++       /* Chroma */
++       unsigned int *cb_mem = (unsigned int *)u_mem;
++       unsigned int *cr_mem = (unsigned int *)v_mem;
++
++       for (y = 0; y < height / ysub * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 3) {
++                       cval = (colors_top[x * 7 / width].u << 2) |
++                               (colors_top[(x + 1) * 7 / width].u << 12) |
++                               (colors_top[(x + 2) * 7 / width].u << 22);
++                       cb_mem[x/3] = cval;
++                       cval = (colors_top[(x) * 7 / width].v << 2) |
++                               (colors_top[(x + 1) * 7 / width].v << 12) |
++                               (colors_top[(x + 2) * 7 / width].v << 22);
++                       cr_mem[x/3] = cval;
++               }
++               cb_mem += stride/4;
++               cr_mem += stride/4;
++       }
++
++       for (; y < height / ysub * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 3) {
++                       cval =  (colors_middle[x * 7 / width].u << 2) |
++                               (colors_middle[(x + 1) * 7 / width].u << 12) |
++                               (colors_middle[(x + 2) * 7 / width].u << 22);
++                       cb_mem[x/3] = cval;
++                       cval = (colors_middle[x * 7 / width].v << 2) |
++                               (colors_middle[(x + 1) * 7 / width].v << 12) |
++                               (colors_middle[(x + 2) * 7 / width].v << 22);
++                       cr_mem[x/3] = cval;
++               }
++               cb_mem += stride/4;
++               cr_mem += stride/4;
++       }
++
++       for (; y < height / ysub; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 3) {
++                       cval = colors_bottom[x * 4 /
++                               (width * 5 / 7)].u << 2 |
++                               colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].u << 12 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)]. u << 22;
++                       cb_mem[x/3] = cval;
++
++                       cval = colors_bottom[(x) * 4 /
++                               (width * 5 / 7)].v << 2 |
++                               colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].v << 12 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)].v << 22;
++
++                       cr_mem[x/3] = cval;
++               }
++               for (; x < width * 6 / 7; x += 3) {
++                       cval = colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 2 |
++                               colors_bottom[((x + 2)- width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 12 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 22;
++                       cb_mem[x/3] = cval;
++
++                       cval = colors_bottom[((x) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 2 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 12 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 22;
++                       cr_mem[x/3] = cval;
++               }
++               for (; x < width; x += 3) {
++                       cval = colors_bottom[7].u << 2 |
++                               colors_bottom[7].u << 12 |
++                               colors_bottom[7].u << 22;
++                       cb_mem[x/3] = cval;
++                       cval = colors_bottom[7].v << 2 |
++                               colors_bottom[7].v << 12 |
++                               colors_bottom[7].v << 22;
++                       cr_mem[x/3] = cval;
++               }
++               cb_mem += stride/4;
++               cr_mem += stride/4;
++       }
++}
++
+ static void fill_smpte_yuv_planar_10b(
+                                const struct util_yuv_info *yuv,
+                                unsigned char *y_mem, unsigned char *u_mem,
+@@ -856,6 +1025,88 @@ static void fill_tiles_xv20(
+        }
+ }
+ 
++static void fill_tiles_x403(
++                               const struct util_format_info *info,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, uint32_t width,
++                               uint32_t height, uint32_t stride)
++{
++       const struct util_yuv_info *yuv = &info->yuv;
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int x;
++       unsigned int y;
++       uint32_t shifter = 0, LumVal = 0;
++       uint32_t lumIndex = 0;
++       uint32_t *Lum;
++       uint32_t *uChrom;
++       uint32_t *vChrom;
++       uint32_t ChromVal = 0;
++       uint32_t uchromIndex = 0;
++       uint32_t vchromIndex = 0;
++
++       /* preparing 10 bit Luma */
++       Lum = (uint32_t *)y_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x++) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       //Checking if we got 3 components to pack in 4 bytes
++                       if (shifter == 30) {
++                               Lum[lumIndex] = LumVal;
++                               lumIndex++; shifter = 0; LumVal = 0;
++                       }
++                       LumVal  = (LumVal | ((color.y << 2) << shifter));
++                       shifter += 10; //10 bit precision
++               }
++               lumIndex = 0; shifter = 0; LumVal = 0;
++               y_mem += stride;
++               Lum = (uint32_t *)y_mem;
++       }
++
++       /* Preparing 10 bit Chroma */
++       uChrom = (uint32_t *)u_mem;
++       vChrom = (uint32_t *)v_mem;
++
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x = x + 3) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       uint32_t rgb32_2 = 0x00130502 * (d.quot >> 6)
++                                               + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color_2 =
++                                       MAKE_YUV_601((rgb32_2 >> 16) & 0xff,
++                                      (rgb32_2 >> 8) & 0xff, rgb32_2 & 0xff);
++                       uint32_t rgb32_3 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color_3 =
++                                       MAKE_YUV_601((rgb32_3 >> 16) & 0xff,
++                                       (rgb32_3 >> 8) & 0xff, rgb32_3 & 0xff);
++
++                       ChromVal = ((color.u << 2) << 20)
++                               | ((color_2.u << 2) << 10) | (color_3.u << 2);
++                       uChrom[uchromIndex++] = ChromVal;
++
++                       ChromVal = ((color.v << 2) << 20)
++                               | ((color_2.v << 2) << 10) | (color_3.v << 2);
++                       vChrom[vchromIndex++] = ChromVal;
++               }
++               uchromIndex = 0; vchromIndex = 0; ChromVal = 0;
++               u_mem += stride;
++               v_mem += stride;
++               uChrom = (uint32_t *)u_mem;
++               vChrom = (uint32_t *)v_mem;
++       }
++}
++
++
+ static void fill_smpte_yuv_packed(const struct util_yuv_info *yuv, void *mem,
+                                  unsigned int width, unsigned int height,
+                                  unsigned int stride)
+@@ -1660,10 +1911,19 @@ static void fill_smpte(const struct util
+                                                   planes[1], width, height,
+                                                   stride);
+ 
++       case DRM_FORMAT_X403:
++                       return fill_smpte_yuv_planar_x403(&info->yuv, planes[0], planes[1],
++                                            planes[2], width, height, stride);
++
++
+        case DRM_FORMAT_YUV420:
+                return fill_smpte_yuv_planar(&info->yuv, planes[0], planes[1],
+                                             planes[2], width, height, stride);
+ 
++       case DRM_FORMAT_YUV444:
++               return fill_smpte_yuv_planar(&info->yuv, planes[0], planes[1],
++                                            planes[2], width, height, stride);
++
+        case DRM_FORMAT_YVU420:
+                return fill_smpte_yuv_planar(&info->yuv, planes[0], planes[2],
+                                             planes[1], width, height, stride);
+@@ -2082,6 +2342,11 @@ static void fill_tiles(const struct util
+                return fill_tiles_yuv_planar(info, planes[0], planes[1],
+                                             planes[2], width, height, stride);
+ 
++       case DRM_FORMAT_YUV444:
++               return fill_tiles_yuv_planar(info, planes[0], planes[1],
++                                            planes[2], width, height, stride);
++
++
+        case DRM_FORMAT_YVU420:
+                return fill_tiles_yuv_planar(info, planes[0], planes[2],
+                                             planes[1], width, height, stride);
+@@ -2090,6 +2355,11 @@ static void fill_tiles(const struct util
+                return fill_tiles_xv20(info, planes[0], planes[1],
+                         planes[1], width, height, stride);
+ 
++       case DRM_FORMAT_X403:
++               return fill_tiles_x403(info, planes[0], planes[1],
++                        planes[2], width, height, stride);
++
++
+        case DRM_FORMAT_XV15:
+                return fill_tiles_xv15(info, planes[0], planes[1],
+                         planes[2], width, height, stride);
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0002-modetest-call-drmModeCrtcSetGamma-only-if-add_proper.patch b/meta-xilinx-core/recipes-graphics/drm/files/0002-modetest-call-drmModeCrtcSetGamma-only-if-add_proper.patch
new file mode 100644
index 00000000..9d2eff7d
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0002-modetest-call-drmModeCrtcSetGamma-only-if-add_proper.patch
@@ -0,0 +1,32 @@
+From ab7aa7563e3b044f84f123f0ed59b370ff0af3f5 Mon Sep 17 00:00:00 2001
+From: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Date: Mon, 24 Feb 2020 03:35:58 -0800
+Subject: [PATCH 2/5] modetest: call drmModeCrtcSetGamma() only if
+ add_property_optional returns true
+
+gamma is a optional property then also it prints error message, so
+set gamma only if add_property_optional() returns true.
+
+Upstream-Status: Pending
+
+Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com>
+---
+ tests/modetest/modetest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
+index 2c83bd0..3e73505 100644
+--- a/tests/modetest/modetest.c
++++ b/tests/modetest/modetest.c
+@@ -1142,7 +1142,7 @@ static void set_gamma(struct device *dev, unsigned crtc_id, unsigned fourcc)
+ 
+        add_property_optional(dev, crtc_id, "DEGAMMA_LUT", 0);
+        add_property_optional(dev, crtc_id, "CTM", 0);
+-       if (!add_property_optional(dev, crtc_id, "GAMMA_LUT", blob_id)) {
++       if (add_property_optional(dev, crtc_id, "GAMMA_LUT", blob_id)) {
+                uint16_t r[256], g[256], b[256];
+ 
+                for (i = 0; i < 256; i++) {
+-- 
+2.7.4
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch b/meta-xilinx-core/recipes-graphics/drm/files/0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch
new file mode 100644
index 00000000..6fd5faab
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch
@@ -0,0 +1,602 @@
+From adc82a4820253ed3f42bf3af9003aa33636e6f89 Mon Sep 17 00:00:00 2001
+From: Anil Kumar M <amamidal@xilinx.com>
+Date: Fri, 10 Apr 2020 21:35:47 +0530
+Subject: [PATCH 3/5] modetest: Add semiplanar 10bit pattern support for
+ modetest
+
+Add XV15 and XV20 10 bit semiplanar formats support for
+generating color bar pattern while running modetest command.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anil Kumar M <amamidal@xilinx.com>
+---
+ tests/modetest/buffers.c |  24 ++-
+ tests/util/format.c      |   3 +
+ tests/util/pattern.c     | 455 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 3 files changed, 473 insertions(+), 9 deletions(-)
+
+Index: libdrm-2.4.118/tests/modetest/buffers.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/modetest/buffers.c
++++ libdrm-2.4.118/tests/modetest/buffers.c
+@@ -116,7 +116,7 @@ bo_create(int fd, unsigned int format,
+          unsigned int handles[4], unsigned int pitches[4],
+          unsigned int offsets[4], enum util_fill_pattern pattern)
+ {
+-       unsigned int virtual_height;
++       unsigned int virtual_height, virtual_width;
+        struct bo *bo;
+        unsigned int bpp;
+        void *planes[3] = { 0, };
+@@ -154,6 +154,11 @@ bo_create(int fd, unsigned int format,
+                bpp = 10;
+                break;
+ 
++       case DRM_FORMAT_XV15:
++       case DRM_FORMAT_XV20:
++               bpp = 10;
++               break;
++
+        case DRM_FORMAT_ARGB4444:
+        case DRM_FORMAT_XRGB4444:
+        case DRM_FORMAT_ABGR4444:
+@@ -223,27 +228,41 @@ bo_create(int fd, unsigned int format,
+        case DRM_FORMAT_NV15:
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
++               virtual_width = width;
+                virtual_height = height * 3 / 2;
+                break;
+ 
++       case DRM_FORMAT_XV15:
++               virtual_width = (width * 32) / 30;
++               virtual_height = height * 3 / 2;
++               break;
++
++       case DRM_FORMAT_XV20:
++               virtual_width = (width * 32) / 30;
++               virtual_height = height * 2;
++               break;
++
+        case DRM_FORMAT_NV16:
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV20:
++               virtual_width = width;
+                virtual_height = height * 2;
+                break;
+ 
+        case DRM_FORMAT_NV24:
+        case DRM_FORMAT_NV42:
+        case DRM_FORMAT_NV30:
++               virtual_width = width;
+                virtual_height = height * 3;
+                break;
+ 
+        default:
++               virtual_width = width;
+                virtual_height = height;
+                break;
+        }
+ 
+-       bo = bo_create_dumb(fd, width, virtual_height, bpp);
++       bo = bo_create_dumb(fd, virtual_width, virtual_height, bpp);
+        if (!bo)
+                return NULL;
+ 
+@@ -276,6 +295,8 @@ bo_create(int fd, unsigned int format,
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV15:
+        case DRM_FORMAT_NV20:
++       case DRM_FORMAT_XV15:
++       case DRM_FORMAT_XV20:
+                offsets[0] = 0;
+                handles[0] = bo->handle;
+                pitches[0] = bo->pitch;
+Index: libdrm-2.4.118/tests/util/pattern.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/pattern.c
++++ libdrm-2.4.118/tests/util/pattern.c
+@@ -430,6 +430,432 @@ static void fill_smpte_yuv_planar_10bpp(
+        }
+ }
+ 
++static void fill_smpte_yuv_semiplanar_10b(
++                               const struct util_yuv_info *yuv,
++                               unsigned char *y_mem, unsigned char *uv_mem,
++                               unsigned int width,
++                               unsigned int height, unsigned int stride)
++{
++       const struct color_yuv colors_top[] = {
++               MAKE_YUV_601(191, 192, 192),    /* grey */
++               MAKE_YUV_601(192, 192, 0),      /* yellow */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(0, 192, 0),        /* green */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(192, 0, 0),        /* red */
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++       };
++       const struct color_yuv colors_middle[] = {
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 192, 192),    /* grey */
++       };
++       const struct color_yuv colors_bottom[] = {
++               MAKE_YUV_601(0, 33, 76),        /* in-phase */
++               MAKE_YUV_601(255, 255, 255),    /* super white */
++               MAKE_YUV_601(50, 0, 106),       /* quadrature */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(9, 9, 9),          /* 3.5% */
++               MAKE_YUV_601(19, 19, 19),       /* 7.5% */
++               MAKE_YUV_601(29, 29, 29),       /* 11.5% */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++       };
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int xsub = yuv->xsub;
++       unsigned int ysub = yuv->ysub;
++       unsigned int x;
++       unsigned int y;
++       unsigned int cval = 0;
++
++       for (y = 0; y < height * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_top[x * 7 / width].y << 2 |
++                               colors_top[(x+1) * 7 / width].y << 12 |
++                               colors_top[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_middle[x * 7 / width].y << 2 |
++                               colors_middle[(x+1) * 7 / width].y << 12 |
++                               colors_middle[(x+2) * 7 / width].y << 22;
++               y_mem += stride;
++       }
++
++       for (; y < height; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[x * 4 / (width * 5 / 7)].y << 2 |
++                               colors_bottom[(x + 1) * 4 / (width * 5 / 7)]
++                               .y << 12 | colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].y << 22;
++
++               for (; x < width * 6 / 7; x += 3)
++                       ((unsigned int *)y_mem)[x/3] =
++                               colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 2 |
++                               colors_bottom[((x + 1) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 12 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].y << 22;
++
++               for (; x < width; x += 3)
++                       ((unsigned int *)y_mem)[x/3] = colors_bottom[7].y << 2 |
++                               colors_bottom[7].y << 12 |
++                               colors_bottom[7].y << 22;
++               y_mem += stride;
++       }
++
++       /* Chroma */
++       unsigned int *c_mem = (unsigned int *)uv_mem;
++
++       for (y = 0; y < height / ysub * 6 / 9; ++y) {
++               for (x = 0; x < width; x += 6) {
++                       cval = (colors_top[x * 7 / width].u << 2) |
++                               (colors_top[x * 7 / width].v << 12) |
++                               (colors_top[(x + 2) * 7 / width].u << 22);
++                       c_mem[x/3] = cval;
++                       cval = (colors_top[(x + 2) * 7 / width].v << 2) |
++                               (colors_top[(x + 4) * 7 / width].u << 12) |
++                               (colors_top[(x + 4) * 7 / width].v << 22);
++                       c_mem[x/3 + 1] = cval;
++               }
++               c_mem += (stride/4) * cs / xsub;
++       }
++
++       for (; y < height / ysub * 7 / 9; ++y) {
++               for (x = 0; x < width; x += 6) {
++                       cval =  (colors_middle[x * 7 / width].u << 2) |
++                               (colors_middle[x * 7 / width].v << 12) |
++                               (colors_middle[(x + 2) * 7 / width].u << 22);
++                       c_mem[x/3] = cval;
++                       cval = (colors_middle[(x + 2) * 7 / width].v << 2) |
++                               (colors_middle[(x + 4) * 7 / width].u << 12) |
++                               (colors_middle[(x + 4) * 7 / width].v << 22);
++                       c_mem[x/3 + 1] = cval;
++               }
++               c_mem += (stride/4) * cs / xsub;
++       }
++
++       for (; y < height / ysub; ++y) {
++               for (x = 0; x < width * 5 / 7; x += 6) {
++                       cval = colors_bottom[x * 4 /
++                               (width * 5 / 7)].u << 2 |
++                               colors_bottom[x * 4 /
++                               (width * 5 / 7)].v << 12 |
++                               colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)]. u << 22;
++
++                       c_mem[x/3] = cval;
++
++                       cval = colors_bottom[(x + 2) * 4 /
++                               (width * 5 / 7)].v << 2 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)].u << 12 |
++                               colors_bottom[(x + 4) * 4 /
++                               (width * 5 / 7)].v << 22;
++
++                       c_mem[x/3 + 1] = cval;
++               }
++               for (; x < width * 6 / 7; x += 6) {
++                       cval = colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 2 |
++                               colors_bottom[(x - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 12 |
++                               colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 22;
++
++                       c_mem[x/3] = cval;
++
++                       cval = colors_bottom[((x + 2) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 2 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].u << 12 |
++                               colors_bottom[((x + 4) - width * 5 / 7) * 3 /
++                               (width / 7) + 4].v << 22;
++                       c_mem[x/3 + 1] = cval;
++               }
++               for (; x < width; x += 6) {
++                       cval = colors_bottom[7].u << 2 |
++                               colors_bottom[7].v << 12 |
++                               colors_bottom[7].u << 22;
++                       c_mem[x/3] = cval;
++                       cval = colors_bottom[7].v << 2 |
++                               colors_bottom[7].u << 12 |
++                               colors_bottom[7].v << 22;
++                       c_mem[x/3 + 1] = cval;
++               }
++               c_mem += (stride/4) * cs / xsub;
++       }
++}
++
++static void fill_smpte_yuv_planar_10b(
++                               const struct util_yuv_info *yuv,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, unsigned int width,
++                               unsigned int height, unsigned int stride)
++{
++       const struct color_yuv colors_top[] = {
++               MAKE_YUV_601(191, 192, 192),    /* grey */
++               MAKE_YUV_601(192, 192, 0),      /* yellow */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(0, 192, 0),        /* green */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(192, 0, 0),        /* red */
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++       };
++       const struct color_yuv colors_middle[] = {
++               MAKE_YUV_601(0, 0, 192),        /* blue */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 0, 192),      /* magenta */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(0, 192, 192),      /* cyan */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(192, 192, 192),    /* grey */
++       };
++       const struct color_yuv colors_bottom[] = {
++               MAKE_YUV_601(0, 33, 76),        /* in-phase */
++               MAKE_YUV_601(255, 255, 255),    /* super white */
++               MAKE_YUV_601(50, 0, 106),       /* quadrature */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++               MAKE_YUV_601(9, 9, 9),          /* 3.5% */
++               MAKE_YUV_601(19, 19, 19),       /* 7.5% */
++               MAKE_YUV_601(29, 29, 29),       /* 11.5% */
++               MAKE_YUV_601(19, 19, 19),       /* black */
++       };
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int xsub = yuv->xsub;
++       unsigned int ysub = yuv->ysub;
++       unsigned int x;
++       unsigned int y;
++
++       /* Luma */
++       for (y = 0; y < height * 6 / 9; ++y) {
++               for (x = 0; x < width; ++x)
++                       y_mem[x] = colors_top[x * 7 / width].y;
++               y_mem += stride;
++       }
++
++       for (; y < height * 7 / 9; ++y) {
++               for (x = 0; x < width; ++x)
++                       y_mem[x] = colors_middle[x * 7 / width].y;
++               y_mem += stride;
++       }
++
++       for (; y < height; ++y) {
++               for (x = 0; x < width * 5 / 7; ++x)
++                       y_mem[x] = colors_bottom[x * 4 / (width * 5 / 7)].y;
++               for (; x < width * 6 / 7; ++x)
++                       y_mem[x] = colors_bottom[(x - width * 5 / 7) * 3 /
++                       (width / 7) + 4].y;
++               for (; x < width; ++x)
++                       y_mem[x] = colors_bottom[7].y;
++               y_mem += stride;
++       }
++
++       /* Chroma */
++       for (y = 0; y < height / ysub * 6 / 9; ++y) {
++               for (x = 0; x < width; x += xsub) {
++                       u_mem[x*cs/xsub] = colors_top[x * 7 / width].u;
++                       v_mem[x*cs/xsub] = colors_top[x * 7 / width].v;
++               }
++               u_mem += stride * cs / xsub;
++               v_mem += stride * cs / xsub;
++       }
++
++       for (; y < height / ysub * 7 / 9; ++y) {
++               for (x = 0; x < width; x += xsub) {
++                       u_mem[x*cs/xsub] = colors_middle[x * 7 / width].u;
++                       v_mem[x*cs/xsub] = colors_middle[x * 7 / width].v;
++               }
++               u_mem += stride * cs / xsub;
++               v_mem += stride * cs / xsub;
++       }
++
++       for (; y < height / ysub; ++y) {
++               for (x = 0; x < width * 5 / 7; x += xsub) {
++                       u_mem[x*cs/xsub] =
++               colors_bottom[x * 4 / (width * 5 / 7)].u;
++                       v_mem[x*cs/xsub] =
++               colors_bottom[x * 4 / (width * 5 / 7)].v;
++               }
++               for (; x < width * 6 / 7; x += xsub) {
++                       u_mem[x*cs/xsub] =
++               colors_bottom[(x - width * 5 / 7) * 3 / (width / 7) + 4].u;
++                       v_mem[x*cs/xsub] =
++               colors_bottom[(x - width * 5 / 7) * 3 / (width / 7) + 4].v;
++               }
++               for (; x < width; x += xsub) {
++                       u_mem[x*cs/xsub] = colors_bottom[7].u;
++                       v_mem[x*cs/xsub] = colors_bottom[7].v;
++               }
++               u_mem += stride * cs / xsub;
++               v_mem += stride * cs / xsub;
++       }
++}
++
++static void fill_tiles_xv15(
++                               const struct util_format_info *info,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, uint32_t width,
++                               uint32_t height, uint32_t stride)
++{
++       const struct util_yuv_info *yuv = &info->yuv;
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int x;
++       unsigned int y;
++       uint32_t shifter = 0, LumVal = 0;
++       uint32_t lumIndex = 0;
++       uint32_t *Lum;
++       uint32_t *Chrom;
++       uint32_t ChromVal = 0;
++       uint32_t chromIndex = 0;
++
++       /* preparing 10 bit Luma */
++       Lum = (uint32_t *)y_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x++) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                               + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                               MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                               (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       //Checking if we got 3 components to pack in 4 bytes
++                       if (shifter == 30) {
++                               Lum[lumIndex] = LumVal;
++                               lumIndex++; shifter = 0; LumVal = 0;
++                       }
++                       LumVal  = (LumVal | ((color.y << 2) << shifter));
++                       shifter += 10; //10 bit precision
++               }
++               lumIndex = 0; shifter = 0; LumVal = 0;
++               y_mem += stride;
++               Lum = (uint32_t *)y_mem;
++       }
++
++       /* Preparing 10 bit Chroma */
++       Chrom = (uint32_t *)u_mem;
++       for (y = 0; y < height / 2; ++y) {
++               for (x = 0; x < width; x = x + 6) {
++                       div_t d  = div(x+(2 * y), width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                               + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                               (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       div_t d2  = div(x + 2 + (2*y), width);
++                       uint32_t rgb32_2 = 0x00130502 * (d2.quot >> 6)
++                                       + 0x000a1120 * (d2.rem >> 6);
++                       struct color_yuv color_2 =
++                               MAKE_YUV_601((rgb32_2 >> 16) & 0xff,
++                               (rgb32_2 >> 8) & 0xff, rgb32_2 & 0xff);
++
++                       div_t d3  = div(x + 4 + (2*y), width);
++                       uint32_t rgb32_3 = 0x00130502 * (d3.quot >> 6)
++                                       + 0x000a1120 * (d3.rem >> 6);
++                       struct color_yuv color_3 =
++                               MAKE_YUV_601((rgb32_3 >> 16) & 0xff,
++                               (rgb32_3 >> 8) & 0xff, rgb32_3 & 0xff);
++
++                       ChromVal = ((color_2.u << 2) << 20)
++                               | ((color.v << 2) << 10) | (color.u << 2);
++                       Chrom[chromIndex++] = ChromVal;
++
++                       ChromVal = ((color_3.v << 2) << 20)
++                               | ((color_3.u << 2) << 10) | (color_2.v << 2);
++                       Chrom[chromIndex++] = ChromVal;
++               }
++       chromIndex = 0; ChromVal = 0;
++       u_mem += stride;
++       Chrom = (uint32_t *)u_mem;
++       }
++}
++
++static void fill_tiles_xv20(
++                               const struct util_format_info *info,
++                               unsigned char *y_mem, unsigned char *u_mem,
++                               unsigned char *v_mem, uint32_t width,
++                               uint32_t height, uint32_t stride)
++{
++       const struct util_yuv_info *yuv = &info->yuv;
++       unsigned int cs = yuv->chroma_stride;
++       unsigned int x;
++       unsigned int y;
++       uint32_t shifter = 0, LumVal = 0;
++       uint32_t lumIndex = 0;
++       uint32_t *Lum;
++       uint32_t *Chrom;
++       uint32_t ChromVal = 0;
++       uint32_t chromIndex = 0;
++
++       /* preparing 10 bit Luma */
++       Lum = (uint32_t *)y_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x++) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       //Checking if we got 3 components to pack in 4 bytes
++                       if (shifter == 30) {
++                               Lum[lumIndex] = LumVal;
++                               lumIndex++; shifter = 0; LumVal = 0;
++                       }
++                       LumVal  = (LumVal | ((color.y << 2) << shifter));
++                       shifter += 10; //10 bit precision
++               }
++               lumIndex = 0; shifter = 0; LumVal = 0;
++               y_mem += stride;
++               Lum = (uint32_t *)y_mem;
++       }
++
++       /* Preparing 10 bit Chroma */
++       Chrom = (uint32_t *)u_mem;
++       for (y = 0; y < height; ++y) {
++               for (x = 0; x < width; x = x + 6) {
++                       div_t d  = div(x+y, width);
++                       uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
++                                       + 0x000a1120 * (d.rem >> 6);
++                       struct color_yuv color =
++                                       MAKE_YUV_601((rgb32 >> 16) & 0xff,
++                                       (rgb32 >> 8) & 0xff, rgb32 & 0xff);
++                       div_t d2  = div(x + 2 + y, width);
++                       uint32_t rgb32_2 = 0x00130502 * (d2.quot >> 6)
++                                               + 0x000a1120 * (d2.rem >> 6);
++                       struct color_yuv color_2 =
++                                       MAKE_YUV_601((rgb32_2 >> 16) & 0xff,
++                                      (rgb32_2 >> 8) & 0xff, rgb32_2 & 0xff);
++                       div_t d3  = div(x + 4 + y, width);
++                       uint32_t rgb32_3 = 0x00130502 * (d3.quot >> 6)
++                                       + 0x000a1120 * (d3.rem >> 6);
++                       struct color_yuv color_3 =
++                                       MAKE_YUV_601((rgb32_3 >> 16) & 0xff,
++                                       (rgb32_3 >> 8) & 0xff, rgb32_3 & 0xff);
++
++                       ChromVal = ((color_2.u << 2) << 20)
++                               | ((color.v << 2) << 10) | (color.u << 2);
++                       Chrom[chromIndex++] = ChromVal;
++
++                       ChromVal = ((color_3.v << 2) << 20)
++                               | ((color_3.u << 2) << 10) | (color_2.v << 2);
++                       Chrom[chromIndex++] = ChromVal;
++               }
++               chromIndex = 0; ChromVal = 0;
++               u_mem += stride;
++               Chrom = (uint32_t *)u_mem;
++       }
++}
++
+ static void fill_smpte_yuv_packed(const struct util_yuv_info *yuv, void *mem,
+                                  unsigned int width, unsigned int height,
+                                  unsigned int stride)
+@@ -1188,9 +1614,10 @@ void util_smpte_fill_lut(unsigned int nc
+                memcpy(lut, smpte_color_lut, sizeof(smpte_color_lut));
+ }
+ 
+-static void fill_smpte(const struct util_format_info *info, void *planes[3],
+-                      unsigned int width, unsigned int height,
+-                      unsigned int stride)
++static void fill_smpte(const struct util_format_info *info,
++                               void *planes[3],
++                               unsigned int width, unsigned int height,
++                               unsigned int stride)
+ {
+        unsigned char *u, *v;
+ 
+@@ -1209,7 +1636,12 @@ static void fill_smpte(const struct util
+        case DRM_FORMAT_YVYU:
+                return fill_smpte_yuv_packed(&info->yuv, planes[0], width,
+                                             height, stride);
+-
++       case DRM_FORMAT_XV20:
++               return fill_tiles_xv20(info, planes[0], planes[1], planes[1],
++                      width, height, stride);
++       case DRM_FORMAT_XV15:
++               return fill_tiles_xv15(info, planes[0], planes[1], planes[2],
++                      width, height, stride);
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV21:
+        case DRM_FORMAT_NV16:
+@@ -1614,9 +2046,10 @@ static void fill_tiles_rgb16fp(const str
+        }
+ }
+ 
+-static void fill_tiles(const struct util_format_info *info, void *planes[3],
+-                      unsigned int width, unsigned int height,
+-                      unsigned int stride)
++static void fill_tiles(const struct util_format_info *info,
++                               void *planes[3],
++                               unsigned int width, unsigned int height,
++                               unsigned int stride)
+ {
+        unsigned char *u, *v;
+ 
+@@ -1653,6 +2086,14 @@ static void fill_tiles(const struct util
+                return fill_tiles_yuv_planar(info, planes[0], planes[2],
+                                             planes[1], width, height, stride);
+ 
++       case DRM_FORMAT_XV20:
++               return fill_tiles_xv20(info, planes[0], planes[1],
++                        planes[1], width, height, stride);
++
++       case DRM_FORMAT_XV15:
++               return fill_tiles_xv15(info, planes[0], planes[1],
++                        planes[2], width, height, stride);
++
+        case DRM_FORMAT_ARGB4444:
+        case DRM_FORMAT_XRGB4444:
+        case DRM_FORMAT_ABGR4444:
+Index: libdrm-2.4.118/tests/util/format.c
+===================================================================
+--- libdrm-2.4.118.orig/tests/util/format.c
++++ libdrm-2.4.118/tests/util/format.c
+@@ -59,6 +59,8 @@ static const struct util_format_info for
+        { DRM_FORMAT_NV15, "NV15", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 2) },
+        { DRM_FORMAT_NV20, "NV20", MAKE_YUV_INFO(YUV_YCbCr, 2, 1, 2) },
+        { DRM_FORMAT_NV30, "NV30", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 2) },
++       { DRM_FORMAT_XV15, "XV15", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 2) },
++       { DRM_FORMAT_XV20, "XV20", MAKE_YUV_INFO(YUV_YCbCr, 2, 1, 2) },
+        /* YUV planar */
+        { DRM_FORMAT_YUV420, "YU12", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 1) },
+        { DRM_FORMAT_YVU420, "YV12", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 1) },
diff --git a/meta-xilinx-core/recipes-graphics/drm/files/0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch b/meta-xilinx-core/recipes-graphics/drm/files/0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch
new file mode 100644
index 00000000..b385bbac
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/files/0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch
@@ -0,0 +1,38 @@
+From ede95ded932a8f722f339fa345c098c705f40f08 Mon Sep 17 00:00:00 2001
+From: Anil Kumar M <amamidal@xilinx.com>
+Date: Wed, 16 Sep 2020 22:42:47 +0530
+Subject: [PATCH 4/5] modetest: fix smpte colour pattern issue for XV20 and
+ XV15 formats
+
+Fix smpte colour issue for XV15 and XV20 formats.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anil Kumar M <amamidal@xilinx.com>
+---
+ tests/util/pattern.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/util/pattern.c b/tests/util/pattern.c
+index e29d160..0fe2e5f 100644
+--- a/tests/util/pattern.c
++++ b/tests/util/pattern.c
+@@ -1121,11 +1121,11 @@ static void fill_smpte(const struct util_format_info *info,
+                return fill_smpte_yuv_packed(&info->yuv, planes[0], width,
+                                             height, stride);
+        case DRM_FORMAT_XV20:
+-               return fill_tiles_xv20(info, planes[0], planes[1], planes[1],
+-                      width, height, stride);
++               return fill_smpte_yuv_semiplanar_10b(&info->yuv, planes[0], planes[1],
++                                            width, height, stride);
+        case DRM_FORMAT_XV15:
+-               return fill_tiles_xv15(info, planes[0], planes[1], planes[2],
+-                      width, height, stride);
++               return fill_smpte_yuv_semiplanar_10b(&info->yuv, planes[0], planes[1],
++                                            width, height, stride);
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV21:
+        case DRM_FORMAT_NV16:
+-- 
+2.7.4
+
diff --git a/meta-xilinx-core/recipes-graphics/drm/libdrm_%.bbappend b/meta-xilinx-core/recipes-graphics/drm/libdrm_%.bbappend
new file mode 100644
index 00000000..c2f6c8d2
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/drm/libdrm_%.bbappend
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+
+SRC_URI:append = " \
+        file://0001-PATCH-libdrm-Update-drm-header-file-with-XV15-and-XV.patch \
+        file://0003-modetest-Add-semiplanar-10bit-pattern-support-for-mo.patch \
+        file://0004-modetest-fix-smpte-colour-pattern-issue-for-XV20-and.patch \
+        file://0001-modetest-Add-YUV444-and-X403-format-support-for-mode.patch \
+"
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb
index 268759c2..cd3ba3d1 100644
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb
@@ -34,6 +34,7 @@ SRC_URI = " \
         file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \
         file://0026-Fix-gpu-driver-probe-failure.patch \
         file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \
+        file://0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch \
         "
 SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
 SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch
new file mode 100644
index 00000000..72275a4c
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch
@@ -0,0 +1,81 @@
+From e3e0f5e3fa0ddb396393d444bce6e575f7a16189 Mon Sep 17 00:00:00 2001
+From: Parth Gajjar <parth.gajjar@amd.com>
+Date: Thu, 21 Dec 2023 22:41:32 -0800
+Subject: [PATCH] Replace vma->vm_flags direct modifications with modifier
+ calls
+
+Replace direct modifications to vma->vm_flags with calls to modifier
+functions to be able to track flag changes and to keep vma locking
+correctness. (Kernel 6.3)
+
+Signed-off-by: Parth Gajjar <parth.gajjar@amd.com>
+---
+ linux/mali_memory.c     | 10 ++++++++++
+ linux/mali_memory_cow.c | 13 ++++++++++---
+ 2 files changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/linux/mali_memory.c b/linux/mali_memory.c
+index 2b2b209..c21d0b7 100644
+--- a/linux/mali_memory.c
++++ b/linux/mali_memory.c
+@@ -266,11 +266,17 @@ int mali_mmap(struct file *filp, struct vm_area_struct *vma)
+                 * that it's present and can never be paged out (see also previous
+                 * entry)
+                 */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
++               vm_flags_set(vma, VM_IO | VM_DONTCOPY | VM_PFNMAP);
++#else
+                vma->vm_flags |= VM_IO;
+                vma->vm_flags |= VM_DONTCOPY;
+                vma->vm_flags |= VM_PFNMAP;
++#endif
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
+                vma->vm_flags |= VM_RESERVED;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
++               vm_flags_set(vma, VM_DONTDUMP | VM_DONTEXPAND);
+ #else
+                vma->vm_flags |= VM_DONTDUMP;
+                vma->vm_flags |= VM_DONTEXPAND;
+@@ -288,7 +294,11 @@ int mali_mmap(struct file *filp, struct vm_area_struct *vma)
+        if (!(vma->vm_flags & VM_WRITE)) {
+                MALI_DEBUG_PRINT(4, ("mmap allocation with read only !\n"));
+                /* add VM_WRITE for do_page_fault will check this when a write fault */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
++               vm_flags_set(vma, VM_WRITE | VM_READ);
++#else
+                vma->vm_flags |= VM_WRITE | VM_READ;
++#endif
+                vma->vm_page_prot = PAGE_READONLY;
+                vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
+                mem_bkend->flags |= MALI_MEM_BACKEND_FLAG_COW_CPU_NO_WRITE;
+diff --git a/linux/mali_memory_cow.c b/linux/mali_memory_cow.c
+index 6fadd42..e631431 100644
+--- a/linux/mali_memory_cow.c
++++ b/linux/mali_memory_cow.c
+@@ -391,13 +391,20 @@ _mali_osk_errcode_t mali_memory_cow_modify_range(mali_mem_backend *backend,
+                        }

+                } else {

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

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

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

+-

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

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

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

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

++#endif
+                }

+        }

+ 

+-- 
+2.25.1
+
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2024.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2024.1.bb
new file mode 100644
index 00000000..17039abb
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2024.1.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Xilinx DisplayPort Linux Kernel module"
+DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
+SECTION = "kernel/modules"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
+
+XLNX_DP_VERSION = "6.1.0"
+PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
+SRCREV ?= "e20942b256e6fb18eaef919c7441f65ad8afcf43"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+inherit module
+
+EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb
new file mode 100644
index 00000000..9757ae4b
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Xilinx HDMI Linux Kernel module"
+DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
+SECTION = "kernel/modules"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
+
+XLNX_HDMI_VERSION = "6.1"
+PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
+SRCREV = "edd297762e0bac3f4c5b64ef67244968e22020e2"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+inherit module
+
+EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent/meson.patch
new file mode 100644
index 00000000..38b61071
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent/meson.patch
@@ -0,0 +1,74 @@
+Fixes for the Meson build of libtraceevent:
+
+- Make the plugin directory the same as the Makefiles
+- Install the plugins as modules not static and versioned shared libraries
+- Add an option to disable building the documentation (needs asciidoc and xmlto)
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git a/meson.build b/meson.build
+index b61c873..4bba4d8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir'))
+ libdir = join_paths(prefixdir, get_option('libdir'))
+ plugindir = get_option('plugindir')
+ if plugindir == ''
+-    plugindir = join_paths(libdir, 'libtraceevent/plugins')
++    plugindir = join_paths(libdir, 'traceevent/plugins')
+ endif
+ 
+ add_project_arguments(
+@@ -45,10 +45,13 @@ if cunit_dep.found()
+     subdir('utest')
+ endif
+ subdir('samples')
+-subdir('Documentation')
+ 
+-custom_target(
+-    'docs',
+-    output: 'docs',
+-    depends: [html, man],
+-    command: ['echo'])
++if get_option('docs')
++    subdir('Documentation')
++
++    custom_target(
++        'docs',
++        output: 'docs',
++        depends: [html, man],
++        command: ['echo'])
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+index b2294f6..0611216 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -4,6 +4,10 @@
+ 
+ option('plugindir', type : 'string',
+        description : 'set the plugin dir')
++
++option('docs', type : 'boolean', value: true,
++       description : 'build documentation')
++
+ option('htmldir', type : 'string', value : 'share/doc/libtraceevent-doc',
+        description : 'directory for HTML documentation')
+ option('asciidoctor', type : 'boolean', value: false,
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 74ad664..4919be4 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -19,11 +19,10 @@ plugins = [
+ 
+ pdeps = []
+ foreach plugin : plugins
+-    pdeps += library(
++    pdeps += shared_module(
+         plugin.replace('.c', ''),
+         plugin,
+         name_prefix: '',
+-        version: library_version,
+         dependencies: [libtraceevent_dep],
+         include_directories: [incdir],
+         install: true,
diff --git a/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb
new file mode 100644
index 00000000..bee78918
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb
@@ -0,0 +1,23 @@
+# Copyright (C) 2022 Khem Raj <raj.khem@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = "API to access the kernel tracefs directory"
+HOMEPAGE = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
+                    file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd"
+SECTION = "libs"
+
+SRCREV = "dd148189b74da3e2f45c7e536319fec97cb71213"
+SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \
+           file://meson.patch"
+
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig
+
+EXTRA_OEMESON = "-Ddocs=false"
+
+PACKAGES += "${PN}-plugins"
+
+FILES:${PN}-plugins += "${libdir}/traceevent/plugins"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg
new file mode 100644
index 00000000..a5b23e3f
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg
@@ -0,0 +1 @@
+CONFIG_VERSAL_SYSMON_I2C=y
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc
new file mode 100644
index 00000000..c1830956
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: MIT
+kconf hardware versal-sysmon.cfg
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb
new file mode 100644
index 00000000..db593947
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb
@@ -0,0 +1,19 @@
+LINUX_VERSION = "6.6.10"
+YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=yocto-kmeta"
+KBRANCH="xlnx_rebase_v6.6_LTS"
+SRCREV = "6737b74785db6341fba18dc6e3d35da9ab8fcfb7"
+SRCREV_meta = "5d0809d0d939c7738cb6e5391126c73fd0e4e865"
+
+KCONF_AUDIT_LEVEL="0"
+
+include linux-xlnx.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+# Workaround for:
+#  rm: cannot remove '.../tmp/work/zynqmp_generic-xilinx-linux/linux-xlnx/6.6.0-xilinx-v2024.1+gitAUTOINC+340eed5001-r0/image/lib/modules/6.6.0-xilinx-v2024.1-g340eed500130/source': No such file or directory
+# This will not be required Scarthgap
+kernel_do_install:prepend () {
+        mkdir -p "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}"
+        touch "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
+}
diff --git a/meta-xilinx-core/recipes-kernel/perf/perf-perl.inc b/meta-xilinx-core/recipes-kernel/perf/perf-perl.inc
new file mode 100644
index 00000000..491f54c3
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/perf/perf-perl.inc
@@ -0,0 +1,11 @@
+inherit perlnative cpan-base
+
+# Env var which tells perl if it should use host (no) or target (yes) settings
+export PERLCONFIGTARGET = "${@is_target(d)}"
+export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}/CORE"
+export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}"
+export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}"
+
+# The perl symbols CPPSTDIN and CPPRUN embed the sysroot into the
+# binaries, work needed to remove this
+INSANE_SKIP:${PN}-dbg += "buildpaths"
diff --git a/meta-xilinx-core/recipes-kernel/perf/perf.bb b/meta-xilinx-core/recipes-kernel/perf/perf.bb
new file mode 100644
index 00000000..9164d93a
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/perf/perf.bb
@@ -0,0 +1,414 @@
+SUMMARY = "Performance analysis tools for Linux"
+DESCRIPTION = "Performance counters for Linux are a new kernel-based \
+subsystem that provide a framework for all things \
+performance analysis. It covers hardware level \
+(CPU/PMU, Performance Monitoring Unit) features \
+and software features (software counters, tracepoints) \
+as well."
+HOMEPAGE = "https://perf.wiki.kernel.org/index.php/Main_Page"
+
+LICENSE = "GPL-2.0-only"
+
+PE = '1'
+
+PACKAGECONFIG ??= "python tui libunwind libtraceevent"
+PACKAGECONFIG[dwarf] = ",NO_DWARF=1"
+PACKAGECONFIG[perl] = ",NO_LIBPERL=1,perl"
+PACKAGECONFIG[python] = ",NO_LIBPYTHON=1,python3 python3-setuptools-native"
+# gui support was added with kernel 3.6.35
+# since 3.10 libnewt was replaced by slang
+# to cover a wide range of kernel we add both dependencies
+PACKAGECONFIG[tui] = ",NO_NEWT=1,libnewt slang"
+PACKAGECONFIG[libunwind] = ",NO_LIBUNWIND=1 NO_LIBDW_DWARF_UNWIND=1,libunwind"
+PACKAGECONFIG[libnuma] = ",NO_LIBNUMA=1"
+PACKAGECONFIG[bfd] = ",NO_LIBBFD=1"
+PACKAGECONFIG[systemtap] = ",NO_SDT=1,systemtap"
+PACKAGECONFIG[jvmti] = ",NO_JVMTI=1"
+# libaudit support would need scripting to be enabled
+PACKAGECONFIG[audit] = ",NO_LIBAUDIT=1,audit"
+PACKAGECONFIG[manpages] = ",,xmlto-native asciidoc-native"
+PACKAGECONFIG[cap] = ",,libcap"
+PACKAGECONFIG[libtraceevent] = ",NO_LIBTRACEEVENT=1,libtraceevent"
+# jevents requires host python for generating a .c file, but is
+# unrelated to the python item.
+PACKAGECONFIG[jevents] = ",NO_JEVENTS=1,python3-native"
+# Arm CoreSight
+PACKAGECONFIG[coresight] = "CORESIGHT=1,,opencsd"
+PACKAGECONFIG[pfm4] = ",NO_LIBPFM4=1,libpfm4"
+PACKAGECONFIG[babeltrace] = ",NO_LIBBABELTRACE=1,babeltrace"
+
+# libunwind is not yet ported for some architectures
+PACKAGECONFIG:remove:arc = "libunwind"
+PACKAGECONFIG:remove:riscv32 = "libunwind"
+
+DEPENDS = " \
+    virtual/${MLPREFIX}libc \
+    ${MLPREFIX}elfutils \
+    ${MLPREFIX}binutils \
+    bison-native flex-native xz \
+"
+
+do_configure[depends] += "virtual/kernel:do_shared_workdir"
+
+PROVIDES = "virtual/perf"
+
+inherit linux-kernel-base kernel-arch manpages
+
+# needed for building the tools/perf Python bindings
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)}
+inherit python3-dir
+export PYTHON_SITEPACKAGES_DIR
+
+#kernel 3.1+ supports WERROR to disable warnings as errors
+export WERROR = "0"
+
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
+
+# needed for building the tools/perf Perl binding
+include ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perf-perl.inc', '', d)}
+
+inherit kernelsrc
+
+S = "${WORKDIR}/${BP}"
+SPDX_S = "${S}/tools/perf"
+
+# The LDFLAGS is required or some old kernels fails due missing
+# symbols and this is preferred than requiring patches to every old
+# supported kernel.
+LDFLAGS="-ldl -lutil"
+
+# Perf's build system adds its own optimization flags for most TUs,
+# overriding the flags included here. But for some, perf does not add
+# any -O option, so ensure the distro's chosen optimization gets used
+# for those. Since ${SELECTED_OPTIMIZATION} always includes
+# ${DEBUG_FLAGS} which in turn includes ${DEBUG_PREFIX_MAP}, this also
+# ensures perf is built with appropriate -f*-prefix-map options,
+# avoiding the 'buildpaths' QA warning.
+TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}"
+
+EXTRA_OEMAKE = '\
+    V=1 \
+    VF=1 \
+    -C ${S}/tools/perf \
+    O=${B} \
+    CROSS_COMPILE=${TARGET_PREFIX} \
+    ARCH=${ARCH} \
+    CC="${CC}" \
+    CCLD="${CC}" \
+    LDSHARED="${CC} -shared" \
+    AR="${AR}" \
+    LD="${LD}" \
+    EXTRA_CFLAGS="-ldw -I${S}" \
+    YFLAGS='-y --file-prefix-map=${WORKDIR}=${TARGET_DBGSRC_DIR}' \
+    EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
+    perfexecdir=${libexecdir} \
+    NO_GTK2=1 \
+    ${PACKAGECONFIG_CONFARGS} \
+    PKG_CONFIG=pkg-config \
+    TMPDIR="${B}" \
+    LIBUNWIND_DIR=${STAGING_EXECPREFIXDIR} \
+'
+
+EXTRA_OEMAKE += "\
+    'DESTDIR=${D}' \
+    'prefix=${prefix}' \
+    'bindir=${bindir}' \
+    'sharedir=${datadir}' \
+    'sysconfdir=${sysconfdir}' \
+    'perfexecdir=${libexecdir}/perf-core' \
+    'ETC_PERFCONFIG=${@os.path.relpath(sysconfdir, prefix)}' \
+    'sharedir=${@os.path.relpath(datadir, prefix)}' \
+    'mandir=${@os.path.relpath(mandir, prefix)}' \
+    'infodir=${@os.path.relpath(infodir, prefix)}' \
+    ${@bb.utils.contains('PACKAGECONFIG', 'python', 'PYTHON=python3 PYTHON_CONFIG=python3-config', '', d)} \
+"
+
+# During do_configure, we might run a 'make clean'. That often breaks
+# when done in parallel, so disable parallelism for do_configure. Note
+# that it has to be done this way rather than by passing -j1, since
+# perf's build system by default ignores any -j argument, but does
+# honour a JOBS variable.
+EXTRA_OEMAKE:append:task-configure = " JOBS=1"
+
+PERF_SRC ?= "Makefile \
+             tools/arch \
+             tools/build \
+             tools/include \
+             tools/lib \
+             tools/Makefile \
+             tools/perf \
+             tools/scripts \
+             scripts/ \
+             arch/arm64/tools \
+             arch/${ARCH}/Makefile \
+"
+
+PERF_EXTRA_LDFLAGS = ""
+
+# MIPS N32/N64
+PERF_EXTRA_LDFLAGS:mipsarchn32eb = "-m elf32btsmipn32"
+PERF_EXTRA_LDFLAGS:mipsarchn32el = "-m elf32ltsmipn32"
+PERF_EXTRA_LDFLAGS:mipsarchn64eb = "-m elf64btsmip"
+PERF_EXTRA_LDFLAGS:mipsarchn64el = "-m elf64ltsmip"
+
+do_compile() {
+        # Linux kernel build system is expected to do the right thing
+        unset CFLAGS
+        test -e ${S}/tools/lib/traceevent/plugins/Makefile && \
+            sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/lib/traceevent/plugins/Makefile
+        test -e ${S}/tools/perf/Makefile.config && \
+            sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/perf/Makefile.config
+        oe_runmake all
+}
+
+do_install() {
+        # Linux kernel build system is expected to do the right thing
+        unset CFLAGS
+        oe_runmake install
+        # we are checking for this make target to be compatible with older perf versions
+        if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)} && grep -q install-python_ext ${S}/tools/perf/Makefile*; then
+            oe_runmake DESTDIR=${D} install-python_ext
+            if [ -e ${D}${libdir}/python*/site-packages/perf-*/SOURCES.txt ]; then
+                sed -i -e 's#${WORKDIR}##g' ${D}${libdir}/python*/site-packages/perf-*/SOURCES.txt
+            fi
+        fi
+}
+
+do_configure[prefuncs] += "copy_perf_source_from_kernel"
+python copy_perf_source_from_kernel() {
+    sources = (d.getVar("PERF_SRC") or "").split()
+    src_dir = d.getVar("STAGING_KERNEL_DIR")
+    dest_dir = d.getVar("S")
+    bb.utils.mkdirhier(dest_dir)
+    bb.utils.prunedir(dest_dir)
+    for s in sources:
+        src = oe.path.join(src_dir, s)
+        dest = oe.path.join(dest_dir, s)
+        if not os.path.exists(src):
+            bb.warn("Path does not exist: %s. Maybe PERF_SRC lists more files than what your kernel version provides and needs." % src)
+            continue
+        if os.path.isdir(src):
+            oe.path.copyhardlinktree(src, dest)
+        else:
+            src_path = os.path.dirname(s)
+            os.makedirs(os.path.join(dest_dir,src_path),exist_ok=True)
+            bb.utils.copyfile(src, dest)
+}
+
+do_configure:prepend () {
+    # If building a multlib based perf, the incorrect library path will be
+    # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit
+    # build, with a 64 bit multilib, the arch won't match and the detection of a 
+    # 64 bit build (and library) are not exected. To ensure that libraries are
+    # installed to the correct location, we can use the weak assignment in the
+    # config/Makefile.
+    #
+    # Also need to relocate .config-detected to $(OUTPUT)/config-detected
+    # for kernel sources that do not already do this
+    # as two builds (e.g. perf and lib32-perf from mutlilib can conflict
+    # with each other if its in the shared source directory
+    #
+    if [ -e "${S}/tools/perf/config/Makefile" ]; then
+        perfconfig="${S}/tools/perf/config/Makefile"
+    fi
+    if [ -e "${S}/tools/perf/Makefile.config" ]; then
+        perfconfig="${S}/tools/perf/Makefile.config"
+    fi
+    if [ -n "${perfconfig}" ]; then
+        # Match $(prefix)/$(lib) and $(prefix)/lib
+        sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \
+               -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \
+               -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
+            ${perfconfig}
+    fi
+    # The man pages installation is "$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)"
+    # in ${S}/tools/perf/Documentation/Makefile, if the mandir set to '?=', it
+    # will use the relative path 'share/man', in the way it will resulting in
+    # incorrect installation for man pages.
+    if [ -e "${S}/tools/perf/Documentation/Makefile" ]; then
+        sed -i 's,^mandir?=,mandir:=,' ${S}/tools/perf/Documentation/Makefile
+    fi
+    if [ -e "${S}/tools/perf/Makefile.perf" ]; then
+        sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
+            ${S}/tools/perf/Makefile.perf
+        sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \
+            ${S}/tools/perf/Makefile.perf
+        # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8
+        sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \
+            ${S}/tools/perf/Makefile.perf
+    fi
+    sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
+        ${S}/tools/perf/Makefile*
+
+    if [ -e "${S}/tools/build/Makefile.build" ]; then
+        sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
+            ${S}/tools/build/Makefile.build
+    fi
+
+    # start reproducibility substitutions
+    if [ -e "${S}/tools/perf/Makefile.config" ]; then
+        # The following line in the Makefle:
+        #     override PYTHON := $(call get-executable-or-default,PYTHON,$(PYTHON_AUTO))
+        # "PYTHON" / "PYTHON_AUTO" have the full path as part of the variable. We've
+        # ensure that the environment is setup and we do not need the full path to be
+        # captured, since the symbol gets built into the executable, making it not
+        # reproducible.
+        sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(PYTHON_AUTO)),$(notdir $(call get-executable-or-default\,PYTHON\,$(PYTHON_AUTO))),g' \
+            ${S}/tools/perf/Makefile.config
+        # The same line is in older releases, but looking explicitly for Python 2
+        sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(PYTHON2)),$(notdir $(call get-executable-or-default\,PYTHON\,$(PYTHON2))),g' \
+            ${S}/tools/perf/Makefile.config
+
+        # likewise with this substitution. Kernels with commit 18f2967418d031a39
+        # [perf tools: Use Python devtools for version autodetection rather than runtime]
+        # need this substitution for reproducibility.
+        sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(subst -config\,\,$(PYTHON_AUTO))),$(notdir $(call get-executable-or-default\,PYTHON\,$(subst -config\,\,$(PYTHON_AUTO)))),g' \
+            ${S}/tools/perf/Makefile.config
+
+        # The following line:
+        #     srcdir_SQ = $(patsubst %tools/perf,tools/perf,$(subst ','\'',$(srcdir))),
+        # Captures the full src path of perf, which of course makes it not
+        # reproducible. We really only need the relative location 'tools/perf', so we
+        # change the Makefile line to remove everything before 'tools/perf'
+        sed -i -e "s%srcdir_SQ = \$(subst ','\\\'',\$(srcdir))%srcdir_SQ = \$(patsubst \%tools/perf,tools/perf,\$(subst ','\\\'',\$(srcdir)))%g" \
+            ${S}/tools/perf/Makefile.config
+        # Avoid hardcoded path to python-native
+        sed -i -e 's#\(PYTHON_WORD := \)$(call shell-wordify,$(PYTHON))#\1 python3#g' \
+            ${S}/tools/perf/Makefile.config
+    fi
+    if [ -e "${S}/tools/perf/tests/Build" ]; then
+        # OUTPUT is the full path, we have python on the path so we remove it from the
+        # definition. This is captured in the perf binary, so breaks reproducibility
+        sed -i -e 's,PYTHONPATH="BUILD_STR($(OUTPUT)python)",PYTHONPATH="BUILD_STR(python)",g' \
+            ${S}/tools/perf/tests/Build
+    fi
+    if [ -e "${S}/tools/perf/util/Build" ]; then
+        # To avoid bison generating #ifdefs that have captured paths, we make sure
+        # all the calls have YFLAGS, which contains prefix mapping information.
+        sed -i -e 's,$(BISON),$(BISON) $(YFLAGS),g' ${S}/tools/perf/util/Build
+    fi
+    if [ -e "${S}/scripts/Makefile.host" ]; then
+        # To avoid yacc (bison) generating #ifdefs that have captured paths, we make sure
+        # all the calls have YFLAGS, which contains prefix mapping information.
+        sed -i -e 's,$(YACC),$(YACC) $(YFLAGS),g' ${S}/scripts/Makefile.host
+    fi
+    if [ -e "${S}/tools/perf/pmu-events/Build" ]; then
+        target='$(OUTPUT)pmu-events/pmu-events.c $(V)'
+        replacement1='$(OUTPUT)pmu-events/pmu-events.c $(V)\n'
+        replacement2='\t$(srctree)/sort-pmuevents.py $(OUTPUT)pmu-events/pmu-events.c $(OUTPUT)pmu-events/pmu-events.c.new\n'
+        replacement3='\tcp $(OUTPUT)pmu-events/pmu-events.c.new $(OUTPUT)pmu-events/pmu-events.c'
+        sed -i -e "s,$target,$replacement1$replacement2$replacement3,g" \
+                       "${S}/tools/perf/pmu-events/Build"
+    fi
+    if [ -e "${S}/tools/perf/pmu-events/jevents.py" ]; then
+        sed -i -e "s#os.scandir(path)#sorted(os.scandir(path), key=lambda e: e.name)#g" \
+                       "${S}/tools/perf/pmu-events/jevents.py"
+    fi
+    if [ -e "${S}/tools/perf/arch/arm64/Makefile" ]; then
+        sed -i 's,sysdef := $(srctree)/,sysdef := ,' ${S}/tools/perf/arch/arm64/Makefile
+        sed -i 's,$(incpath) $(sysdef),$(incpath) $(srctree)/$(sysdef) $(sysdef),' ${S}/tools/perf/arch/arm64/Makefile
+    fi
+    if [ -e "${S}/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl" ]; then
+        if ! grep -q input_rel ${S}/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl; then
+            sed -i 's,input=$4,input=$4\ninput_rel=$5,' ${S}/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl
+        fi
+        sed -i 's,#include \\"\$input\\",#include \\"\$input_rel\\",'  ${S}/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl
+    fi
+    # end reproducibility substitutions
+
+    # We need to ensure the --sysroot option in CC is preserved
+    if [ -e "${S}/tools/perf/Makefile.perf" ]; then
+        sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/perf/Makefile.perf
+        sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/perf/Makefile.perf
+        sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/perf/Makefile.perf
+        sed -i 's,PKG_CONFIG = $(CROSS_COMPILE)pkg-config,#PKG_CONFIG,' ${S}/tools/perf/Makefile.perf
+    fi
+    if [ -e "${S}/tools/lib/api/Makefile" ]; then
+        sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/api/Makefile
+        sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/lib/api/Makefile
+        sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/lib/api/Makefile
+    fi
+    if [ -e "${S}/tools/lib/subcmd/Makefile" ]; then
+        sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/subcmd/Makefile
+        sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/lib/subcmd/Makefile
+    fi
+    if [ -e "${S}/tools/perf/config/feature-checks/Makefile" ]; then
+        sed -i 's,CC := $(CROSS_COMPILE)gcc -MD,CC += -MD,' ${S}/tools/perf/config/feature-checks/Makefile
+    fi
+    if [ -e "${S}/tools/build/Makefile.feature" ]; then
+        sed -i 's,CFLAGS=,CC="\$(CC)" CFLAGS=,' ${S}/tools/build/Makefile.feature
+    fi
+    # The libperl feature check produces fatal warnings due to -Werror being
+    # used, silence enough errors that the check passes.
+    sed -i 's/\(FLAGS_PERL_EMBED=.*\)/\1 -Wno-error=unused-function -Wno-error=attributes/' ${S}/tools/build/feature/Makefile
+
+    # 3.17-rc1+ has a include issue for arm/powerpc. Temporarily sed in the appropriate include
+    if [ -e "${S}/tools/perf/arch/$ARCH/util/skip-callchain-idx.c" ]; then
+        sed -i 's,#include "util/callchain.h",#include "util/callchain.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/$ARCH/util/skip-callchain-idx.c
+    fi
+    if [ -e "${S}/tools/perf/arch/arm/util/unwind-libunwind.c" ] && [ -e "${S}/tools/perf/arch/arm/tests/dwarf-unwind.c" ]; then
+        sed -i 's,#include "tests/tests.h",#include "tests/tests.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/arm/tests/dwarf-unwind.c
+        sed -i 's,#include "perf_regs.h",#include "perf_regs.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/arm/util/unwind-libunwind.c
+    fi
+
+    # use /usr/bin/env instead of version specific python
+    for s in `find ${S}/tools/perf/ -name '*.py'` `find ${S}/scripts/ -name 'bpf_helpers_doc.py'`; do
+        sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s}
+    done
+
+    # unistd.h can be out of sync between libc-headers and the captured version in the perf source
+    # so we copy it from the sysroot unistd.h to the perf unistd.h
+    install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
+    install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h
+
+    # the fetcher is inhibited by the 'inherit kernelsrc', so we do a quick check and
+    # copy for a helper script we need
+    for p in $(echo ${FILESPATH} | tr ':' '\n'); do
+        if [ -e $p/sort-pmuevents.py ]; then
+            cp $p/sort-pmuevents.py ${S}
+        fi
+    done
+}
+
+python do_package:prepend() {
+    d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+
+PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
+
+RDEPENDS:${PN} += "elfutils bash"
+RDEPENDS:${PN}-archive =+ "bash"
+RDEPENDS:${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}"
+RDEPENDS:${PN}-perl =+ "bash perl perl-modules"
+RDEPENDS:${PN}-tests =+ "python3 bash"
+
+RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl', '', d)} \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)} \
+                    "
+FILES_SOLIBSDEV = ""
+FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent* ${libdir}/libperf-jvmti.so"
+FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
+FILES:${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests"
+FILES:${PN}-python = " \
+                       ${PYTHON_SITEPACKAGES_DIR} \
+                       ${libexecdir}/perf-core/scripts/python \
+                       "
+FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl"
+
+DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized"
+
+PACKAGESPLITFUNCS =+ "perf_fix_sources"
+
+perf_fix_sources () {
+        for f in util/parse-events-flex.h util/parse-events-flex.c util/pmu-flex.c \
+                        util/pmu-flex.h util/expr-flex.h util/expr-flex.c; do
+                f=${PKGD}${TARGET_DBGSRC_DIR}/$f
+                if [ -e $f ]; then
+                        sed -i -e 's#${S}/##g' $f
+                fi
+        done
+}
diff --git a/meta-xilinx-core/recipes-kernel/perf/perf/sort-pmuevents.py b/meta-xilinx-core/recipes-kernel/perf/perf/sort-pmuevents.py
new file mode 100755
index 00000000..0362f2d8
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/perf/perf/sort-pmuevents.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+
+# perf pmu-events sorting tool
+#
+# Copyright (C) 2021 Bruce Ashfield
+#
+# SPDX-License-Identifier: MIT
+#
+
+import sys
+import os
+import re
+from collections import OrderedDict
+
+if len(sys.argv) < 2:
+    print( "[ERROR]: input and output pmu files missing" )
+    sys.exit(1)
+
+if len(sys.argv) < 3:
+    print( "[ERROR]: output pmu file missing" )
+    sys.exit(1)
+
+infile = sys.argv[1]
+outfile = sys.argv[2]
+
+if not os.path.exists(infile):
+    print( "ERROR. input file does not exist: %s" % infile )
+    sys.exit(1)
+
+if os.path.exists(outfile):
+    print( "WARNING. output file will be overwritten: %s" % infile )
+
+with open(infile, 'r') as file:
+    data = file.read()
+
+preamble_regex = re.compile( '^(.*?)^(struct|const struct|static struct|static const struct)', re.MULTILINE | re.DOTALL )
+
+preamble = re.search( preamble_regex, data )
+struct_block_regex = re.compile( '^(struct|const struct|static struct|static const struct).*?(\w+) (.*?)\[\] = {(.*?)^};', re.MULTILINE | re.DOTALL )
+field_regex =  re.compile( '{.*?},', re.MULTILINE | re.DOTALL )
+cpuid_regex = re.compile( '\.cpuid = (.*?),', re.MULTILINE | re.DOTALL )
+name_regex = re.compile( '\.name = (.*?),', re.MULTILINE | re.DOTALL )
+
+# create a dictionary structure to store all the structs, their
+# types and then their fields.
+entry_dict = {}
+for struct in re.findall( struct_block_regex, data ):
+    # print( "struct: %s %s %s" % (struct[0],struct[1],struct[2]) )
+    entry_dict[struct[2]] = {}
+    entry_dict[struct[2]]['type_prefix'] = struct[0]
+    entry_dict[struct[2]]['type'] = struct[1]
+    entry_dict[struct[2]]['fields'] = {}
+    for entry in re.findall( field_regex, struct[3] ):
+        #print( "    entry: %s" % entry )
+        cpuid = re.search( cpuid_regex, entry )
+        if cpuid:
+            #print( "    cpuid found: %s" % cpuid.group(1) )
+            entry_dict[struct[2]]['fields'][cpuid.group(1)] = entry
+
+        name = re.search( name_regex, entry )
+        if name:
+            #print( "    name found: %s" % name.group(1) )
+            entry_dict[struct[2]]['fields'][name.group(1)] = entry
+
+        # unmatched entries are most likely array terminators and
+        # should end up as the last element in the sorted list, which
+        # is achieved by using '0' as the key
+        if not cpuid and not name:
+            entry_dict[struct[2]]['fields']['0'] = entry
+
+# created ordered dictionaries from the captured values. These are ordered by
+# a sorted() iteration of the keys. We don't care about the order we read
+# things, just the sorted order. Hency why we couldn't create these during
+# reading.
+#
+# yes, there's a more concise way to do this, but our nested dictionaries of
+# fields make it complex enough that it becomes unreadable.
+entry_dict_sorted = OrderedDict()
+for i in sorted(entry_dict.keys()):
+    entry_dict_sorted[i] = {}
+    entry_dict_sorted[i]['type_prefix'] = entry_dict[i]['type_prefix']
+    entry_dict_sorted[i]['type'] = entry_dict[i]['type']
+    entry_dict_sorted[i]['fields'] = {}
+    for f in sorted(entry_dict[i]['fields'].keys()):
+        entry_dict_sorted[i]['fields'][f] = entry_dict[i]['fields'][f] 
+
+# dump the sorted elements to the outfile
+outf = open( outfile, 'w' )
+
+print( preamble.group(1) )
+outf.write( preamble.group(1) )
+for d in entry_dict_sorted:
+    outf.write( "%s %s %s[] = {\n" % (entry_dict_sorted[d]['type_prefix'], entry_dict_sorted[d]['type'],d) )
+    for f in entry_dict_sorted[d]['fields']:
+        outf.write( entry_dict_sorted[d]['fields'][f] + '\n' )
+
+    outf.write( "};\n" )
+
+outf.close()
+    
diff --git a/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio/0001-default.pai.in-disable-tsched-system-timer-based-mod.patch b/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio/0001-default.pai.in-disable-tsched-system-timer-based-mod.patch
new file mode 100644
index 00000000..c7777360
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio/0001-default.pai.in-disable-tsched-system-timer-based-mod.patch
@@ -0,0 +1,31 @@
+From 059f28d8eae7a1ef237eccbaaa7493480f83b764 Mon Sep 17 00:00:00 2001
+From: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Date: Fri, 2 Sep 2022 01:56:47 -0700
+Subject: [PATCH] default.pai.in: disable tsched (system-timer based model)
+
+With tsched enabled we see clicking noise on DisplayPort for initial 5 sec
+every time audio is played. Disabling the same fixes the issue.
+
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com>
+---
+ src/daemon/default.pa.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
+index a3ddad9..37af3f2 100755
+--- a/src/daemon/default.pa.in
++++ b/src/daemon/default.pa.in
+@@ -55,7 +55,7 @@ ifelse(@HAVE_MKFIFO@, 1, [dnl
+ ### Automatically load driver modules depending on the hardware available
+ ifelse(@HAVE_UDEV@, 1, [dnl
+ .ifexists module-udev-detect@PA_SOEXT@
+-load-module module-udev-detect
++load-module module-udev-detect tsched=0
+ .else
+ ], @HAVE_COREAUDIO@, 1, [dnl
+ .ifexists module-coreaudio-detect@PA_SOEXT@
+-- 
+2.17.1
+
diff --git a/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
new file mode 100644
index 00000000..7aae4a3a
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -0,0 +1,7 @@
+# This change appears to only affect ZynqMP configurations
+# but needs to be applied generically to all aarch64 since it affects a lot of
+# dependencies.
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append = " \
+                file://0001-default.pai.in-disable-tsched-system-timer-based-mod.patch \
+                "
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch b/meta-xilinx-core/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch
new file mode 100644
index 00000000..fac2d719
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch
@@ -0,0 +1,61 @@
+From 373923a8cddb0b1854d3040a6ba0cf016a244128 Mon Sep 17 00:00:00 2001
+From: Anil Kumar M <amamidal@xilinx.com>
+Date: Mon, 24 Feb 2020 14:45:46 +0530
+Subject: [PATCH] v4l-utils: Add support for new media bus codes
+
+Add new media bus format codes for supporting xilinx
+specific formats.
+
+Signed-off-by: Anil Kumar M <amamidal@xilinx.com>
+---
+ include/linux/media-bus-format.h | 12 ++++++++++++
+ utils/media-ctl/libv4l2subdev.c  | 11 +++++++++++
+ 2 files changed, 23 insertions(+)
+
+diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
+index d6a5a3b..3fb2346 100644
+--- a/include/linux/media-bus-format.h
++++ b/include/linux/media-bus-format.h
+@@ -108,6 +108,18 @@
+ #define MEDIA_BUS_FMT_YUV16_1X48               0x202a
+ #define MEDIA_BUS_FMT_UYYVYY16_0_5X48          0x202b
+
++/* YUV: Xilinx Specific - next is       0x2109 */
++#define MEDIA_BUS_FMT_VYYUYY8_1X24             0x2100
++#define MEDIA_BUS_FMT_VYYUYY10_4X20            0x2101
++#define MEDIA_BUS_FMT_VUY10_1X30               0x2102
++#define MEDIA_BUS_FMT_UYYVYY12_4X24            0x2103
++#define MEDIA_BUS_FMT_VUY12_1X36               0x2104
++#define MEDIA_BUS_FMT_Y16_1X16                 0x2105
++#define MEDIA_BUS_FMT_UYYVYY16_4X32            0x2106
++#define MEDIA_BUS_FMT_VUY16_1X48               0x2107
++#define MEDIA_BUS_FMT_UYVY16_2X32              0x2108
++
++
+ /* Bayer - next is     0x3021 */
+ #define MEDIA_BUS_FMT_SBGGR8_1X8               0x3001
+ #define MEDIA_BUS_FMT_SGBRG8_1X8               0x3013
+diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c
+index a989efb..a37541f 100644
+--- a/utils/media-ctl/libv4l2subdev.c
++++ b/utils/media-ctl/libv4l2subdev.c
+@@ -34,6 +34,17 @@
+
+ #include <linux/v4l2-subdev.h>
+
++/* YUV: Xilinx Specific - next is 0x2109 */
++#define MEDIA_BUS_FMT_VYYUYY8_1X24     (0x2100)
++#define MEDIA_BUS_FMT_VYYUYY10_4X20    (0x2101)
++#define MEDIA_BUS_FMT_VUY10_1X30       (0x2102)
++#define MEDIA_BUS_FMT_UYYVYY12_4X24    (0x2103)
++#define MEDIA_BUS_FMT_VUY12_1X36       (0x2104)
++#define MEDIA_BUS_FMT_Y16_1X16         (0x2105)
++#define MEDIA_BUS_FMT_UYYVYY16_4X32    (0x2106)
++#define MEDIA_BUS_FMT_VUY16_1X48       (0x2107)
++#define MEDIA_BUS_FMT_UYVY16_2X32      (0x2108)
++
+ #include "mediactl.h"
+ #include "mediactl-priv.h"
+ #include "tools.h"
+--
+2.7.4
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend b/meta-xilinx-core/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
new file mode 100644
index 00000000..3d177bce
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
@@ -0,0 +1,2 @@
+SRC_URI:append = " file://0001-v4l-utils-Add-support-for-new-media-bus-codes.patch"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0001-Add-support-for-3-planar-YUV444P-8bpc.patch b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0001-Add-support-for-3-planar-YUV444P-8bpc.patch
new file mode 100644
index 00000000..42b108fe
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0001-Add-support-for-3-planar-YUV444P-8bpc.patch
@@ -0,0 +1,39 @@
+From 4d8ac36340423844be76ceb506bc0e4f48772944 Mon Sep 17 00:00:00 2001
+From: Devarsh Thakkar <devarsh.thakkar@xilinx.com>
+Date: Tue, 7 Sep 2021 06:08:55 -0700
+Subject: [PATCH 1/2] Add support for 3 planar YUV444P 8bpc
+
+This patch adds support for single contiguous buffer 3 planar YUV444P
+8 bpc format.
+
+Signed-off-by: Devarsh Thakkar <devarsh.thakkar@xilinx.com>
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ include/linux/videodev2.h | 1 +
+ yavta.c                   | 1 +
+ 2 files changed, 2 insertions(+)
+
+Index: git/include/linux/videodev2.h
+===================================================================
+--- git.orig/include/linux/videodev2.h
++++ git/include/linux/videodev2.h
+@@ -545,6 +545,7 @@ struct v4l2_pix_format {
+ #define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
+ #define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
+ #define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
++#define V4L2_PIX_FMT_YUV444P v4l2_fourcc('4', '4', '4', 'P') /* 24  YUV444 planar */
+ #define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
+ #define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
+ #define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
+Index: git/yavta.c
+===================================================================
+--- git.orig/yavta.c
++++ git/yavta.c
+@@ -309,6 +309,7 @@ static struct v4l2_format_info {
+        { "YVYU", V4L2_PIX_FMT_YVYU, 1 },
+        { "NV12", V4L2_PIX_FMT_NV12, 1 },
+        { "NV12M", V4L2_PIX_FMT_NV12M, 2 },
++       { "YUV444P", V4L2_PIX_FMT_YUV444P, 1 },
+        { "NV21", V4L2_PIX_FMT_NV21, 1 },
+        { "NV21M", V4L2_PIX_FMT_NV21M, 2 },
+        { "NV16", V4L2_PIX_FMT_NV16, 1 },
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch
new file mode 100644
index 00000000..5dfbfa2e
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch
@@ -0,0 +1,41 @@
+From dedd0eb76ced425610bdd695029489f553923b2e Mon Sep 17 00:00:00 2001
+From: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Date: Wed, 27 Oct 2021 02:45:39 -0700
+Subject: [PATCH 2/2] Add support 3 planar YUV 444 10bpc pixel format in
+ contiguous memory
+
+The new format X403 is added to support 3 planar YUV 444 10bpc
+30 bits per sample image data in a single contiguous buffer.
+
+Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com>
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ include/linux/videodev2.h | 2 ++
+ yavta.c                   | 1 +
+ 2 files changed, 3 insertions(+)
+
+Index: git/include/linux/videodev2.h
+===================================================================
+--- git.orig/include/linux/videodev2.h
++++ git/include/linux/videodev2.h
+@@ -585,6 +585,8 @@ struct v4l2_pix_format {
+ #define V4L2_PIX_FMT_YUV444M v4l2_fourcc('Y', 'M', '2', '4') /* 24  YUV444 planar */
+ #define V4L2_PIX_FMT_YVU444M v4l2_fourcc('Y', 'M', '4', '2') /* 24  YVU444 planar */
+ 
++#define V4L2_PIX_FMT_X403    v4l2_fourcc('X', '4', '0', '3') /* 32  YUV planar 4:4:4 10-bit */
++
+ /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
+ #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
+ #define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
+Index: git/yavta.c
+===================================================================
+--- git.orig/yavta.c
++++ git/yavta.c
+@@ -324,6 +324,7 @@ static struct v4l2_format_info {
+        { "YVU420M", V4L2_PIX_FMT_YVU420M, 3 },
+        { "YVU422M", V4L2_PIX_FMT_YVU422M, 3 },
+        { "YVU444M", V4L2_PIX_FMT_YVU444M, 3 },
++       { "X403", V4L2_PIX_FMT_X403, 1 },
+        { "SBGGR8", V4L2_PIX_FMT_SBGGR8, 1 },
+        { "SGBRG8", V4L2_PIX_FMT_SGBRG8, 1 },
+        { "SGRBG8", V4L2_PIX_FMT_SGRBG8, 1 },
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta_%.bbappend b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta_%.bbappend
new file mode 100644
index 00000000..52eab13d
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append = " \
+                file://0001-Add-support-for-3-planar-YUV444P-8bpc.patch \
+                file://0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch \
+                "
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules b/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules
index 4643ad37..1e0008a0 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules
+++ b/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules
@@ -5,3 +5,6 @@ SUBSYSTEM=="allegro_decode_class", KERNEL=="allegroDecodeIP", MODE="0660", GROUP
 # Xilinx Video DMA driver
 SUBSYSTEM=="char", KERNEL=="dmaproxy", MODE="0660", GROUP="video"
 
+# Xilinx SyncIP driver
+SUBSYSTEM=="xlnxsync", KERNEL=="xlnxsync0", MODE="0660", GROUP="video"
+
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
new file mode 100644
index 00000000..35dffb16
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
@@ -0,0 +1,39 @@
+SUMMARY = "Linux kernel module for Video Code Unit"
+DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
+SECTION = "kernel/modules"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
+
+XILINX_VCU_VERSION = "1.0.0"
+PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+BRANCH = "master"
+REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
+SRCREV = "2ae83fc79f8a2db74be65883583cc6ad32d245e5"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = " \
+    ${REPO};${BRANCHARG} \
+    file://99-vcu-enc-dec.rules \
+    "
+
+inherit module features_check
+
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
+
+RDEPENDS:${PN} = "vcu-firmware"
+
+KERNEL_MODULE_AUTOLOAD += "dmaproxy"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}/udev/rules.d
+    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2024.1.bb
new file mode 100644
index 00000000..420fdf1d
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2024.1.bb
@@ -0,0 +1,50 @@
+SUMMARY = "OpenMAX Integration layer for VCU"
+DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
+
+XILINX_VCU_VERSION = "1.0.0"
+PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
+SRCREV = "01e45e0ac2f869cd46286307ae94d19010fd46df"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+S  = "${WORKDIR}/git"
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "libvcu-xlnx"
+RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
+
+EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
+
+EXTRA_OEMAKE = " \
+    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
+    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
+    "
+
+do_install() {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}/vcu-omx-il
+
+    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
+
+    oe_runmake install INSTALL_PATH=${D}${bindir}
+
+    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
+    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
+    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
+}
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+
+EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2024.1.bb
new file mode 100644
index 00000000..ac7e4aa3
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2024.1.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Control Software for VCU"
+DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
+
+XILINX_VCU_VERSION = "1.0.0"
+PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
+SRCREV = "918ec1e87c67b2746fe0f2bfa9f1503d307b9bc2"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+S  = "${WORKDIR}/git"
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+RDEPENDS:${PN} = "kernel-module-vcu"
+
+EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
+
+do_install() {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}/vcu-ctrl-sw/include
+
+    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include INSTALL_PATH=${D}/${bindir}
+    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
+    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
+}
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+
+EXCLUDE_FROM_WORLD = "1"
+
+# Disable buildpaths QA check warnings.
+INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2024.1.bb
new file mode 100644
index 00000000..cc6cd5bb
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2024.1.bb
@@ -0,0 +1,38 @@
+SUMMARY = "Firmware for VCU"
+DESCRIPTION = "Firmware binaries provider for VCU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9bef8aa9d1eba8aca1b7dffdef500262"
+
+XILINX_VCU_VERSION = "1.0.0"
+PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+
+S  = "${WORKDIR}/git"
+
+BRANCH ?= "master"
+REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
+SRCREV = "ffe29273f378619a711aa10664612e6c660ee590"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI   = "${REPO};${BRANCHARG}"
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+do_install() {
+    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}${nonarch_base_libdir}/firmware/al5d_b.fw
+    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}${nonarch_base_libdir}/firmware/al5d.fw
+    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}${nonarch_base_libdir}/firmware/al5e_b.fw
+    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}${nonarch_base_libdir}/firmware/al5e.fw
+}
+
+# Inhibit warnings about files being stripped
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+EXCLUDE_FROM_WORLD = "1"
+
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb
index 9b835490..df943bc6 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb
@@ -28,10 +28,6 @@ EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 
 RDEPENDS:${PN} = "vdu-firmware"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 do_install:append() {
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
index 1c9ba8ad..6856ec3a 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
@@ -28,10 +28,6 @@ EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 
 RDEPENDS:${PN} = "vdu-firmware"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 do_install:append() {
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
new file mode 100644
index 00000000..0e3afbc1
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
@@ -0,0 +1,38 @@
+SUMMARY = "Linux kernel module for Video Decode Unit"
+DESCRIPTION = "Out-of-tree VDU decoder common kernel modules"
+SECTION = "kernel/modules"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
+
+XILINX_VDU_VERSION = "1.0.0"
+PV =. "${XILINX_VDU_VERSION}-xilinx-v"
+PV .= "+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+BRANCH ?= "master"
+REPO ?= "git://github.com/Xilinx/vdu-modules.git;protocol=https"
+SRCREV ?= "1529b6aaf784fb5e1cafb11c949c3cb3c69d1dfd"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG} \
+        file://99-vdu-enc-dec.rules \
+"
+
+inherit module features_check
+
+REQUIRED_MACHINE_FEATURES = "vdu"
+
+EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
+
+RDEPENDS:${PN} = "vdu-firmware"
+
+PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}/udev/rules.d
+    install -m 0644 ${WORKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb
index f9228678..c553d99b 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb
@@ -22,10 +22,6 @@ SRC_URI = "${REPO};${BRANCHARG} \
 
 S  = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 RDEPENDS:${PN} = "kernel-module-vdu"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb
index f8b36a93..5c47a81e 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb
@@ -22,10 +22,6 @@ SRC_URI = "${REPO};${BRANCHARG} \
 
 S  = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 RDEPENDS:${PN} = "kernel-module-vdu"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb
new file mode 100644
index 00000000..09a06c3e
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Control Software for VDU"
+DESCRIPTION = "Control software libraries, test applications and headers provider for VDU"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
+
+XILINX_VDU_VERSION = "1.0.0"
+PV =. "${XILINX_VDU_VERSION}-xilinx-v"
+PV .= "+git${SRCPV}"
+
+inherit autotools features_check
+
+REQUIRED_MACHINE_FEATURES = "vdu"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
+SRCREV ?= "db37dc935785dff57a52eabc41ac0bf26b0a1707"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+S  = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+
+RDEPENDS:${PN} = "kernel-module-vdu"
+
+do_compile[dirs] = "${S}"
+do_install[dirs] = "${S}"
+
+EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
+EXTRA_OEMAKE +=" INSTALL_HDR_PATH=${D}${includedir}/vdu-ctrl-sw/include INSTALL_PATH=${D}${bindir}"
+
+do_install:append() {
+
+    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
+}
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+
+EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb
index b3c02ca2..f501212d 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb
@@ -21,10 +21,6 @@ inherit autotools features_check
 
 REQUIRED_MACHINE_FEATURES = "vdu"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 DEPENDS = "libvdu-ctrlsw"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb
index 04860b79..fe66c20c 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb
@@ -21,10 +21,6 @@ inherit autotools features_check
 
 REQUIRED_MACHINE_FEATURES = "vdu"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 
 DEPENDS = "libvdu-ctrlsw"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2024.1.bb
new file mode 100644
index 00000000..51a03803
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2024.1.bb
@@ -0,0 +1,50 @@
+SUMMARY = "OpenMAX Integration layer for VDU"
+DESCRIPTION = "OMX IL Libraries,test application and headers for VDU"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
+
+XILINX_VDU_VERSION = "1.0.0"
+PV =. "${XILINX_VDU_VERSION}-xilinx-v"
+PV .= "+git${SRCPV}"
+
+BRANCH ?= "master"
+REPO   ?= "git://github.com/Xilinx/vdu-omx-il.git;protocol=https"
+SRCREV ?= "a116b0729ace66117ccb7c2aca125c33994b0f41"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG} \
+          "
+S  = "${WORKDIR}/git"
+
+inherit autotools features_check
+
+REQUIRED_MACHINE_FEATURES = "vdu"
+
+PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+
+DEPENDS = "libvdu-ctrlsw"
+RDEPENDS:${PN} = "kernel-module-vdu libvdu-ctrlsw"
+
+EXTERNAL_INCLUDE="${STAGING_INCDIR}/vdu-ctrl-sw/include"
+
+do_compile[dirs] = "${S}"
+do_install[dirs] = "${S}"
+
+EXTRA_OEMAKE = " \
+    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
+    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
+    INSTALL_PATH=${D}${bindir} \
+    INCLUDE_INST_PATH=${D}${includedir} \
+    "
+
+do_install:append() {
+    install -d ${D}${libdir}
+
+    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
+    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
+}
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+
+EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
index 419dd681..bdb4a7be 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
@@ -20,10 +20,6 @@ SRCREV ?= "63fe2fce6e46d5bf03e33300a58a37d8568722ee"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
 
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
index ade73a4e..b60b66c2 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
@@ -20,10 +20,6 @@ SRCREV ?= "731897772730178f6a4e77eedeb4fb53faa1ab4d"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
-COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
-
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
 
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2024.1.bb
new file mode 100644
index 00000000..42806ea4
--- /dev/null
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2024.1.bb
@@ -0,0 +1,38 @@
+SUMMARY = "Firmware for VDU"
+DESCRIPTION = "Firmware binaries provider for VDU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=722a9d20bf58ac06585a6d91ee36e60e"
+
+XILINX_VDU_VERSION = "1.0.0"
+PV =. "${XILINX_VDU_VERSION}-xilinx-v"
+PV .= "+git${SRCPV}"
+
+S  = "${WORKDIR}/git"
+
+inherit autotools features_check
+
+REQUIRED_MACHINE_FEATURES = "vdu"
+
+BRANCH ?= "master"
+REPO ?= "git://github.com/Xilinx/vdu-firmware.git;protocol=https"
+SRCREV ?= "7c4662d0f5b514cbb0b9890bc3011d9450bf3661"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI   = "${REPO};${BRANCHARG}"
+
+PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
+
+do_compile[noexec] = "1"
+do_install[dirs] = "${S}"
+
+# Inhibit warnings about files being stripped
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
+
+# These libraries shouldn't get installed in world builds unless something
+# explicitly depends upon them.
+EXCLUDE_FROM_WORLD = "1"
+
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch b/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch
deleted file mode 100644
index c7d4aefd..00000000
--- a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch
+++ /dev/null
@@ -1,370 +0,0 @@
-From 1128691f6e2709b44eccafb0b303b07da55a814e Mon Sep 17 00:00:00 2001
-From: Christian Kohn <chris.kohn@amd.com>
-Date: Mon, 17 Oct 2022 19:28:22 -0700
-Subject: [PATCH] Add initial support for Xilinx OEM FRU records
-
-The supported Xilinx OEM FRU records are MAC_ID and FREE_FORM. This FRU OEM
-extension parses these records and prints them with proper formatting.
-
-To use this feature, run the ipmi-fru command as follows:
-$ sudo ./ipmi-fru --fru-file=/sys/devices/platform/axi/ff030000.i2c/i2c-1/1-0051/eeprom \
-  --interpret-oem-data
-
-Note: The EEPROM address can vary between different platforms. This is just an
-      example.
-
-This feature has been tested with the Xilinx Kria KV260 and KR260 Starter Kits.
-
-Signed-off-by: Christian Kohn <chris.kohn@amd.com>
----
- ipmi-fru/Makefile.am                          |   2 +
- ipmi-fru/ipmi-fru-oem-xilinx.c                | 171 ++++++++++++++++++
- ipmi-fru/ipmi-fru-oem-xilinx.h                |  33 ++++
- ipmi-fru/ipmi-fru-output.c                    |  14 ++
- libfreeipmi/include/freeipmi/freeipmi.h.in    |   1 +
- .../oem/ipmi-fru-xilinx-oem-record-format.h   |  45 +++++
- .../spec/ipmi-iana-enterprise-numbers-spec.h  |   1 +
- 7 files changed, 267 insertions(+)
- create mode 100644 ipmi-fru/ipmi-fru-oem-xilinx.c
- create mode 100644 ipmi-fru/ipmi-fru-oem-xilinx.h
- create mode 100644 libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h
-
-diff --git a/ipmi-fru/Makefile.am b/ipmi-fru/Makefile.am
-index c92ba0e8c..c8545eede 100644
---- a/ipmi-fru/Makefile.am
-+++ b/ipmi-fru/Makefile.am
-@@ -25,6 +25,8 @@ ipmi_fru_SOURCES = \
-        ipmi-fru-argp.h \
-        ipmi-fru-oem-wistron.c \
-        ipmi-fru-oem-wistron.h \
-+       ipmi-fru-oem-xilinx.c \
-+       ipmi-fru-oem-xilinx.h \
-        ipmi-fru-output.c \
-        ipmi-fru-output.h
- 
-diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.c b/ipmi-fru/ipmi-fru-oem-xilinx.c
-new file mode 100644
-index 000000000..87bb18f00
---- /dev/null
-+++ b/ipmi-fru/ipmi-fru-oem-xilinx.c
-@@ -0,0 +1,171 @@
-+/*
-+ * Copyright (C) 2022, Advanced Micro Devices, Inc.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#if HAVE_CONFIG_H
-+#include "config.h"
-+#endif /* HAVE_CONFIG_H */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#if STDC_HEADERS
-+#include <string.h>
-+#endif /* STDC_HEADERS */
-+#include <assert.h>
-+
-+#include <freeipmi/freeipmi.h>
-+
-+#include "ipmi-fru_.h"
-+#include "ipmi-fru-oem-xilinx.h"
-+
-+#include "freeipmi-portability.h"
-+
-+static char *
-+_version_str (uint8_t version)
-+{
-+  switch (version)
-+    {
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_BOARD:
-+      return "Board";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_SYSCTL:
-+      return "System Controller";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_MODULE:
-+      return "Module";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_MAC:
-+      return "DUT - MAC";
-+    case IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT:
-+      return "DUT - EtherCAT";
-+    default:
-+      return "";
-+    }
-+
-+  return (NULL);                /* NOT REACHED */
-+}
-+
-+int
-+ipmi_fru_oem_xilinx_oem_record (ipmi_fru_state_data_t *state_data,
-+                                uint8_t record_type_id,
-+                                uint32_t manufacturer_id,
-+                                uint8_t *oem_data,
-+                                unsigned int oem_data_len)
-+{
-+  assert (state_data);
-+  assert (manufacturer_id == IPMI_IANA_ENTERPRISE_ID_XILINX);
-+  assert (oem_data);
-+
-+  /* The MAC_ID record type ID is 0xD2. The MAC ID record consists of a 1 byte
-+   * version ID followed by one or more 6-byte MAC addresses. If the MAC ID
-+   * version is set to "DUT - EtherCAT", a 4-byte EtherCAT ID is used instead of
-+   * a 6-byte MAC address.
-+   */
-+  if (record_type_id == IPMI_FRU_OEM_XILINX_MAC_ID && oem_data_len)
-+    {
-+      uint8_t version = oem_data[0];
-+      unsigned int len = oem_data_len - 1;
-+
-+      pstdout_printf (state_data->pstate,
-+                      "  FRU OEM MAC Version: %s (%xh)\n",
-+                      _version_str(version),
-+                      version);
-+
-+      /* The MAC_ID record can hold multiple MAC addresses that are 6 bytes long
-+       * each if version is set to 0x31.
-+       */
-+      if ((version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_BOARD ||
-+           version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_SYSCTL ||
-+           version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_MODULE ||
-+           version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_MAC ) &&
-+          (len % 6) == 0)
-+        {
-+          unsigned int i, j, start, stop;
-+          unsigned int mac_cnt = len / 6;
-+
-+          for (j = 0; j < mac_cnt; j++)
-+            {
-+              pstdout_printf (state_data->pstate, "  FRU OEM MAC ID %d: ", j);
-+
-+              start = j*6 + 1;
-+              stop = start + 5;
-+
-+              for (i = start; i < stop; i++)
-+                {
-+                  pstdout_printf (state_data->pstate, "%02x:", oem_data[i]);
-+                }
-+
-+              pstdout_printf (state_data->pstate, "%02x\n", oem_data[i]);
-+            }
-+
-+          return (1);
-+        }
-+
-+      /* The MAC_ID record holds one EtherCAT ID that is 4 bytes long if version
-+       * is set to 0x32. The assigned EtherCAT ID for Xilinx is 0x0000056F.
-+       */
-+      if (version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT &&
-+          len == 4)
-+        {
-+          pstdout_printf (state_data->pstate, "  FRU OEM EtherCAT ID: 0x");
-+
-+          for (unsigned int i = 1; i < len+1; i++)
-+            {
-+              pstdout_printf (state_data->pstate, "%02X", oem_data[i]);
-+            }
-+
-+          pstdout_printf (state_data->pstate, "\n");
-+
-+          return (1);
-+        }
-+    }
-+
-+  /* The free form data record type ID is 0xD3. It consists of one or more
-+   * fields where each field is split into N byte identifier and M byte data
-+   * followed by a 0x00 end of field delimiter. The below code parses the free
-+   * form record and prints each field on a new line prefixed with 'FRU OEM '.
-+   */
-+  if (record_type_id == IPMI_FRU_OEM_XILINX_FREE_FORM && oem_data_len)
-+    {
-+      unsigned int i;
-+      unsigned int new_field = 1;
-+
-+      for (i = 0; i < oem_data_len; i++)
-+        {
-+          /* 0x00 marks the end of the field */
-+          if (oem_data[i] == 0)
-+            {
-+              if (new_field == 0)
-+                {
-+                  pstdout_printf (state_data->pstate, "\n");
-+                }
-+              new_field = 1;
-+              continue;
-+            }
-+
-+          /* Start of a new field */
-+          if (new_field == 1)
-+            {
-+              new_field = 0;
-+              pstdout_printf (state_data->pstate, "  FRU OEM ");
-+            }
-+
-+          pstdout_printf (state_data->pstate, "%c", oem_data[i]);
-+        }
-+
-+      return (1);
-+    }
-+
-+  return (0);
-+}
-diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.h b/ipmi-fru/ipmi-fru-oem-xilinx.h
-new file mode 100644
-index 000000000..2484cd515
---- /dev/null
-+++ b/ipmi-fru/ipmi-fru-oem-xilinx.h
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright (C) 2022, Advanced Micro Devices, Inc.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#ifndef IPMI_FRU_OEM_XILINX_H
-+#define IPMI_FRU_OEM_XILINX_H
-+
-+#include <freeipmi/freeipmi.h>
-+
-+#include "ipmi-fru_.h"
-+
-+/* Returns 1 on interpretation, 0 if not, -1 on error */
-+int ipmi_fru_oem_xilinx_oem_record (ipmi_fru_state_data_t *state_data,
-+                                    uint8_t record_type_id,
-+                                    uint32_t manufacturer_id,
-+                                    uint8_t *oem_data,
-+                                    unsigned int oem_data_len);
-+
-+#endif /* IPMI_FRU_OEM_XILINX_H */
-diff --git a/ipmi-fru/ipmi-fru-output.c b/ipmi-fru/ipmi-fru-output.c
-index 845971018..d29c4470e 100644
---- a/ipmi-fru/ipmi-fru-output.c
-+++ b/ipmi-fru/ipmi-fru-output.c
-@@ -51,6 +51,7 @@
- #include "ipmi-fru_.h"
- #include "ipmi-fru-output.h"
- #include "ipmi-fru-oem-wistron.h"
-+#include "ipmi-fru-oem-xilinx.h"
- #include "tool-util-common.h"
- 
- #include "freeipmi-portability.h"
-@@ -1201,6 +1202,19 @@ ipmi_fru_output_oem_record (ipmi_fru_state_data_t *state_data,
-           if (ret)
-             return (0);
-         }
-+
-+      if (manufacturer_id == IPMI_IANA_ENTERPRISE_ID_XILINX)
-+        {
-+          if ((ret = ipmi_fru_oem_xilinx_oem_record (state_data,
-+                                                     record_type_id,
-+                                                     manufacturer_id,
-+                                                     oem_data,
-+                                                     oem_data_len)) < 0)
-+            return (-1);
-+
-+          if (ret)
-+            return (0);
-+        }
-     }
- 
-   if (oem_data_len)
-diff --git a/libfreeipmi/include/freeipmi/freeipmi.h.in b/libfreeipmi/include/freeipmi/freeipmi.h.in
-index a03178e97..fbd6749e9 100644
---- a/libfreeipmi/include/freeipmi/freeipmi.h.in
-+++ b/libfreeipmi/include/freeipmi/freeipmi.h.in
-@@ -82,6 +82,7 @@ extern "C" {
- #include <freeipmi/record-format/ipmi-sdr-record-format.h>
- #include <freeipmi/record-format/ipmi-sel-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-fru-wistron-oem-record-format.h>
-+#include <freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-sdr-oem-intel-node-manager-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-sdr-oem-intel-record-format.h>
- #include <freeipmi/record-format/oem/ipmi-sel-oem-intel-record-format.h>
-diff --git a/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h b/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h
-new file mode 100644
-index 000000000..434e2031a
---- /dev/null
-+++ b/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h
-@@ -0,0 +1,45 @@
-+/*
-+ * Copyright (C) 2022, Advanced Micro Devices, Inc.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#ifndef IPMI_FRU_OEM_XILINX_RECORD_FORMAT_H
-+#define IPMI_FRU_OEM_XILINX_RECORD_FORMAT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <freeipmi/fiid/fiid.h>
-+
-+/* OEM multi-record IDs used by Xilinx */
-+#define IPMI_FRU_OEM_XILINX_THERMAL   0xD0
-+#define IPMI_FRU_OEM_XILINX_POWER     0xD1
-+#define IPMI_FRU_OEM_XILINX_MAC_ID    0xD2
-+#define IPMI_FRU_OEM_XILINX_FREE_FORM 0xD3
-+
-+/* OEM MAC ID versions used by Xilinx */
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_BOARD        0x01
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_SYSCTL       0x11
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_MODULE       0x21
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_MAC      0x31
-+#define IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT 0x32
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* IPMI_FRU_OEM_XILINX_RECORD_FORMAT_H */
-diff --git a/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h b/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h
-index d286f33a4..4c24b5259 100644
---- a/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h
-+++ b/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h
-@@ -29,6 +29,7 @@ extern "C" {
- #define IPMI_IANA_ENTERPRISE_ID_SUN_MICROSYSTEMS         42
- #define IPMI_IANA_ENTERPRISE_ID_INTEL                   343
- #define IPMI_IANA_ENTERPRISE_ID_DELL                    674
-+#define IPMI_IANA_ENTERPRISE_ID_XILINX                 4314
- #define IPMI_IANA_ENTERPRISE_ID_MAGNUM_TECHNOLOGIES    5593
- #define IPMI_IANA_ENTERPRISE_ID_QUANTA                 7244
- #define IPMI_IANA_ENTERPRISE_ID_FUJITSU               10368
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch b/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch
deleted file mode 100644
index c0f36405..00000000
--- a/meta-xilinx-core/recipes-support/freeipmi/freeipmi/0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c578c999b7d9aabbd6e54b0310a609b8f96ae962 Mon Sep 17 00:00:00 2001
-From: Albert Chu <chu11@llnl.gov>
-Date: Tue, 8 Nov 2022 16:33:39 -0800
-Subject: [PATCH] ipmi-fru: fix compilation for non C99 compilation
-
----
- ipmi-fru/ipmi-fru-oem-xilinx.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.c b/ipmi-fru/ipmi-fru-oem-xilinx.c
-index 87bb18f00..937aa7614 100644
---- a/ipmi-fru/ipmi-fru-oem-xilinx.c
-+++ b/ipmi-fru/ipmi-fru-oem-xilinx.c
-@@ -118,9 +118,11 @@ ipmi_fru_oem_xilinx_oem_record (ipmi_fru_state_data_t *state_data,
-       if (version == IPMI_FRU_OEM_XILINX_MAC_ID_VERSION_DUT_ETHERCAT &&
-           len == 4)
-         {
-+          unsigned int i;
-+
-           pstdout_printf (state_data->pstate, "  FRU OEM EtherCAT ID: 0x");
- 
--          for (unsigned int i = 1; i < len+1; i++)
-+          for (i = 1; i < len+1; i++)
-             {
-               pstdout_printf (state_data->pstate, "%02X", oem_data[i]);
-             }
--- 
-2.17.1
-
diff --git a/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb b/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
index db4f25b4..0da7b6f6 100644
--- a/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
+++ b/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
@@ -31,10 +31,8 @@ LIC_FILES_CHKSUM = " \
 BRANCH ?= "freeipmi-1-6-0-stable"
 SRC_URI = " \
         git://git.savannah.gnu.org/git/freeipmi.git;protocol=https;branch=${BRANCH} \
-        file://0001-Add-initial-support-for-Xilinx-OEM-FRU-records.patch \
-        file://0002-ipmi-fru-fix-compilation-for-non-C99-compilation.patch \
         "
-SRCREV ?= "1f7eea294c2967802019100b07cf1e44b3160a2b"
+SRCREV ?= "816a69eb15a9034351381211d9cd15de81da10c7"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_git.bb
new file mode 100644
index 00000000..e0edbb7b
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_git.bb
@@ -0,0 +1,29 @@
+SUMMARY  = "Xilinx Runtime(XRT) - minimal native build for xclbinutil"
+DESCRIPTION = "Native build of xclbinutil using XRT codebase"
+
+require xrt.inc
+
+FILESEXTRAPATHS:append := ":${THISDIR}/xrt"
+
+LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = " \
+    file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
+    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
+    file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \
+"
+
+S = "${WORKDIR}/git/src"
+
+inherit cmake pkgconfig native
+
+DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native"
+
+EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
+}
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
index 14b2b968..89dc87cc 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
@@ -2,9 +2,9 @@ REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG};name=xrt"
 
-BRANCH= "2023.2"
-SRCREV_xrt = "2865a62b6a417dea523d2d5646154aa94a2cbc28"
-PV = "202320.2.16.0"
+BRANCH= "master"
+SRCREV_xrt = "8426f5733c01018acbd8d12745bc9e5ffc4535e6"
+PV = "202320.2.17.0"
 
 SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https"
 SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt/disable_aie_profiling.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt/disable_aie_profiling.patch
new file mode 100644
index 00000000..f2f63470
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt/disable_aie_profiling.patch
@@ -0,0 +1,17 @@
+diff --git a/src/runtime_src/xdp/profile/plugin/CMakeLists.txt b/src/runtime_src/xdp/profile/plugin/CMakeLists.txt
+index 8ef7a2f..9b8baac 100644
+--- a/src/runtime_src/xdp/profile/plugin/CMakeLists.txt
++++ b/src/runtime_src/xdp/profile/plugin/CMakeLists.txt
+@@ -33,9 +33,9 @@ if (NOT WIN32)
+ # =========================================================
+ # The plugins to be built on Linux only
+ # =========================================================
+-add_subdirectory(aie_status)
+-add_subdirectory(aie_profile)
+-add_subdirectory(aie_trace)
++#add_subdirectory(aie_status)
++#add_subdirectory(aie_profile)
++#add_subdirectory(aie_trace)
+ add_subdirectory(device_offload/hw_emu)
+ add_subdirectory(noc)
+ add_subdirectory(power)
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
index ef3c7172..bd6f3796 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
 
 require xrt.inc
 
-SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
+SRC_URI += "file://disable_aie_profiling.patch;striplevel=2"
 
 LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
@@ -24,7 +24,7 @@ inherit cmake pkgconfig
 BBCLASSEXTEND = "native nativesdk"
 
 # util-linux is for libuuid-dev.
-DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson"
+DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson systemtap"
 RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
 
 EXTRA_OECMAKE += " \