111 files changed, 4352 insertions, 1169 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-recipe/dfx_user_dts.bbclass b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
new file mode 100644
index 00000000..188d594b
--- /dev/null
+++ b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
@@ -0,0 +1,320 @@
+#
+# Copyright (C) 2023-2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This bbclass is inherited by flat, DFx Static and DFx RP firmware recipes.
+# dfx_user_dts.bbclass expects user to generate pl dtsi for flat, DFx Static
+# and DFx RP xsa outside of yocto.
+inherit devicetree
+DEPENDS = "dtc-native bootgen-native"
+# recipes that inherit from this class need to use an appropriate machine
+# override for COMPATIBLE_MACHINE to build successfully; don't allow building
+# for microblaze MACHINE
+COMPATIBLE_MACHINE ?= "^$"
+COMPATIBLE_MACHINE:microblaze = "^$"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PROVIDES = ""
+do_fetch[cleandirs] = "${B}"
+DT_PADDING_SIZE = "0x1000"
+BOOTGEN_FLAGS ?= " -arch ${SOC_FAMILY} -w ${@bb.utils.contains('SOC_FAMILY','zynqmp','','-process_bitstream bin',d)}"
+S ?= "${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
+    soc_family = d.getVar("SOC_FAMILY")
+    if "git://" in d.getVar("SRC_URI") or "https://" in d.getVar("SRC_URI"):
+        d.setVar("S",'${WORKDIR}/git/'+d.getVar("FW_DIR"))
+    else:
+        dtsi_found = False
+        dtbo_found = False
+        bit_found = False
+        bin_found = False
+        pdi_found = False
+        # Required Inputs
+        for s in d.getVar("SRC_URI").split():
+            if s.endswith(('.dtsi', '.dts')):
+                dtsi_found = True
+                d.setVar("DTSI_PATH",os.path.dirname(s.lstrip('file://')))
+            if s.endswith('.dtbo'):
+                if dtbo_found:
+                    bb.warn("More then one '.dtbo' file specified in SRC_URI.")
+                dtbo_found = True
+                d.setVar("DTBO_PATH",os.path.dirname(s.lstrip('file://')))
+            if soc_family == "zynq" or soc_family == "zynqmp":
+                if s.endswith('.bit'):
+                    if bit_found:
+                        bb.warn("More then one '.bit' file specified in SRC_URI.")
+                    bit_found = True
+                    d.setVar("BIT_PATH",os.path.dirname(s.lstrip('file://')))
+                if s.endswith('.bin'):
+                    if bin_found:
+                        bb.warn("More then one '.bin' file specified in SRC_URI.")
+                    bin_found = True
+                    d.setVar("BIN_PATH",os.path.dirname(s.lstrip('file://')))
+            else:
+                if s.endswith('.pdi'):
+                    if pdi_found:
+                        bb.warn("More then one '.pdi' file specified in SRC_URI.")
+                    pdi_found = True
+                    d.setVar("PDI_PATH",os.path.dirname(s.lstrip('file://')))
+            # Optional input
+            if s.endswith('.json'):
+                d.setVar("JSON_PATH",os.path.dirname(s.lstrip('file://')))
+            if s.endswith('.xclbin'):
+                d.setVar("XCL_PATH",os.path.dirname(s.lstrip('file://')))
+        # Check for valid combination of input files in SRC_URI
+        # Skip recipe if any of the below conditions are not satisfied.
+        # 1. At least one bit or bin or pdi should exists.
+        # 2. More than one dtbo.
+        # 3. More than one bit or bin or pdi.
+        # 4. More than one dts and zero dtsi.
+        # 5. More than one dtsi and zero dts
+        # 6. Both bit and bin exists.
+        # 7. Both bit or bin and pdi exits.
+        # 8. Both dts or dtsi and dtbo exists.
+        if bit_found or bin_found or pdi_found:
+            bb.debug(2, "dtsi or dtbo or bitstream or pdi found in SRC_URI")
+            if bit_found and pdi_found :
+                raise bb.parse.SkipRecipe("Both '.bit' and '.pdi' file found in SRC_URI, this is invalid use case.")
+            if bin_found and pdi_found :
+                raise bb.parse.SkipRecipe("Both '.bin' and '.pdi' file found in SRC_URI, this is invalid use case.")
+            if bit_found and bin_found:
+                raise bb.parse.SkipRecipe("Both '.bit' and '.bin' file found in SRC_URI, either .bit or .bin file is supported but not both.")
+            if dtsi_found and dtbo_found:
+                raise bb.parse.SkipRecipe("Both '.dts or dtsi' and '.dtbo' file found in SRC_URI, either .dts/dtsi or .dtbo file is supported but not both.")
+        else:
+            raise bb.parse.SkipRecipe("Need one '.bit' or '.bin' or '.pdi' file added to SRC_URI.")
+        # Check for valid combination of dtsi and dts files in SRC_URI
+        # Following file combinations are not supported use case.
+        # 1. More than one '.dtsi' and zero '.dts' file.
+        # 2. More than one '.dts' and zero or more than one '.dtsi'file .
+        pattern_dts = re.compile(r'[.]+dts\b')
+        pattern_dtsi = re.compile(r'[.]+dtsi\b')
+        dts_count = len([*re.finditer(pattern_dts, d.getVar('SRC_URI'))])
+        dtsi_count = len([*re.finditer(pattern_dtsi, d.getVar("SRC_URI"))])
+        if dtsi_count > 1 and dts_count == 0:
+            raise bb.parse.SkipRecipe("Recipe has more than one '.dtsi' and zero '.dts' found, this is an unsupported use case")
+        elif dts_count > 1:
+            raise bb.parse.SkipRecipe("Recipe has more than one '.dts' and zero or more than one '.dtsi' found, this is an unsupported use case")
+}
+# Function to search for dt firmware-name property in dts or dtsi file.
+python find_firmware_file() {
+    import glob
+    pattern_fw = 'firmware-name'
+    search_count = 0
+    for dt_files in glob.iglob((d.getVar('S') + '/' + (d.getVar('DTSI_PATH')) + '/*.dts*'),recursive=True):
+        with open(dt_files, "r") as f:
+            current_fd = f.read()
+            if pattern_fw in current_fd:
+                search_count += 1
+                if search_count > 1:
+                    bb.error("firmware-name dt property found in more than one dt files! Please fix the dts or dtsi file.")
+                    break
+                else:
+                    d.setVar('FIRMWARE_NAME_DT_FILE', os.path.basename(dt_files))
+}
+do_configure[prefuncs] += "find_firmware_file"
+python do_configure() {
+    import glob, re, shutil
+    soc_family = d.getVar("SOC_FAMILY")
+    if bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', False, True, d):
+        bb.warn("Using dfx_user_dts.bbclass requires fpga-overlay MACHINE_FEATURE to be enabled")
+    # Renaming firmware-name using $PN as bitstream/PDI will be renamed using
+    # $PN when generating the bin/pdi file.
+    if os.path.isfile(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
+        orig_dtsi = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE'))[0]
+        new_dtsi = d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/pl.dtsi_firmwarename'
+        with open(new_dtsi, 'w') as newdtsi:
+            with open(orig_dtsi) as olddtsi:
+                for line in olddtsi:
+                    if soc_family == 'zynq' or soc_family == 'zynqmp':
+                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.bin\"',line))
+                    else:
+                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.pdi\"',line))
+        shutil.move(new_dtsi,orig_dtsi)
+}
+do_compile[prefuncs] += "find_firmware_file"
+python devicetree_do_compile:append() {
+    import glob, subprocess, shutil
+    soc_family = d.getVar("SOC_FAMILY")
+    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
+    bin_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + (d.getVar('BIN_PATH') or '') + '/*.bin'),recursive=True) if os.path.isfile(f))
+    bit_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + (d.getVar('BIT_PATH') or '') + '/*.bit'),recursive=True) if os.path.isfile(f))
+    # Skip devicetree do_compile task if input file is dtbo or bin in SRC_URI
+    if not dtbo_count and not bin_count and bit_count:
+        # Convert .bit to .bin format only if dtsi is input.
+        # In case of dtbo as input, bbclass doesn't know if firmware-name is .bit
+        # or .bin format and corresponding file name. Hence we are not doing .bin
+        # conversion.
+        if soc_family == 'zynq' or soc_family == 'zynqmp' and glob.glob(d.getVar('S') + '/' +(d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
+            pn = d.getVar('PN')
+            biffile = pn + '.bif'
+            with open(biffile, 'w') as f:
+                f.write('all:\n{\n\t' + glob.glob(d.getVar('S') + '/' + (d.getVar('BIT_PATH') or '') + '/*.bit')[0] + '\n}')
+            bootgenargs = ["bootgen"] + (d.getVar("BOOTGEN_FLAGS") or "").split()
+            bootgenargs += ["-image", biffile, "-o", pn + ".bin"]
+            subprocess.run(bootgenargs, check = True)
+            # In Zynq7k using both "-process_bitstream bin" and "-o" in bootgen flag,
+            # to convert bit file to bin format, "-o" option will not be effective
+            # and generated output file name is ${S}+${BIT_PATH}/<bit_file_name>.bin
+            # file, Hence we need to rename this file from <bit_file_name>.bin to
+            # ${PN}.bin which matches the firmware name in dtbo and move
+            # ${PN}.bin to ${B} directory.
+            if soc_family == 'zynq':
+                src_bitbin_file = glob.glob(d.getVar('S') + '/' + (d.getVar('BIT_PATH') or '') + '/*.bin')[0]
+                dst_bitbin_file = d.getVar('B') + '/' + pn + '.bin'
+                shutil.move(src_bitbin_file, dst_bitbin_file)
+            if not os.path.isfile(pn + ".bin"):
+                bb.fatal("Couldn't find %s file, Enable '-log trace' in BOOTGEN_FLAGS" \
+                    "and check bootgen_log.txt" % (d.getVar('B') + '/' + pn + '.bin'))
+}
+# If user inputs both dtsi and dts files then device-tree will generate dtbo
+# files for each dt file, Hence to package the firmware pick the right user dt
+# overlay file.
+python find_user_dts_overlay_file() {
+    import glob
+    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTBO_PATH') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
+    dts_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTSI_PATH') + '/*.dts'),recursive=True) if os.path.isfile(f))
+    dtsi_count = sum(1 for f in glob.iglob((d.getVar('S') + '/' + d.getVar('DTSI_PATH') + '/*.dtsi'),recursive=True) if os.path.isfile(f))
+    # Set USER_DTS_FILE if input file is dts/dtsi in SRC_URI else skip operation.
+    if not dtbo_count and dts_count or dtsi_count:
+        if dtsi_count == 1 and dts_count == 0:
+            dts_file = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/*.dtsi')[0]
+        elif dtsi_count >=0 and dts_count == 1:
+            dts_file = glob.glob(d.getVar('S') + '/' + (d.getVar('DTSI_PATH') or '') + '/*.dts')[0]
+        else:
+            dts_file = ''
+        d.setVar('USER_DTS_FILE', os.path.splitext(os.path.basename(dts_file))[0])
+    elif dtbo_count:
+        bb.debug(2, "Firmware recipe input file is dtbo in SRC_URI")
+    else:
+        bb.debug(2, "Firmware recipe input file is bit/bin/pdi in SRC_URI")
+}
+do_install[prefuncs] += "find_user_dts_overlay_file"
+do_install() {
+    install -d ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+    # Install dtbo
+    # In case of dtbo as input, dtbo will be copied from directly from ${S}
+    # In case of dtsi as input, dtbo will be copied from directly from ${B}
+    # If more than one dtbo file is found then fatal the task.
+    # If no dtbo file is found add warning message as in some use case if IP
+    # doesn't have any driver then user can load pdi/bit/bin file.
+    if [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
+        install -Dm 0644 ${S}/*.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+    elif [ `ls ${S}/*.dtbo | wc -l` -gt 1 ]; then
+        bbfatal "Multiple DTBO found, use the right DTBO in SRC_URI from the following:\n$(basename -a ${S}/*.dtbo)"
+    elif [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+        install -Dm 0644 ${B}/${USER_DTS_FILE}.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.dtbo
+    else
+        bbnote "A dtbo ending '.dtbo' expected but not found in ${S} or ${B}, This means firmware can be loaded without dtbo dependency."
+    fi
+    # Install bit or bin if soc family is zynq-7000 or zynqmp.
+    # In case of dtbo as input or no dtbo exists in ${B}, then .bit or .bin will
+    # be copied from directly from ${S} without renaming the .bit/.bin name to
+    # ${PN}.bit/${PN}.bin.
+    # if more than one .bit/.bin file is found then fatal the task.
+    # if no .bit/.bin file is found then fatal the task.
+    if [ "${SOC_FAMILY}" = "zynq" ] || [ "${SOC_FAMILY}" = "zynqmp" ]; then
+        if [ `ls ${S}/*.bit | wc -l` -gt 1 ]; then
+            bbfatal "Multiple .bit found, use the right .bit in SRC_URI from the following:\n$(basename -a ${S}/*.bit)"
+        elif [ `ls ${S}/*.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 ] && [ ! -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 ]; then
+            install -Dm 0644 ${S}/*.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+        elif [ -f ${B}/${PN}.bin ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${B}/${PN}.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.bin
+        else
+            bbfatal "A bitstream file with '.bit' or '.bin' expected but not found"
+        fi
+    fi
+    # Install pdi if soc family is versal or new silicon.
+    # In case of dtbo as input or no dtbo exists in ${B}, then .pdi will be copied
+    # from directly from ${S} without renaming the pdi name to ${PN}.pdi
+    # if more than one .pdi file is found then fail the task.
+    # In case of Versal DFx Static, only static dtbo can be loaded as BOOT.bin
+    # already contains static pdi. bbclass is not smart enough to determine
+    # whether it is static pdi or not, hence change fatal to warn if no PDI is found.
+    if [ "${SOC_FAMILY}" != "zynq" ] && [ "${SOC_FAMILY}" != "zynqmp" ]; then
+        if [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ ! -f ${B}/${USER_DTS_FILE}.dtbo ]; then
+            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
+        elif [ `ls ${S}/*.pdi | 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
+}
+do_deploy[noexec] = "1"
+FILES:${PN} += "${nonarch_base_libdir}/firmware/xilinx/${PN}"
diff --git a/meta-xilinx-core/classes-recipe/fw-package.bbclass b/meta-xilinx-core/classes-recipe/fw-package.bbclass
new file mode 100644
index 00000000..e9847d33
--- /dev/null
+++ b/meta-xilinx-core/classes-recipe/fw-package.bbclass
@@ -0,0 +1,94 @@
+#
+# Copyright (C) 2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This bbclass provides infrastructure to package and deploy firmware baremetal
+# or freertos application elf or bin files to linux root filesystem under
+# /lib/firmware directory.
+inherit deploy
+INHERIT_DEFAULT_DEPENDS = "1"
+# Since we're just copying, we can run any config.
+COMPATIBLE_HOST = ".*"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+# Default expects the user to provide the fw app in the deploy directory.
+# A machine, multiconfig, or local.conf should override this.
+FW_NAME ??= ""
+TARGET_MC ??= ""
+FW_DEPENDS ??= ""
+FW_MCDEPENDS ??= ""
+FW_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+FW_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+FW_IMAGE_NAME ??= "${FW_NAME}-${MACHINE}-${TARGET_MC}"
+# Default is for the multilib case (without the extension .elf/.bin)
+FW_FILE ??= "${FW_DEPLOY_DIR}/${FW_IMAGE_NAME}"
+FW_FILE[vardepsexclude] = "FW_DEPLOY_DIR"
+do_fetch[depends] += "${FW_DEPENDS}"
+do_fetch[mcdepends] += "${FW_MCDEPENDS}"
+# Set default destination directory is /lib/firmware, user can change this value
+# to /boot directory depending on requirement.
+DESTDIR ??= "${nonarch_base_libdir}/firmware/xilinx"
+SYSROOT_DIRS += "/boot"
+INSANE_SKIP:${PN} = "arch"
+INSANE_SKIP:${PN}-dbg = "arch"
+# Disable buildpaths QA check warnings.
+INSANE_SKIP:${PN} += "buildpaths"
+do_install() {
+    if [ ! -e ${FW_FILE}.elf ]; then
+        echo "Unable to find FW_FILE (${FW_FILE}.elf)"
+        exit 1
+    fi
+    install -Dm 0644 ${FW_FILE}.elf ${D}${DESTDIR}/${FW_IMAGE_NAME}.elf
+}
+# If the item is already in OUR deploy_image_dir, nothing to deploy!
+SHOULD_DEPLOY = "${@'false' if (d.getVar('FW_FILE')).startswith(d.getVar('DEPLOY_DIR_IMAGE')) else 'true'}"
+do_deploy() {
+    # If the item is already in OUR deploy_image_dir, nothing to deploy!
+    if ${SHOULD_DEPLOY}; then
+        install -Dm 0644 ${FW_FILE}.elf ${DEPLOYDIR}/${FW_IMAGE_NAME}.elf
+        install -Dm 0644 ${FW_FILE}.bin ${DEPLOYDIR}/${FW_IMAGE_NAME}.bin
+    fi
+}
+FILES:${PN} += "${DESTDIR}/${FW_IMAGE_NAME}*"
+def check_fw_vars(d):
+    # If both are blank, the user MUST pass in the path to the firmware!
+    if not d.getVar('FW_DEPENDS') and not d.getVar('FW_MCDEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+        msg = ""
+        fail = False
+        if not os.path.exists(d.getVar('FW_FILE') + ".elf"):
+            msg = msg + "The expected file %s.elf is not available.  " % d.getVar('FW_FILE')
+            fail = True
+        if not os.path.exists(d.getVar('FW_FILE') + ".bin"):
+            msg = msg + "The expected file %s.bin is not available.  " % d.getVar('FW_FILE')
+            fail = True
+        if fail:
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("%s\nSee the meta-xilinx-core README." % msg)
+        else:
+            # We found the file, so be sure to track it
+            d.setVar('SRC_URI', 'file://${FW_FILE}.elf file://${FW_FILE}.bin')
+            d.setVarFlag('do_install', 'file-checksums', '${FW_FILE}.elf:True ${FW_FILE}.bin:True')
+            d.setVarFlag('do_deploy', 'file-checksums', '${FW_FILE}.elf:True ${FW_FILE}.bin:True')
+python() {
+    # Need to allow bbappends to change the check
+    check_fw_vars(d)
+}
diff --git a/meta-xilinx-core/classes/image-wic-utils.bbclass b/meta-xilinx-core/classes-recipe/image-wic-utils.bbclass
index 41ad8148..41ad8148 100644
--- a/meta-xilinx-core/classes/image-wic-utils.bbclass
+++ b/meta-xilinx-core/classes-recipe/image-wic-utils.bbclass
diff --git a/meta-xilinx-core/classes/kernel-simpleimage.bbclass b/meta-xilinx-core/classes-recipe/kernel-simpleimage.bbclass
index 110ee254..110ee254 100644
--- a/meta-xilinx-core/classes/kernel-simpleimage.bbclass
+++ b/meta-xilinx-core/classes-recipe/kernel-simpleimage.bbclass
diff --git a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
index 7466ab5e..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/dfx_user_dts.bbclass b/meta-xilinx-core/classes/dfx_user_dts.bbclass
deleted file mode 100644
index 4404aa05..00000000
--- a/meta-xilinx-core/classes/dfx_user_dts.bbclass
+++ /dev/null
@@ -1,267 +0,0 @@
-# This bbclass is inherited by flat, DFx Static and DFx RP firmware recipes.
-# dfx_user_dts.bbclass expects user to generate pl dtsi for flat, DFx Static
-# and DFx RP xsa outside of yocto.
-inherit devicetree
-DEPENDS = "dtc-native bootgen-native"
-# recipes that inherit from this class need to use an appropriate machine
-# override for COMPATIBLE_MACHINE to build successfully; don't allow building
-# for microblaze MACHINE
-COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE:microblaze = "^$"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PROVIDES = ""
-do_fetch[cleandirs] = "${B}"
-DT_PADDING_SIZE = "0x1000"
-BOOTGEN_FLAGS ?= " -arch ${SOC_FAMILY} -w ${@bb.utils.contains('SOC_FAMILY','zynqmp','','-process_bitstream bin',d)}"
-S ?= "${WORKDIR}"
-FW_DIR ?= ""
-DTSI_PATH ?= ""
-DTBO_PATH ?= ""
-DT_FILES_PATH = "${S}/${DTSI_PATH}"
-FIRMWARE_NAME_DT_FILE ?= ""
-USER_DTS_FILE ?= ""
-FIRMWARE_NAME_DT_FILE[doc] = "DT file which has firmware-name device-tree property"
-USER_DTS_FILE[doc] = "Final DTSI or DTS file which is used for packaging final DT overlay"
-python() {
-    import re
-    soc_family = d.getVar("SOC_FAMILY")
-    if "git://" in d.getVar("SRC_URI") or "https://" in d.getVar("SRC_URI"):
-        d.setVar("S",'${WORKDIR}/git/'+d.getVar("FW_DIR"))
-    else:
-        dtsi_found = False
-        dtbo_found = False
-        bit_found = False
-        bin_found = False
-        pdi_found = False
-        # Required Inputs
-        if '.dtsi' in d.getVar("SRC_URI") or '.dts' in d.getVar("SRC_URI"):
-            dtsi_found = True
-            d.setVar("DTSI_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.dtsi' in a or '.dts' in a][0].lstrip('file://')))
-        if '.dtbo' in d.getVar("SRC_URI"):
-            dtbo_found = True
-            d.setVar("DTBO_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.dtbo' in a][0].lstrip('file://')))
-        if '.bit' in d.getVar("SRC_URI") and soc_family != "versal":
-            bit_found = True
-            d.setVar("BIT_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.bit' in a][0].lstrip('file://')))
-        if '.bin' in d.getVar("SRC_URI") and soc_family != "versal":
-            bin_found = True
-            d.setVar("BIT_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.bin' in a][0].lstrip('file://')))
-        if '.pdi' in d.getVar("SRC_URI") and soc_family == "versal":
-            pdi_found = True
-            d.setVar("PDI_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.pdi' in a][0].lstrip('file://')))
-        # Check for valid combination of input files in SRC_URI
-        if dtsi_found or dtbo_found:
-            bb.debug(2, "dtsi or dtbo found in SRC_URI")
-            if bit_found or pdi_found or bin_found:
-                bb.debug(2, "bitstream or pdi found in SRC_URI")
-            elif bit_found and bin_found:
-                raise bb.parse.SkipRecipe("Both '.bit' and '.bin' file found in SRC_URI, either .bit or .bin file is supported but not both.")
-            else:
-                raise bb.parse.SkipRecipe("Need one '.bit' or one '.pdi' file added to SRC_URI ")
-        else:
-            raise bb.parse.SkipRecipe("Need one '.dtsi' or one '.dtbo' file added to SRC_URI ")
-        # Check for valid combination of dtsi and dts files in SRC_URI
-        # Following file combinations are not supported use case.
-        # 1. More than one '.dtsi' and zero '.dts' file.
-        # 2. More than one '.dts' and zero or more than one '.dtsi'file .
-        pattern_dts = re.compile(r'[.]+dts\b')
-        pattern_dtsi = re.compile(r'[.]+dtsi\b')
-        dts_count = len([*re.finditer(pattern_dts, d.getVar('SRC_URI'))])
-        dtsi_count = len([*re.finditer(pattern_dtsi, d.getVar("SRC_URI"))])
-        if dtsi_count > 1 and dts_count == 0:
-            raise bb.parse.SkipRecipe("Recipe has more than one '.dtsi' and zero '.dts' found, this is an unsupported use case")
-        elif dts_count > 1:
-            raise bb.parse.SkipRecipe("Recipe has more than one '.dts' and zero or more than one '.dtsi' found, this is an unsupported use case")
-        # Optional input
-        if '.json' in d.getVar("SRC_URI"):
-            d.setVar("JSON_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.json' in a][0].lstrip('file://')))
-        if '.xclbin' in d.getVar("SRC_URI"):
-            d.setVar("XCL_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.xclbin' in a][0].lstrip('file://')))
-}
-# Function to get dts or dtsi file count.
-def get_dt_count(d, dt_ext):
-    import glob
-    dt_count = sum(1 for f in glob.iglob((d.getVar('S') + (d.getVar('DTSI_PATH')) + '/*.' + dt_ext),recursive=True) if os.path.isfile(f))
-    return dt_count
-# Function to search for dt firmware-name property in dts or dtsi file.
-python find_firmware_file() {
-    import glob
-    pattern_fw = 'firmware-name'
-    search_count = 0
-    for dt_files in glob.iglob((d.getVar('S') + (d.getVar('DTSI_PATH')) + '/*.dts*'),recursive=True):
-        with open(dt_files, "r") as f:
-            current_fd = f.read()
-            if pattern_fw in current_fd:
-                search_count += 1
-                if search_count > 1:
-                    bb.error("firmware-name dt property found in more than one dt files! Please fix the dts or dtsi file.")
-                    break
-                else:
-                    d.setVar('FIRMWARE_NAME_DT_FILE', os.path.basename(dt_files))
-}
-do_configure[prefuncs] += "find_firmware_file"
-python do_configure() {
-    import glob, re, shutil
-    soc_family = d.getVar("SOC_FAMILY")
-    if bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', False, True, d):
-        bb.warn("Using fpga-manager.bbclass requires fpga-overlay MACHINE_FEATURE to be enabled")
-    # Renaming firmware-name using $PN as bitstream/PDI will be renamed using
-    # $PN when generating the bin/pdi file.
-    if os.path.isfile(d.getVar('S') + (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
-        orig_dtsi = glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE'))[0]
-        new_dtsi = d.getVar('S') + '/pl.dtsi_firmwarename'
-        with open(new_dtsi, 'w') as newdtsi:
-            with open(orig_dtsi) as olddtsi:
-                for line in olddtsi:
-                    if soc_family == 'versal':
-                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.pdi\"',line))
-                    else:
-                        newdtsi.write(re.sub('firmware-name.*\".*\"','firmware-name = \"'+d.getVar('PN')+'.bit.bin\"',line))
-        shutil.move(new_dtsi,orig_dtsi)
-}
-do_compile[prefuncs] += "find_firmware_file"
-python devicetree_do_compile:append() {
-    import glob, subprocess, shutil
-    soc_family = d.getVar("SOC_FAMILY")
-    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
-    # Skip devicetree do_compile task if input file is dtbo in SRC_URI
-    if not dtbo_count:
-        # Convert .bit to bit.bin format only if dtsi is input.
-        # In case of dtbo as input, bbclass doesn't know if firmware-name is .bit or
-        # .bit.bin format and corresponding file name. Hence we are not doing
-        # bit.bin conversion.
-        if soc_family != 'versal' and glob.glob(d.getVar('S') + '/' + d.getVar('FIRMWARE_NAME_DT_FILE')):
-            pn = d.getVar('PN')
-            biffile = pn + '.bif'
-            with open(biffile, 'w') as f:
-                f.write('all:\n{\n\t' + glob.glob(d.getVar('S')+(d.getVar('BIT_PATH') or '') + '/*.bit')[0] + '\n}')
-            bootgenargs = ["bootgen"] + (d.getVar("BOOTGEN_FLAGS") or "").split()
-            bootgenargs += ["-image", biffile, "-o", pn + ".bit.bin"]
-            subprocess.run(bootgenargs, check = True)
-            # In Zynq7k using both "-process_bitstream bin" and "-o" in bootgen flag,
-            # to convert bit file to bin format, "-o" option will not be effective
-            # and generated output file name is ${S}+${BIT_PATH}/<bit_file_name>.bit.bin
-            # file, Hence we need to rename this file from <bit_file_name>.bit.bin to
-            # ${PN}.bit.bin which matches the firmware name in dtbo and move
-            # ${PN}.bit.bin to ${B} directory.
-            if soc_family == 'zynq':
-                src_bitbin_file = glob.glob(d.getVar('S') + (d.getVar('BIT_PATH') or '') + '/*.bit.bin')[0]
-                dst_bitbin_file = d.getVar('B') + '/' + pn + '.bit.bin'
-                shutil.move(src_bitbin_file, dst_bitbin_file)
-            if not os.path.isfile(pn + ".bit.bin"):
-                bb.fatal("Couldn't find %s file, Enable '-log trace' in BOOTGEN_FLAGS" \
-                    "and check bootgen_log.txt" % (d.getVar('B') + '/' + pn + '.bit.bin'))
-}
-# If user inputs both dtsi and dts files then device-tree will generate dtbo
-# files for each dt file, Hence to package the firmware pick the right user dt
-# overlay file.
-python find_user_dts_overlay_file() {
-    import glob
-    dtbo_count = sum(1 for f in glob.iglob((d.getVar('S') + '/*.dtbo'),recursive=True) if os.path.isfile(f))
-    # Skip if input file is dtbo in SRC_URI
-    if not dtbo_count:
-        dts_count = get_dt_count(d, 'dts')
-        dtsi_count = get_dt_count(d, 'dtsi')
-        if dtsi_count == 1 and dts_count == 0:
-            dts_file =glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/*.dtsi')[0]
-        elif dtsi_count >=0 and dts_count == 1:
-            dts_file = glob.glob(d.getVar('S')+ (d.getVar('DTSI_PATH') or '') + '/*.dts')[0]
-        d.setVar('USER_DTS_FILE', os.path.splitext(os.path.basename(dts_file))[0])
-}
-do_install[prefuncs] += "find_user_dts_overlay_file"
-do_install() {
-    install -d ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-    # In case of dtbo as input, dtbo will be copied from directly from ${S}
-    # In case of dtsi as input, dtbo will be copied from directly from ${B}
-    if [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
-        install -Dm 0644 ${S}/*.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-    elif [ `ls ${S}/*.dtbo | wc -l` -gt 1 ]; then
-        bbfatal "Multiple DTBO found, use the right DTBO in SRC_URI from the following:\n$(basename -a ${S}/*.dtbo)"
-    elif [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
-        install -Dm 0644 ${B}/${USER_DTS_FILE}.dtbo ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.dtbo
-    else
-        bbfatal "A dtbo ending '.dtbo' expected but not found"
-    fi
-    if [ "${SOC_FAMILY}" == "versal" ]; then
-        # In case of dtbo as input, pdi will be copied from directly from ${S}
-        # without renaming the pdi name to ${PN}.pdi
-        if [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
-            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ `ls ${S}/*.pdi | wc -l` -gt 1 ]; then
-            bbfatal "Multiple PDI found, use the right PDI in SRC_URI from the following:\n$(basename -a ${S}/*.pdi)"
-        elif [ `ls ${S}/*.pdi | wc -l` -eq 1 ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
-            install -Dm 0644 ${S}/*.pdi ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.pdi
-        else
-            bbfatal "A PDI file with '.pdi' expected but not found"
-        fi
-    else
-        # In case of dtbo as input, .bit or .bin will be copied from directly
-        # from ${S} without renaming the .bit/.bin name to ${PN}.bit/${PN}.bin
-        # if more than one .bit/.bin file is found then fail the task.
-        if [ `ls ${S}/*.bit | wc -l` -gt 1 ]; then
-            bbfatal "Multiple .bit found, use the right .bit in SRC_URI from the following:\n$(basename -a ${S}/*.bit)"
-        elif [ `ls ${S}/*.bin | wc -l` -gt 1 ]; then
-            bbfatal "Multiple .bin found, use the right .bin in SRC_URI from the following:\n$(basename -a ${S}/*.bin)"
-        elif [ `ls ${S}/*.bit | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
-            install -Dm 0644 ${S}/*.bit ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ `ls ${S}/*.bin | wc -l` -eq 1 ] && [ `ls ${S}/*.dtbo | wc -l` -eq 1 ]; then
-            install -Dm 0644 ${S}/*.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-        elif [ -f ${B}/${PN}.bit.bin ] && [ -f ${B}/${USER_DTS_FILE}.dtbo ]; then
-            install -Dm 0644 ${B}/${PN}.bit.bin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.bit.bin
-        else
-            bbfatal "A bitstream file with '.bit' or '.bin' expected but not found"
-        fi
-    fi
-    if ls ${S}/${XCL_PATH}/*.xclbin >/dev/null 2>&1; then
-        install -Dm 0644 ${S}/${XCL_PATH}/*.xclbin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.xclbin
-    fi
-    if [ -f ${S}/${JSON_PATH}/shell.json ] || [ -f ${S}/${JSON_PATH}/accel.json ]; then
-        install -Dm 0644 ${S}/${JSON_PATH}/*.json ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
-    fi
-}
-do_deploy[noexec] = "1"
-FILES:${PN} += "${nonarch_base_libdir}/firmware/xilinx/${PN}"
diff --git a/meta-xilinx-core/classes/fpgamanager_custom.bbclass b/meta-xilinx-core/classes/fpgamanager_custom.bbclass
deleted file mode 100644
index 8c8997a1..00000000
--- a/meta-xilinx-core/classes/fpgamanager_custom.bbclass
+++ /dev/null
@@ -1,24 +0,0 @@
-# This class inherits dfx_user_dts.bbclass for below use cases.
-# Zynq-7000 and ZynqMP: Full bitstream loading.
-# ZynqMP: DFx Static and Partial bitstream loading.
-# Versal: DFx Static and Parial pdi loading.
-# Versal: Full PDI loading.
-inherit dfx_user_dts
-python fpgamanager_warn_msg () {
-    if not d.getVar("FPGAMANAGER_NO_WARN"):
-        arch = d.getVar('SOC_FAMILY')
-        pn = d.getVar('PN')        
-        warn_msg = 'Users should start using dfx_user_dts bbclass for '
-        if arch == 'zynq':
-            warn_msg += 'Zynq-7000 Full bitstream loading use case.'
-        elif arch == 'zynqmp':
-            warn_msg += 'ZynqMP Full or DFx Static or DFx Partial bitstream loading use case.'
-        elif arch == 'versal':
-            warn_msg += 'Versal DFx Static or DFx Partial or Full PDI loading use case.'
-        bb.warn("Recipe %s has inherited fpgamanager_custom bbclass which will be deprecated in 2024.1 release. \n%s" % (pn, warn_msg))
-}
-do_install[postfuncs] += "fpgamanager_warn_msg"
-\ No newline at end of file
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index b140fce4..f0a233cf 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"
@@ -54,12 +54,14 @@ 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] = "1:2021.01-xilinx-v2022.1%"
 XILINX_UBOOT_VERSION[v2022.2] = "1:2022.01-xilinx-v2022.2%"
 XILINX_UBOOT_VERSION[v2023.1] = "1:2023.01-xilinx-v2023.1%"
 XILINX_UBOOT_VERSION[v2023.2] = "1:2023.01-xilinx-v2023.2%"
+XILINX_UBOOT_VERSION[v2024.1] = "1:2024.01-xilinx-v2024.1%"
 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'}"
@@ -68,6 +70,7 @@ XILINX_LINUX_VERSION[v2022.1] = "5.15.19%"
 XILINX_LINUX_VERSION[v2022.2] = "5.15.36%"
 XILINX_LINUX_VERSION[v2023.1] = "6.1.30%"
 XILINX_LINUX_VERSION[v2023.2] = "6.1.60%"
+XILINX_LINUX_VERSION[v2024.1] = "6.6.10%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 # XRT/ZOCL
@@ -75,6 +78,7 @@ XRT_ZOCL_VERSION[v2022.1] = "202210.2.13.479"
 XRT_ZOCL_VERSION[v2022.2] = "202220.2.14.0"
 XRT_ZOCL_VERSION[v2023.1] = "202310.2.15.0"
 XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0"
+XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.0"
 PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_kernel-module-zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
@@ -83,12 +87,14 @@ AIEFAL_VERSION[v2022.1] = "1.4"
 AIEFAL_VERSION[v2022.2] = "1.4"
 AIEFAL_VERSION[v2023.1] = "1.5"
 AIEFAL_VERSION[v2023.2] = "1.5"
+AIEFAL_VERSION[v2024.1] = "1.6"
 PREFERRED_VERSION_aiefal ?= "${@d.getVarFlag('AIEFAL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 AI_ENGINE_DRIVER_VERSION[v2022.1] = "3.3"
 AI_ENGINE_DRIVER_VERSION[v2022.2] = "3.3"
 AI_ENGINE_DRIVER_VERSION[v2023.1] = "3.4"
 AI_ENGINE_DRIVER_VERSION[v2023.2] = "3.4"
+AI_ENGINE_DRIVER_VERSION[v2024.1] = "3.5"
 PREFERRED_VERSION_ai-engine-driver ?= "${@d.getVarFlag('AI_ENGINE_DRIVER_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 # Add support to eSDK for gen-machine-conf if it exists
diff --git a/meta-xilinx-core/conf/machine/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..1837da26 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -23,13 +23,16 @@ PREFERRED_PROVIDER_u-boot-tools ??= "u-boot-tools-xlnx"
 PREFERRED_PROVIDER_u-boot-tools-native ??= "u-boot-tools-xlnx-native"
 PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-u-boot-tools-xlnx"
+# Libmetal and OpenAMP Configuration
+PREFERRED_PROVIDER_libmetal ?= "libmetal-xlnx"
+PREFERRED_PROVIDER_open-amp ?= "open-amp-xlnx"
 do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}"
 UBOOT_SUFFIX ?= "bin"
 UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
-UBOOT_ELF ?= "u-boot"
+UBOOT_ELF ?= "u-boot.elf"
-UBOOT_ELF:aarch64 ?= "u-boot.elf"
 # libmali is selected by DISTRO_FEATURE of libmali & MACHINE_FEATURES of mali400
 # lima is selected by DISTRO_FEATURE != libmali & MACHINE_FEATURES of mali400
diff --git a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
index bf5523ed..1028ac04 100644
--- a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
@@ -6,6 +6,12 @@ require conf/machine/versal-generic.conf
 SOC_VARIANT = "ai-edge"
+# VEK280 board has 12GB memory only but default versal-generic has QB_MEM set to
+# 8G, Hence we need set 12G in QB_MEM.
+QB_MEM = "-m 12G"
+QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb"
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_ai_edge_generic']['versal-ai-edge-generic' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 2f35ba24..3582944b 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -84,7 +84,7 @@ QB_KERNEL_CMDLINE_APPEND ?= ""
 QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
 QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vck190.dtb"
-QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-vc-p-a2197-00.dtb"
+QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 # Four total serial ports defined in this model (according to the dts)
 #
diff --git a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
index 23fffcb9..3e72da60 100644
--- a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
@@ -6,6 +6,12 @@ require conf/machine/versal-generic.conf
 SOC_VARIANT = "hbm"
+# VHK158 has 32GB memory only but default versal-generic has QB_MEM set to 8G,
+# Since versal-vhk158-reva.dts has 32GB set, we need set same in QB_MEM
+QB_MEM = "-m 32G"
+QEMU_HW_DTB_PS =  "${QEMU_HW_DTB_PATH}/board-versal-ps-vhk158.dtb"
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_hbm_generic']['versal-hbm-generic' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index 9945d301..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/conf/machine/versal-prime-generic.conf b/meta-xilinx-core/conf/machine/versal-prime-generic.conf
index 94e9b05e..206f0e2a 100644
--- a/meta-xilinx-core/conf/machine/versal-prime-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-prime-generic.conf
@@ -6,6 +6,8 @@ require conf/machine/versal-generic.conf
 SOC_VARIANT = "prime"
+QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vmk180.dtb"
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_prime_generic']['versal-prime-generic' != "${MACHINE}"]}"
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..a03912d7
--- /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 = "xlnx_rel_v2024.1"
+LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
+PV = "${SRCBRANCH}+git"
+REPO = "git://github.com/Xilinx/libmetal.git;protocol=https"
+include ${LAYER_PATH_openamp-layer}/recipes-openamp/libmetal/libmetal.inc
+include ${LAYER_PATH_openamp-layer}/vendor/xilinx/recipes-openamp/libmetal/libmetal-xlnx.inc
+RPROVIDES:${PN}-dbg += "libmetal-dbg"
+RPROVIDES:${PN}-dev += "libmetal-dev"
+RPROVIDES:${PN}-lic += "libmetal-lic"
+RPROVIDES:${PN}-src += "libmetal-src"
+RPROVIDES:${PN}-staticdev += "libmetal-staticdev"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
new file mode 100644
index 00000000..94535abc
--- /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 = "dbf0857389190f4c4cedfb77bd1f9bdd7ab404f3"
+BRANCH = "xlnx_rel_v2024.1"
+LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
+PV = "${SRCBRANCH}+git"
+REPO = "git://github.com/Xilinx/open-amp.git;protocol=https"
+include ${LAYER_PATH_openamp-layer}/recipes-openamp/open-amp/open-amp.inc
+require ${LAYER_PATH_openamp-layer}/vendor/xilinx/recipes-openamp/open-amp/open-amp-xlnx.inc
+RPROVIDES:${PN}-dbg += "open-amp-dbg"
+RPROVIDES:${PN}-dev += "open-amp-dev"
+RPROVIDES:${PN}-lic += "open-amp-lic"
+RPROVIDES:${PN}-src += "open-amp-src"
+RPROVIDES:${PN}-staticdev += "open-amp-staticdev"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_%.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_%.bbappend
index 2b96f152..e0de911f 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_%.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_%.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-8.1.inc b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-8.1.inc
new file mode 100644
index 00000000..42f054e6
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split-8.1.inc
@@ -0,0 +1,71 @@
+# we have our own package splitting for qemu, inhbit the oe-core
+# split by overriding the split function
+python split_qemu_packages () {
+    print( "meta-virtualization: vmsplit: inhibiting core qemu package split" )
+}
+PACKAGES:prepend:class-target = "${PN}-x86_64 \
+                     ${PN}-aarch64 \
+                     ${PN}-arm \
+                     ${PN}-i386 \
+                     ${PN}-system-i386 \
+                     ${PN}-microblaze \
+                     ${PN}-support \
+                     ${PN}-keymaps \
+                     ${PN}-firmware \
+                    "
+FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
+RDEPENDS:${PN}-x86_64:append:class-target = " ${PN}"
+RPROVIDES:${PN}-x86_64:append:class-target = " ${PN}-system-x86_64"
+RPROVIDES:${PN}-x86_64:append:class-target = " ${PN}-user-x86_64"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-x86_64"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-x86_64"
+INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps"
+FILES:${PN}-i386:class-target = "${bindir}/qemu-i386"
+RDEPENDS:${PN}-i386:append:class-target = " ${PN}"
+RPROVIDES:${PN}-i386:append:class-target = " ${PN}-user-i386"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-i386"
+INSANE_SKIP:${PN}-i386:class-target = "file-rdeps"
+FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386"
+RDEPENDS:${PN}-system-i386:append:class-target = " ${PN}"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-system-i386"
+INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps"
+FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
+RDEPENDS:${PN}-aarch64:append:class-target = " ${PN}"
+RPROVIDES:${PN}-aarch64:append:class-target = " ${PN}-system-aarch64"
+RPROVIDES:${PN}-aarch64:append:class-target = " ${PN}-user-aarch64"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-aarch64"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-aarch64"
+INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps"
+FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
+RDEPENDS:${PN}-arm:append:class-target = " ${PN}"
+RPROVIDES:${PN}-arm:append:class-target = " ${PN}-system-arm"
+RPROVIDES:${PN}-arm:append:class-target = " ${PN}-user-arm"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-arm"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-arm"
+INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
+FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
+RDEPENDS:${PN}-microblaze:append:class-target = " ${PN}"
+RPROVIDES:${PN}-microblaze:append:class-target = " ${PN}-system-microblaze"
+RPROVIDES:${PN}-microblaze:append:class-target = " ${PN}-user-microblaze"
+RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-microblaze"
+RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-microblaze"
+INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
+FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*"
+RDEPENDS:${PN}-support:class-target = "${PN} bash"
+FILES:${PN}-firmware:class-target = "${datadir}/${PN}/*.bin ${datadir}/${PN}/*.rom ${datadir}/${PN}/*.img ${datadir}/${PN}/openbios* ${datadir}/${PN}/*.dtb ${datadir}/${PN}/u-boot*"
+RDEPENDS:${PN}-firmware:class-target = "${PN}"
+INSANE_SKIP:${PN}-firmware:class-target = "arch"
+FILES:${PN}-keymaps:class-target = "${datadir}/${PN}/keymaps/*"
+RDEPENDS:${PN}-keymaps:class-target = "${PN}"
+PACKAGECONFIG:append:class-target = " virtfs"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split.inc b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split.inc
deleted file mode 100644
index 2c73d931..00000000
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx-package-split.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-PACKAGES:prepend:class-target = "${PN}-x86_64 \
-                     ${PN}-aarch64 \
-                     ${PN}-arm \
-                     ${PN}-i386 \
-                     ${PN}-system-i386 \
-                     ${PN}-microblaze \
-                     ${PN}-support \
-                     ${PN}-keymaps \
-                     ${PN}-firmware \
-                    "
-FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
-RDEPENDS:${PN}-x86_64:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps"
-FILES:${PN}-i386:class-target = "${bindir}/qemu-i386"
-RDEPENDS:${PN}-i386:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-i386:class-target = "file-rdeps"
-FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386"
-RDEPENDS:${PN}-system-i386:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps"
-FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
-RDEPENDS:${PN}-aarch64:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps"
-FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
-RDEPENDS:${PN}-arm:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
-FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
-RDEPENDS:${PN}-microblaze:append:class-target = "${PN}"
-INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
-FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*"
-RDEPENDS:${PN}-support:class-target = "${PN} bash"
-FILES:${PN}-firmware:class-target = "${datadir}/${PN}/*.bin ${datadir}/${PN}/*.rom ${datadir}/${PN}/*.img ${datadir}/${PN}/openbios* ${datadir}/${PN}/*.dtb ${datadir}/${PN}/u-boot*"
-RDEPENDS:${PN}-firmware:class-target = "${PN}"
-INSANE_SKIP:${PN}-firmware:class-target = "arch"
-FILES:${PN}-keymaps:class-target = "${datadir}/${PN}/keymaps/*"
-RDEPENDS:${PN}-keymaps:class-target = "${PN}"
-PACKAGECONFIG:append:class-target = " virtfs"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend
deleted file mode 100644
index 5cca9e1f..00000000
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', '${BPN}-package-split.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_8.1%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_8.1%.bbappend
new file mode 100644
index 00000000..74aa15fb
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_8.1%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-8.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend
new file mode 100644
index 00000000..74aa15fb
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu_8.1%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-xilinx-package-split-8.1.inc', '', d)}
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
index 56cb8a45..8a2b7a46 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"
+SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=v0.2024.x;protocol=https"
-SRCREV = "807435ae6fa0a07e8c84b458d138f3f54614eb5c"
+SRCREV = "4fb08575157d7712e0cd50e9e9c07620bc9f8b4b"
 FILESEXTRAPATHS:prepend := "${THISDIR}/lopper:"
@@ -10,4 +10,5 @@ RDEPENDS:${PN} += " \
    python3-anytree \
    python3-six \
    python3-pyyaml \
+    python3-packaging \
    "
diff --git a/meta-xilinx-core/gen-machine-conf b/meta-xilinx-core/gen-machine-conf
-Subproject 911941fc094dc0073c2f01a2b94de3cc6e993fe
+Subproject e3968c5d6b1d02b2c1fa51de838f0757bca1c16
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
index f053a9bd..1f1d0606 100644
--- a/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
+++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
@@ -6,7 +6,7 @@ SUMMARY = "Image update is used to update alternate image on compatible firmware
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b"
-BRANCH = "master"
+BRANCH = "xlnx_rel_v2024.1"
 SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https"
 SRCREV = "a68308f329578d3585fd335071a9184aa7f46d2e"
@@ -16,6 +16,7 @@ S = "${WORKDIR}/git"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
 PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
new file mode 100644
index 00000000..075fd94c
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
@@ -0,0 +1,48 @@
+SUMMARY = "Xilinx AI Engine runtime"
+DESCRIPTION = "This library provides APIs for the runtime support of the Xilinx AI Engine IP"
+require aie-rt-2024.inc
+SECTION = "libs"
+AIEDIR ?= "${S}/driver"
+S = "${WORKDIR}/git"
+I = "${AIEDIR}/include"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
+COMPATIBLE_MACHINE:versal-ai-edge = "${SOC_VARIANT_ARCH}"
+IOBACKENDS ?= "Linux"
+DEPENDS = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '', d)}"
+RDEPENDS:${PN} = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '', d)}"
+PROVIDES = "libxaiengine"
+RPROVIDES:${PN} = "libxaiengine"
+# The makefile isn't ready for parallel execution at the moment
+PARALLEL_MAKE = "-j 1"
+CFLAGS += "-Wall -Wextra"
+CFLAGS += "${@bb.utils.contains('IOBACKENDS', 'Linux', ' -D__AIELINUX__', '', d)}"
+CFLAGS += "${@bb.utils.contains('IOBACKENDS', 'metal', ' -D__AIEMETAL__', '', d)}"
+EXTRA_OEMAKE = "-C ${AIEDIR}/src -f Makefile.Linux CFLAGS='${CFLAGS}'"
+do_compile(){
+        oe_runmake
+}
+do_install(){
+        install -d ${D}${includedir}
+        install ${I}/*.h ${D}${includedir}/
+        install -d ${D}${includedir}/xaiengine
+        install ${I}/xaiengine/*.h ${D}${includedir}/xaiengine/
+        install -d ${D}${libdir}
+        cp -dr ${AIEDIR}/src/*.so* ${D}${libdir}
+}
+PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:versal-ai-edge = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc
new file mode 100644
index 00000000..98b3a049
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc
@@ -0,0 +1,11 @@
+SECTION = "libs"
+REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https"
+BRANCH ?= "xlnx_rel_v2024.1"
+SRCREV ?= "56af0110186dfd546c58d96ff1d2f4f2d91f7724"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM ?= "file://license.txt;md5=04a153cae61a8a606fc79dff49c2c897"
+SRC_URI = "${REPO};branch=${BRANCH}"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
new file mode 100644
index 00000000..5c479d05
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
@@ -0,0 +1,35 @@
+SUMMARY = "Xilinx AI Engine FAL(Functional Abstraction Layer)"
+DESCRIPTION = "AIE FAL provides functional abstraction APIs for runtime support of Xilinx AI Engine IP"
+require aie-rt-2024.inc
+SECTION = "devel"
+XAIEFAL_DIR ?= "fal"
+S = "${WORKDIR}/git"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
+COMPATIBLE_MACHINE:versal-ai-edge = "${SOC_VARIANT_ARCH}"
+IOBACKENDS ?= "Linux"
+PROVIDES = "aiefal"
+ALLOW_EMPTY:${PN} = "1"
+inherit pkgconfig cmake
+DEPENDS = "libxaiengine"
+OECMAKE_SOURCEPATH = "${S}/${XAIEFAL_DIR}"
+EXTRA_OECMAKE = "-DWITH_TESTS=OFF  -DFAL_LINUX=ON "
+EXTRA_OECMAKE:append = "${@'-DWITH_EXAMPLES=ON' if d.getVar('WITH_EXAMPLES') == 'y' else '-DWITH_EXAMPLES=OFF'}"
+FILES:${PN}-demos = " \
+    ${bindir}/* \
+"
+PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:versal-ai-edge = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.10-xilinx-v2024.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.10-xilinx-v2024.1.bb
new file mode 100644
index 00000000..fee8e069
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.10-xilinx-v2024.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/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
index 26a10677..9367fa2c 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..28f997f2
--- /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 = "xlnx_rel_v2024.1"
+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..42e67ce6
--- /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 ?= "xlnx_rel_v2024.1"
+REPO ?= "git://github.com/Xilinx/libdfx.git;protocol=https"
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+SRCREV = "c8275891ead62b3dfce68c00cf466715f0ac75f1"
+COMPATIBLE_MACHINE = "^$"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
+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_2024.01-xilinx-v2024.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.1.bb
new file mode 100644
index 00000000..590d1755
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.1.bb
@@ -0,0 +1,21 @@
+require u-boot-tools-xlnx.inc
+require u-boot-xlnx-2024.1.inc
+# MUST clear CONFIG_VIDEO to avoid a compilation failure trying to construct
+# bmp_logo.h
+SED_CONFIG_EFI:append = ' -e "s/CONFIG_VIDEO=.*/# CONFIG_VIDEO is not set/"'
+# Default do_compile fails with:
+# | error: object directory ../downloads/git2/github.com.Xilinx.u-boot-xlnx.git/objects does not exist; check .git/objects/info/alternates.
+# The regular workaround of calling 'git diff' seems to be problematic.
+do_compile () {
+        oe_runmake -C ${S} tools-only_defconfig O=${B}
+        # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
+        # generating it requires bin2header tool, which for target build
+        # is built with target tools and thus cannot be executed on host.
+        sed -i -e "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" ${SED_CONFIG_EFI} ${B}/.config
+        oe_runmake -C ${S} cross_tools NO_SDL=1 O=${B}
+}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-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-2024.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
new file mode 100644
index 00000000..425bb029
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
@@ -0,0 +1,17 @@
+UBRANCH = "xlnx_rebase_v2024.01"
+SRCREV = "fbed1010e50d75e7d25acc1c2d09e1c34cb7e882"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
+# u-boot-xlnx has support for these
+HAS_PLATFORM_INIT ?= " \
+                xilinx_zynqmp_virt_config \
+                xilinx_zynq_virt_defconfig \
+                xilinx_versal_vc_p_a2197_revA_x_prc_01_revA \
+                "
+DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2024.01:"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
index 1f6781b6..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
@@ -2,5 +2,5 @@ SRC_URI += " \
    file://microblaze-generic.cfg \
    "
-# Disable buildpaths QA check warnings for u-boot-xlnx.elf.
+# Disable buildpaths and arch QA check warnings for u-boot-xlnx.elf.
-INSANE_SKIP:${PN}-elf += "buildpaths"
+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 ac391c3c..985ca427 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
@@ -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;
+                        fatload ${devtype} ${devnum}:${distro_bootpart} @@DEVICETREE_ADDRESS_SD@@ system.dtb;
-                        setenv fdtcontroladdr @@DEVICETREE_ADDRESS@@
+                        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-scr/boot.cmd.ubifs b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs
index dca974ab..fde094cf 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr/boot.cmd.ubifs
@@ -7,6 +7,10 @@
 for boot_target in ${boot_targets};
 do
+        echo "Trying to load boot images from ${boot_target}"
+        if test "${boot_target}" = "jtag" ; then
+                @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@
+        fi
        if test "${boot_target}" = "xspi0" || test "${boot_target}" = "qspi" || test "${boot_target}" = "qspi0"; then
                ubifsls @@FIT_IMAGE@@
                if test $? = 0; then
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
index 228396eb..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_2024.01-xilinx-v2024.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.1.bb
new file mode 100644
index 00000000..718ad9d4
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.1.bb
@@ -0,0 +1,4 @@
+require u-boot-xlnx.inc
+require u-boot-spl-zynq-init.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/bootgen/bootgen_2023.2.bb b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.1.bb
index 03f323e1..3c68f10d 100644
--- a/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2023.2.bb
+++ b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.1.bb
@@ -10,8 +10,8 @@ DEPENDS += "openssl"
 RDEPENDS:${PN} += "openssl"
 REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
-BRANCH = "xlnx_rel_v2023.2"
+BRANCH = "xlnx_rel_v2024.1"
-SRCREV = "8e6702bb5064b806e45028486de7376962470a36"
+SRCREV = "92e09bf37ea17d7b1f0e102a2548f27fb768651c"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
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/libgles/libmali-xlnx_r9p0-01rel0.bb b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb
index 4ee36018..7f5fba0b 100644
--- a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb
+++ b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb
@@ -13,7 +13,7 @@ PROVIDES += "virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 REPO ?= "git://github.com/Xilinx/mali-userspace-binaries.git;protocol=https"
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
 SRCREV ?= "b3a772aad859cdadc8513b11c3e995546c20e75e"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
diff --git a/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.1.0-and-current-i2c-probing.patch b/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch
index 8ac3abc2..dde59936 100644
--- a/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.1.0-and-current-i2c-probing.patch
+++ b/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch
@@ -1,21 +1,21 @@
-From acda49e5baee80e8b06f7019e57e9aace4f7f923 Mon Sep 17 00:00:00 2001
+From adc957ce85d431da42dc42ed4074322d6c94932f Mon Sep 17 00:00:00 2001
 From: Mark Hatle <mark.hatle@amd.com>
 Date: Thu, 16 May 2024 20:31:29 -0600
-Subject: [PATCH] Support both pre 6.1.0 and current i2c probing
+Subject: [PATCH] Support both pre 6.4.0 and current i2c probing
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
- dp/xfmc/dp141.c    |  8 ++++++++
+ dp/xfmc/dp141.c                          | 13 +++++++++++++
- dp/xfmc/fmc.c      |  8 ++++++++
+ dp/xfmc/fmc.c                            | 13 +++++++++++++
- dp/xfmc/fmc64.c    |  9 +++++++++
+ dp/xfmc/fmc64.c                          | 14 ++++++++++++++
- dp/xfmc/fmc65.c    |  8 ++++++++
+ dp/xfmc/fmc65.c                          | 13 +++++++++++++
- dp/xfmc/idt.c      | 16 ++++++++++++----
+ dp/xfmc/idt.c                            | 21 +++++++++++++++++----
- dp/xfmc/mcdp6000.c |  8 ++++++++
+ dp/xfmc/mcdp6000.c                       | 13 +++++++++++++
- dp/xfmc/tipower.c  |  8 ++++++++
+ dp/xfmc/tipower.c                        | 13 +++++++++++++
- 7 files changed, 61 insertions(+), 4 deletions(-)
+ 7 files changed, 96 insertions(+), 4 deletions(-)
 diff --git a/dp/xfmc/dp141.c b/dp/xfmc/dp141.c
-index 002afe8..29e6c61 100755
+index dfdb6f4..5fddd2b
 --- a/dp/xfmc/dp141.c
 +++ b/dp/xfmc/dp141.c
 @@ -14,6 +14,7 @@
@@ -26,7 +26,20 @@ index 002afe8..29e6c61 100755
 
 /**************************** Type Definitions *******************************/
 
-@@ -135,9 +136,16 @@ err_regmap:
+@@ -105,7 +106,12 @@ static const struct i2c_device_id dp141_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, dp141_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int dp141_probe(struct i2c_client *client)
+#else
+static int dp141_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -134,9 +140,16 @@ err_regmap:
        return ret;
 }
 
@@ -44,7 +57,7 @@ index 002afe8..29e6c61 100755
 static struct i2c_driver dp141_i2c_driver = {
        .driver = {
 diff --git a/dp/xfmc/fmc.c b/dp/xfmc/fmc.c
-index 16767c7..9be45d9 100755
+index 3447785..2ed136c
 --- a/dp/xfmc/fmc.c
 +++ b/dp/xfmc/fmc.c
 @@ -14,6 +14,7 @@
@@ -55,7 +68,20 @@ index 16767c7..9be45d9 100755
 
 /**************************** Type Definitions *******************************/
 
-@@ -122,9 +123,16 @@ err_regmap:
+@@ -93,7 +94,12 @@ static const struct i2c_device_id fmc_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc_probe(struct i2c_client *client)
+#else
+static int fmc_probe(struct i2c_client *client,
+                    const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -121,9 +127,16 @@ err_regmap:
        return ret;
 }
 
@@ -73,7 +99,7 @@ index 16767c7..9be45d9 100755
 static struct i2c_driver fmc_i2c_driver = {
        .driver = {
 diff --git a/dp/xfmc/fmc64.c b/dp/xfmc/fmc64.c
-index 2d06327..c677072 100755
+index 6f5562c..a0bad7a
 --- a/dp/xfmc/fmc64.c
 +++ b/dp/xfmc/fmc64.c
 @@ -14,6 +14,8 @@
@@ -85,7 +111,20 @@ index 2d06327..c677072 100755
 /**************************** Type Definitions *******************************/
 static const struct regmap_config fmc64_regmap_config = {
        .reg_bits = 16,
-@@ -119,9 +121,16 @@ err_regmap:
+@@ -89,7 +91,12 @@ static const struct i2c_device_id fmc64_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc64_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc64_probe(struct i2c_client *client)
+#else
+static int fmc64_probe(struct i2c_client *client,
+                      const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -118,9 +125,16 @@ err_regmap:
        return ret;
 }
 
@@ -103,7 +142,7 @@ index 2d06327..c677072 100755
 static struct i2c_driver fmc64_i2c_driver = {
        .driver = {
 diff --git a/dp/xfmc/fmc65.c b/dp/xfmc/fmc65.c
-index 5eb6c81..6927f05 100755
+index 9f091f9..ce7f884
 --- a/dp/xfmc/fmc65.c
 +++ b/dp/xfmc/fmc65.c
 @@ -14,6 +14,7 @@
@@ -114,7 +153,20 @@ index 5eb6c81..6927f05 100755
 
 /**************************** Type Definitions *******************************/
 
-@@ -121,9 +122,16 @@ err_regmap:
+@@ -91,7 +92,12 @@ static const struct i2c_device_id fmc65_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc65_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc65_probe(struct i2c_client *client)
+#else
+static int fmc65_probe(struct i2c_client *client,
+                      const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -120,9 +126,16 @@ err_regmap:
        return ret;
 }
 
@@ -132,7 +184,7 @@ index 5eb6c81..6927f05 100755
 static struct i2c_driver fmc65_i2c_driver = {
        .driver = {
 diff --git a/dp/xfmc/idt.c b/dp/xfmc/idt.c
-index 84ba521..458d685 100755
+index 348c863..f332277
 --- a/dp/xfmc/idt.c
 +++ b/dp/xfmc/idt.c
 @@ -17,6 +17,7 @@
@@ -172,7 +224,20 @@ index 84ba521..458d685 100755
        if (ret)
                dev_dbg(&idt->client->dev,
                        "IDT_8T49N24x_enable 1 I2C progmming failed\n");
-@@ -518,9 +519,16 @@ err_regmap:
+@@ -489,7 +490,12 @@ static const struct i2c_device_id idt_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, idt_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int idt_probe(struct i2c_client *client)
+#else
+static int idt_probe(struct i2c_client *client,
+                    const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -517,9 +523,16 @@ err_regmap:
        return ret;
 }
 
@@ -190,7 +255,7 @@ index 84ba521..458d685 100755
 static struct i2c_driver idt_i2c_driver = {
        .driver = {
 diff --git a/dp/xfmc/mcdp6000.c b/dp/xfmc/mcdp6000.c
-index d14a75d..60a1fdf 100755
+index 5a7c5b2..f13979b
 --- a/dp/xfmc/mcdp6000.c
 +++ b/dp/xfmc/mcdp6000.c
 @@ -14,6 +14,7 @@
@@ -201,7 +266,20 @@ index d14a75d..60a1fdf 100755
 
 #define SWAP_BYTES(u32Value) ((u32Value & 0x000000FF) << 24)\
 |((u32Value & 0x0000FF00) << 8) \
-@@ -394,9 +395,16 @@ err_regmap:
+@@ -363,7 +364,12 @@ static const struct i2c_device_id mcdp6000_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, mcdp6000_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int mcdp6000_probe(struct i2c_client *client)
+#else
+static int mcdp6000_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -393,9 +399,16 @@ err_regmap:
        return ret;
 }
 
@@ -219,7 +297,7 @@ index d14a75d..60a1fdf 100755
 static struct i2c_driver mcdp6000_i2c_driver = {
        .driver = {
 diff --git a/dp/xfmc/tipower.c b/dp/xfmc/tipower.c
-index d3536ab..ce00fff 100755
+index 46c3de1..6d247a8
 --- a/dp/xfmc/tipower.c
 +++ b/dp/xfmc/tipower.c
 @@ -14,6 +14,7 @@
@@ -230,7 +308,20 @@ index d3536ab..ce00fff 100755
 
 /**************************** Type Definitions *******************************/
 
-@@ -163,9 +164,16 @@ err_regmap:
+@@ -131,7 +132,12 @@ static const struct i2c_device_id tipower_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, tipower_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int tipower_probe(struct i2c_client *client)
+#else
+static int tipower_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -162,9 +168,16 @@ err_regmap:
        return ret;
 }
 
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.1.60.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
index 067f5af6..3aaac030 100644
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.1.60.bb
+++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
@@ -8,14 +8,14 @@ PV .= "+git"
 S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "5b0969ac09f301c33bccc140c8f60e832f5cf222"
+SRCREV ?= "e20942b256e6fb18eaef919c7441f65ad8afcf43"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
-SRC_URI += "file://0001-Support-both-pre-6.1.0-and-current-i2c-probing.patch"
+SRC_URI += "file://0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch"
 inherit module
diff --git a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch b/meta-xilinx-core/recipes-kernel/dtc/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
deleted file mode 100644
index cf4739eb..00000000
--- a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Wed, 19 Jan 2022 12:46:42 -0500
-Subject: [PATCH] Revert "libfdt: overlay: make overlay_get_target() public"
-This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb.
---
- libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++-------
- libfdt/libfdt.h      | 18 ------------------
- libfdt/version.lds   |  1 -
- 3 files changed, 22 insertions(+), 26 deletions(-)
-diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
-index 5c0c398..d217e79 100644
--- a/libfdt/fdt_overlay.c
-+++ b/libfdt/fdt_overlay.c
-@@ -40,22 +40,37 @@ static uint32_t overlay_get_target_phandle(const void *fdto, int fragment)
-        return fdt32_to_cpu(*val);
- }
- 
-int fdt_overlay_target_offset(const void *fdt, const void *fdto,
-                             int fragment_offset, char const **pathp)
-+/**
-+ * overlay_get_target - retrieves the offset of a fragment's target
-+ * @fdt: Base device tree blob
-+ * @fdto: Device tree overlay blob
-+ * @fragment: node offset of the fragment in the overlay
-+ * @pathp: pointer which receives the path of the target (or NULL)
-+ *
-+ * overlay_get_target() retrieves the target offset in the base
-+ * device tree of a fragment, no matter how the actual targeting is
-+ * done (through a phandle or a path)
-+ *
-+ * returns:
-+ *      the targeted node offset in the base device tree
-+ *      Negative error code on error
-+ */
-+static int overlay_get_target(const void *fdt, const void *fdto,
-+                             int fragment, char const **pathp)
- {
-        uint32_t phandle;
-        const char *path = NULL;
-        int path_len = 0, ret;
- 
-        /* Try first to do a phandle based lookup */
-       phandle = overlay_get_target_phandle(fdto, fragment_offset);
-+       phandle = overlay_get_target_phandle(fdto, fragment);
-        if (phandle == (uint32_t)-1)
-                return -FDT_ERR_BADPHANDLE;
- 
-        /* no phandle, try path */
-        if (!phandle) {
-                /* And then a path based lookup */
-               path = fdt_getprop(fdto, fragment_offset, "target-path", &path_len);
-+               path = fdt_getprop(fdto, fragment, "target-path", &path_len);
-                if (path)
-                        ret = fdt_path_offset(fdt, path);
-                else
-@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto)
-                if (overlay < 0)
-                        return overlay;
- 
-               target = fdt_overlay_target_offset(fdt, fdto, fragment, NULL);
-+               target = overlay_get_target(fdt, fdto, fragment, NULL);
-                if (target < 0)
-                        return target;
- 
-@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
-                        return -FDT_ERR_BADOVERLAY;
- 
-                /* get the target of the fragment */
-               ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path);
-+               ret = overlay_get_target(fdt, fdto, fragment, &target_path);
-                if (ret < 0)
-                        return ret;
-                target = ret;
-@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
- 
-                if (!target_path) {
-                        /* again in case setprop_placeholder changed it */
-                       ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path);
-+                       ret = overlay_get_target(fdt, fdto, fragment, &target_path);
-                        if (ret < 0)
-                                return ret;
-                        target = ret;
-diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
-index a7f432c..7f117e8 100644
--- a/libfdt/libfdt.h
-+++ b/libfdt/libfdt.h
-@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
-  */
- int fdt_overlay_apply(void *fdt, void *fdto);
- 
-/**
- * fdt_overlay_target_offset - retrieves the offset of a fragment's target
- * @fdt: Base device tree blob
- * @fdto: Device tree overlay blob
- * @fragment_offset: node offset of the fragment in the overlay
- * @pathp: pointer which receives the path of the target (or NULL)
- *
- * fdt_overlay_target_offset() retrieves the target offset in the base
- * device tree of a fragment, no matter how the actual targeting is
- * done (through a phandle or a path)
- *
- * returns:
- *      the targeted node offset in the base device tree
- *      Negative error code on error
- */
-int fdt_overlay_target_offset(const void *fdt, const void *fdto,
-                             int fragment_offset, char const **pathp);
-
- /**********************************************************************/
- /* Debugging / informational functions                                */
- /**********************************************************************/
-diff --git a/libfdt/version.lds b/libfdt/version.lds
-index cbce5d4..7ab85f1 100644
--- a/libfdt/version.lds
-+++ b/libfdt/version.lds
-@@ -77,7 +77,6 @@ LIBFDT_1.2 {
-                fdt_appendprop_addrrange;
-                fdt_setprop_inplace_namelen_partial;
-                fdt_create_with_flags;
-               fdt_overlay_target_offset;
-        local:
-                *;
- };
-- 
-2.19.1
diff --git a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.1.bb
deleted file mode 100644
index 95ab0be4..00000000
--- a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Python Library for the Device Tree Compiler"
-HOMEPAGE = "https://devicetree.org/"
-DESCRIPTION = "A python library for the Device Tree Compiler, a tool used to manipulate Device Tree files which contain a data structure for describing hardware."
-SECTION = "bootloader"
-LICENSE = "GPL-2.0-only | BSD-2-Clause"
-DEPENDS = "flex-native bison-native swig-native python3-setuptools-scm-native libyaml dtc"
-SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \
-           file://0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch \
-          "
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
-LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90"
-SRCREV = "c001fc01a43e7a06447c06ea3d50bd60641322b8"
-PV = "1.6.1+git"
-S = "${WORKDIR}/git"
-PYPA_WHEEL = "${S}/dist/libfdt-1.6.2*.whl"
-inherit setuptools3 pkgconfig
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.1.0-and-current-kernels.patch b/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch
index 1321a0a4..9bdbfc94 100644
--- a/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.1.0-and-current-kernels.patch
+++ b/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch
@@ -5,9 +5,9 @@ Subject: [PATCH] Support both pre 6.4.0 and current kernels
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
- hdmi/xilinx_drm_hdmi.c | 3 +++
+ hdmi/xilinx_drm_hdmi.c |  3 +++
- misc/dp159.c           | 9 +++++++++
+ misc/dp159.c           | 14 ++++++++++++++
- 2 files changed, 12 insertions(+)
+ 2 files changed, 17 insertions(+)
 diff --git a/hdmi/xilinx_drm_hdmi.c b/hdmi/xilinx_drm_hdmi.c
 index 104fc3d..6ebbdca 100644
@@ -32,7 +32,7 @@ index 104fc3d..6ebbdca 100644
 #include <linux/clk.h>
 #include <linux/delay.h>
 diff --git a/misc/dp159.c b/misc/dp159.c
-index 0a923d6..23a92e6 100644
+index 73e886f..d2c60d9 100644
 --- a/misc/dp159.c
 +++ b/misc/dp159.c
 @@ -28,6 +28,7 @@
@@ -43,7 +43,20 @@ index 0a923d6..23a92e6 100644
 
 MODULE_DESCRIPTION("i2c device driver for dp159 redriver and retimer");
 MODULE_AUTHOR("Leon Woestenberg");
-@@ -192,12 +193,20 @@ static int dp159_probe(struct i2c_client *client,
+@@ -133,7 +134,12 @@ struct clk_ops clk_tx_rate_ops = {
+        .round_rate             = &clk_tx_round_rate,
+ };
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int dp159_probe(struct i2c_client *client)
+#else
+static int dp159_probe(struct i2c_client *client,
+                      const struct i2c_device_id *id)
+#endif
+ {
+        struct clk_tx_linerate *clk_tx;
+        struct clk *clk;
+@@ -191,12 +197,20 @@ static int dp159_probe(struct i2c_client *client)
        return 0;
 }
 
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.1.60.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb
index cb33380b..7e25fe1f 100644
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.1.60.bb
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb
@@ -8,14 +8,14 @@ PV .= "+git"
 S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
-SRCREV = "82209b0021a7b5d7ef71a859eed4bafeb541ed08"
+SRCREV = "edd297762e0bac3f4c5b64ef67244968e22020e2"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
-SRC_URI += "file://0001-Support-both-pre-6.1.0-and-current-kernels.patch"
+SRC_URI += "file://0001-Support-both-pre-6.4.0-and-current-kernels.patch"
 inherit module
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_6.6.10-v2024.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.10-v2024.1.bb
new file mode 100644
index 00000000..71ac690e
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.10-v2024.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 = "3af4295e00efdced3e8c6973606a7de55f6bf7dc"
+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/0001-Current-gcc-requires-cstdint-for-C-types.patch b/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Current-gcc-requires-cstdint-for-C-types.patch
deleted file mode 100644
index defe14dc..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Current-gcc-requires-cstdint-for-C-types.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2316632e8f3eefc21bc4f9cb97be4603b4c14719 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Thu, 28 Sep 2023 12:24:04 -0600
-Subject: [PATCH] Current gcc requires cstdint for C types
-Add #include <cstdint> to resolve the issues similar to the following:
-  module/module_structs.h:259:3: note: 'uint16_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-  module/module_structs.h:260:3: error: 'uint16_t' does not name a type
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
- exe_omx/encoder/EncCmdMngr.h | 1 +
- module/module_structs.h      | 1 +
- utility/processor_fifo.h     | 1 +
- 3 files changed, 3 insertions(+)
-diff --git a/exe_omx/encoder/EncCmdMngr.h b/exe_omx/encoder/EncCmdMngr.h
-index 6dacd68..cd3d0a6 100644
--- a/exe_omx/encoder/EncCmdMngr.h
-+++ b/exe_omx/encoder/EncCmdMngr.h
-@@ -7,6 +7,7 @@
- #include <iostream>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- #include "ICommandsSender.h"
- 
-diff --git a/module/module_structs.h b/module/module_structs.h
-index 7151b86..37ff8ac 100644
--- a/module/module_structs.h
-+++ b/module/module_structs.h
-@@ -6,6 +6,7 @@
- #include "module_enums.h"
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- template<typename T>
- struct InputOutput
-diff --git a/utility/processor_fifo.h b/utility/processor_fifo.h
-index 1c62ba4..3c9cd86 100644
--- a/utility/processor_fifo.h
-+++ b/utility/processor_fifo.h
-@@ -6,6 +6,7 @@
- #include <utility/locked_queue.h>
- #include <thread>
- #include <functional>
-+#include <string>
- 
- #if defined __linux__
- #include <sys/prctl.h>
-- 
-2.34.1
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch b/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch
deleted file mode 100644
index 788edd03..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b58c0a7dd0eeb16b2251edfad3b4763ce5653ea2 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Thu, 28 Sep 2023 12:04:34 -0600
-Subject: [PATCH] Support updated gcc, add cstdint where necessary
-With the latest gcc, cstdint is now needs to be explicitly included, otherwise
-errors similar to the following will occur:
-  include/lib_app/Parser.h:413:36: error: 'uint32_t' has not been declared
-    413 | static void resetFlag(T* bitfield, uint32_t uFlag)
-        |                                    ^~~~~~~~
-  include/lib_app/Parser.h: In function 'void resetFlag(T*, int)':
-  include/lib_app/Parser.h:415:20: error: 'uint32_t' was not declared in this scope
-    415 |   *bitfield = (T)((uint32_t)*bitfield & ~uFlag);
-        |                    ^~~~~~~~
-  include/lib_app/Parser.h:18:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-     17 | #include <iomanip>
-    +++ |+#include <cstdint>
-     18 |
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
- exe_encoder/EncCmdMngr.h | 1 +
- include/lib_app/Parser.h | 1 +
- 2 files changed, 2 insertions(+)
-diff --git a/exe_encoder/EncCmdMngr.h b/exe_encoder/EncCmdMngr.h
-index 6dacd68..cd3d0a6 100644
--- a/exe_encoder/EncCmdMngr.h
-+++ b/exe_encoder/EncCmdMngr.h
-@@ -7,6 +7,7 @@
- #include <iostream>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- #include "ICommandsSender.h"
- 
-diff --git a/include/lib_app/Parser.h b/include/lib_app/Parser.h
-index efb7f94..66d5164 100644
--- a/include/lib_app/Parser.h
-+++ b/include/lib_app/Parser.h
-@@ -15,6 +15,7 @@
- #include <sstream>
- #include <vector>
- #include <iomanip>
-+#include <cstdint>
- 
- std::deque<Token> toReversePolish(std::deque<Token>& tokens);
- std::string parseString(std::deque<Token>& tokens);
-- 
-2.34.1
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules b/meta-xilinx-core/recipes-multimedia/vcu/files/99-vcu-enc-dec.rules
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_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
index ba4b9479..2d3c3a89 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
@@ -1,17 +1,18 @@
 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"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 PV .= "+git"
 S = "${WORKDIR}/git"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-BRANCH = "xlnx_rel_v2023.2"
+BRANCH = "xlnx_rel_v2024.1"
 REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "689c8d823b383e2a8a5249be49de627f866cfaf2"
+SRCREV = "91d19a16308a438596138d30d8174e148fc45584"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = " \
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2024.1.bb
index 7b320c6a..c968af52 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2024.1.bb
@@ -1,24 +1,20 @@
 SUMMARY = "Control Software for VCU"
 DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ef69c2bb405668101824f0b644631e2e"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
 # Recipe has been renamed
 PROVIDES += "libvcu-xlnx"
 PV .= "+git"
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "84b0856cad7844d69f57ac4d9447c20930875475"
+SRCREV = "940f9fa933402de6f959911c236f36add5dd3a40"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
-SRC_URI += "file://0001-Support-updated-gcc-add-cstdint-where-necessary.patch"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 S  = "${WORKDIR}/git"
 inherit features_check
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb
index becb73b7..92ef7301 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb
@@ -1,7 +1,7 @@
 SUMMARY = "OpenMAX Integration layer for VCU"
 DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ef69c2bb405668101824f0b644631e2e"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
 # Recipe has been renamed
 PROVIDES += "libomxil-xlnx"
@@ -9,15 +9,13 @@ PROVIDES += "libomxil-xlnx"
 # Version from core/core_version.mk
 PV .= "+git"
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "3a04b5adc661a0eced626c1373dbbfe699ae6fe0"
+SRCREV = "dc34204543b89997577bd2c9757b3c218e6caccc"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
-SRC_URI += "file://0001-Current-gcc-requires-cstdint-for-C-types.patch"
 S  = "${WORKDIR}/git"
 inherit features_check
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20230530-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb
index ccd58f31..f500ec36 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20230530-xilinx-v2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb
@@ -1,15 +1,15 @@
 SUMMARY = "Firmware for VCU"
 DESCRIPTION = "Firmware binaries provider for VCU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=52eb1e8f27e0e189b175c7d75f028cc6"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9bef8aa9d1eba8aca1b7dffdef500262"
 PV .= "+git"
 S  = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
 REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "f4ab98d26aa3e244a487f518f5a76071137c8402"
+SRCREV = "6ee1998c53817ab0c137b8b99089337d5caba62c"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-include-libapp-Parser.h-Add-cstdint.patch b/meta-xilinx-core/recipes-multimedia/vdu/files/0001-include-libapp-Parser.h-Add-cstdint.patch
deleted file mode 100644
index 04d59c60..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-include-libapp-Parser.h-Add-cstdint.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 79eddc5c5474c9b61bf6b2e648eba8bca61469b9 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Thu, 25 Jan 2024 12:30:24 -0700
-Subject: [PATCH] include/libapp/Parser.h: Add cstdint
-Resolves usages of unit32_t being undefined
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
- include/lib_app/Parser.h | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/include/lib_app/Parser.h b/include/lib_app/Parser.h
-index 976a835..6fa63ce 100644
--- a/include/lib_app/Parser.h
-+++ b/include/lib_app/Parser.h
-@@ -35,6 +35,7 @@
- #include <sstream>
- #include <vector>
- #include <iomanip>
-+#include <cstdint>
- 
- std::deque<Token> toReversePolish(std::deque<Token>& tokens);
- std::string parseString(std::deque<Token>& tokens);
-- 
-2.34.1
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
index 8b20baba..7f5fc367 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Linux kernel module for Video Decode Unit"
 DESCRIPTION = "Out-of-tree VDU decoder common kernel modules"
 SECTION = "kernel/modules"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 PV .= "+git"
@@ -9,13 +9,12 @@ PV .= "+git"
 S = "${WORKDIR}/git"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-BRANCH = "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
-REPO = "git://github.com/Xilinx/vdu-modules.git;protocol=https"
+REPO ?= "git://github.com/Xilinx/vdu-modules.git;protocol=https"
-SRCREV = "4d5134f54006f904f0b28f00e05dd3febd5fcfd3"
+SRCREV ?= "25773344ce1e539e7136c5a30cdee98a6cf490a8"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = " \
+SRC_URI = "${REPO};${BRANCHARG} \
-    ${REPO};${BRANCHARG} \
    file://99-vdu-enc-dec.rules \
 "
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.73-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.79-xilinx-v2024.1.bb
index a3c1fc4d..7dfaf20b 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.73-xilinx-v2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.79-xilinx-v2024.1.bb
@@ -1,20 +1,19 @@
 SUMMARY = "Control Software for VDU"
 DESCRIPTION = "Control software libraries, test applications and headers provider for VDU"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
 PV .= "+git"
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
-SRCREV ?= "1beb8f247d01b1a728faea36ce8f7847c895482f"
+SRCREV ?= "fb8730a808b707bfb86d3d64881899214a951ff6"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
+SRC_URI = "${REPO};${BRANCHARG}"
-           file://0001-include-libapp-Parser.h-Add-cstdint.patch \
-          "
-S  = "${WORKDIR}/git"
+S = "${WORKDIR}/git"
+B = "${S}"
 inherit autotools features_check
@@ -24,6 +23,9 @@ PACKAGE_ARCH = "${MACHINE_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}"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb
index df39c41f..6f09b8eb 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb
@@ -1,19 +1,19 @@
 SUMMARY = "OpenMAX Integration layer for VDU"
 DESCRIPTION = "OMX IL Libraries,test application and headers for VDU"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
-PV .= "+git"
+PV .= "+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/Xilinx/vdu-omx-il.git;protocol=https"
-SRCREV ?= "811eefac953fd5e098c69cada97a0dd35f5e9015"
+SRCREV ?= "af9c6e8935799f4dcd579b0164dd05eb039b569d"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
+SRC_URI = "${REPO};${BRANCHARG}"
-           file://0001-libvdu-omxil-Fix-missing-definitions.patch \
-          "
+S = "${WORKDIR}/git"
-S  = "${WORKDIR}/git"
+B = "${WORKDIR}/git"
 inherit autotools features_check
@@ -26,6 +26,9 @@ 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}' \
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20230127-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb
index ddc8d9dc..c4330a3c 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20230127-xilinx-v2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb
@@ -1,15 +1,16 @@
 SUMMARY = "Firmware for VDU"
 DESCRIPTION = "Firmware binaries provider for VDU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c5784f63397086d836580d8785d1deb9"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=722a9d20bf58ac06585a6d91ee36e60e"
 PV .= "+git"
-S  = "${WORKDIR}/git"
+S = "${WORKDIR}/git"
+B = "${S}"
-BRANCH ?= "xlnx_rel_v2023.2"
+BRANCH ?= "xlnx_rel_v2024.1"
 REPO ?= "git://github.com/Xilinx/vdu-firmware.git;protocol=https"
-SRCREV ?= "731897772730178f6a4e77eedeb4fb53faa1ab4d"
+SRCREV ?= "724de80630edcb87d865d69f1a6c0dc61c3f9f12"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
@@ -20,10 +21,11 @@ REQUIRED_MACHINE_FEATURES = "vdu"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-do_compile[noexec] = "1"
 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"
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_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.0.bb
new file mode 100644
index 00000000..37f32a23
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.0.bb
@@ -0,0 +1,29 @@
+SUMMARY  = "Xilinx Runtime(XRT) - minimal native build for xclbinutil"
+DESCRIPTION = "Native build of xclbinutil using XRT codebase"
+require xrt-${PV}.inc
+FILESEXTRAPATHS:append := ":${THISDIR}/xrt"
+LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = " \
+    file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
+    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
+    file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \
+"
+S = "${WORKDIR}/git/src"
+inherit cmake pkgconfig native
+DEPENDS = "libdrm-native 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-202210.2.13.479/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202210.2.13.479/xrt-cstdint.patch
new file mode 100644
index 00000000..58c3736a
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202210.2.13.479/xrt-cstdint.patch
@@ -0,0 +1,145 @@
+From e60fd92415bc849293944dd8fb7a72241df6055f Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Mon, 20 May 2024 19:38:06 -0600
+Subject: [PATCH] Add cstdint as necessary
+In GCC 13.1 usage of uint64 and similar will result in an error without
+ #include <cstdint>
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ src/runtime_src/core/common/time.h                               | 1 +
+ src/runtime_src/core/edge/common/aie_parser.h                    | 1 +
+ src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h | 1 +
+ src/runtime_src/core/edge/user/zynq_dev.h                        | 1 +
+ src/runtime_src/tools/xclbinutil/CBOR.h                          | 1 +
+ src/runtime_src/tools/xclbinutil/DTCStringsBlock.h               | 1 +
+ src/runtime_src/tools/xclbinutil/XclBinSignature.h               | 1 +
+ src/runtime_src/xdp/profile/database/events/vtf_event.h          | 1 +
+ src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h  | 1 +
+ src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h           | 1 +
+ 10 files changed, 10 insertions(+)
+diff --git a/src/runtime_src/core/common/time.h b/src/runtime_src/core/common/time.h
+index a4a96b11d..585d38756 100644
+--- a/src/runtime_src/core/common/time.h
+++ b/src/runtime_src/core/common/time.h
+@@ -19,6 +19,7 @@
+ 
+ #include "core/common/config.h"
+ #include <string>
+#include <cstdint>
+ 
+ namespace xrt_core {
+ 
+diff --git a/src/runtime_src/core/edge/common/aie_parser.h b/src/runtime_src/core/edge/common/aie_parser.h
+index 5bc32a36a..f35e97ecd 100644
+--- a/src/runtime_src/core/edge/common/aie_parser.h
+++ b/src/runtime_src/core/edge/common/aie_parser.h
+@@ -20,6 +20,7 @@
+ #include <string>
+ #include <vector>
+ #include <unordered_map>
+#include <cstdint>
+ #include "../user/aie/common_layer/adf_api_config.h"
+ 
+ namespace xrt_core {
+diff --git a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+index 196304765..36ce35e80
+--- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+@@ -18,6 +18,7 @@
+ 
+ #include <string>
+ #include <vector>
+#include <cstdint>
+ 
+ namespace adf
+ {
+diff --git a/src/runtime_src/core/edge/user/zynq_dev.h b/src/runtime_src/core/edge/user/zynq_dev.h
+index 6fe36c615..2abd7473b 100644
+--- a/src/runtime_src/core/edge/user/zynq_dev.h
+++ b/src/runtime_src/core/edge/user/zynq_dev.h
+@@ -19,6 +19,7 @@
+ #include <fstream>
+ #include <string>
+ #include <vector>
+#include <cstdint>
+ 
+ class zynq_device {
+ public:
+diff --git a/src/runtime_src/tools/xclbinutil/CBOR.h b/src/runtime_src/tools/xclbinutil/CBOR.h
+index e0f1175cd..d8c97ceb4 100644
+--- a/src/runtime_src/tools/xclbinutil/CBOR.h
+++ b/src/runtime_src/tools/xclbinutil/CBOR.h
+@@ -22,6 +22,7 @@
+ // #includes here - please keep these to a bare minimum!
+ #include <string>
+ #include <sstream>
+#include <cstdint>
+ 
+ // ------------ F O R W A R D - D E C L A R A T I O N S ----------------------
+ // Forward declarations - use these instead whenever possible...
+diff --git a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
+index 1ccd7ffc3..e20ae034a 100644
+--- a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
+++ b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
+@@ -22,6 +22,7 @@
+ // #includes here - please keep these to a bare minimum!
+ #include <string>
+ #include <sstream>
+#include <cstdint>
+ 
+ // ------------ F O R W A R D - D E C L A R A T I O N S ----------------------
+ // Forward declarations - use these instead whenever possible...
+diff --git a/src/runtime_src/tools/xclbinutil/XclBinSignature.h b/src/runtime_src/tools/xclbinutil/XclBinSignature.h
+index b19ab56a4..f1b72d4d2 100644
+--- a/src/runtime_src/tools/xclbinutil/XclBinSignature.h
+++ b/src/runtime_src/tools/xclbinutil/XclBinSignature.h
+@@ -18,6 +18,7 @@
+ #define __XclBinSignature_h_
+ 
+ #include <string>
+#include <cstdint>
+ 
+ // ----------------------- I N C L U D E S -----------------------------------
+ 
+diff --git a/src/runtime_src/xdp/profile/database/events/vtf_event.h b/src/runtime_src/xdp/profile/database/events/vtf_event.h
+index 24a755a9a..a46a43e9d 100644
+--- a/src/runtime_src/xdp/profile/database/events/vtf_event.h
+++ b/src/runtime_src/xdp/profile/database/events/vtf_event.h
+@@ -18,6 +18,7 @@
+ #define VTF_EVENT_DOT_H
+ 
+ #include <fstream>
+#include <cstdint>
+ 
+ #include "xdp/config.h"
+ 
+diff --git a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
+index f1369fe02..1f7486c7e 100644
+--- a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
+++ b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
+@@ -18,6 +18,7 @@
+ #define XDP_PROFILE_AIE_TRACE_LOGGER_H
+ 
+ #include<iostream>
+#include<cstdint>
+ 
+ namespace xdp {
+ 
+diff --git a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
+index a88597464..f392ec0e6 100644
+--- a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
+++ b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
+@@ -19,6 +19,7 @@
+ 
+ #include <fstream>
+ #include <string>
+#include <cstdint>
+ 
+ #include "xdp/config.h"
+ 
+-- 
+2.34.1
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202220.2.14.0/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202220.2.14.0/xrt-cstdint.patch
new file mode 100644
index 00000000..5546e0a4
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202220.2.14.0/xrt-cstdint.patch
@@ -0,0 +1,146 @@
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+From f97ca31fc1b9aa973a2970e9248bc19f44b6a42f Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Mon, 20 May 2024 20:32:42 -0600
+Subject: [PATCH] Add cstdint as necessary
+In GCC 13.1 usage of uint64 and similar will result in an error without
+ #include <cstdint>
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ src/runtime_src/core/common/time.h                               | 1 +
+ src/runtime_src/core/edge/common/aie_parser.h                    | 1 +
+ src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h | 1 +
+ src/runtime_src/core/edge/user/zynq_dev.h                        | 1 +
+ src/runtime_src/tools/xclbinutil/CBOR.h                          | 1 +
+ src/runtime_src/tools/xclbinutil/DTCStringsBlock.h               | 1 +
+ src/runtime_src/tools/xclbinutil/XclBinSignature.h               | 1 +
+ src/runtime_src/xdp/profile/database/events/vtf_event.h          | 1 +
+ src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h  | 1 +
+ src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h           | 1 +
+ 10 files changed, 10 insertions(+)
+diff --git a/src/runtime_src/core/common/time.h b/src/runtime_src/core/common/time.h
+index a4a96b11d..585d38756 100644
+--- a/src/runtime_src/core/common/time.h
+++ b/src/runtime_src/core/common/time.h
+@@ -19,6 +19,7 @@
+ 
+ #include "core/common/config.h"
+ #include <string>
+#include <cstdint>
+ 
+ namespace xrt_core {
+ 
+diff --git a/src/runtime_src/core/edge/common/aie_parser.h b/src/runtime_src/core/edge/common/aie_parser.h
+index 5bc32a36a..f35e97ecd 100644
+--- a/src/runtime_src/core/edge/common/aie_parser.h
+++ b/src/runtime_src/core/edge/common/aie_parser.h
+@@ -20,6 +20,7 @@
+ #include <string>
+ #include <vector>
+ #include <unordered_map>
+#include <cstdint>
+ #include "../user/aie/common_layer/adf_api_config.h"
+ 
+ namespace xrt_core {
+diff --git a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+index 196304765..36ce35e80 100755
+--- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+@@ -18,6 +18,7 @@
+ 
+ #include <string>
+ #include <vector>
+#include <cstdint>
+ 
+ namespace adf
+ {
+diff --git a/src/runtime_src/core/edge/user/zynq_dev.h b/src/runtime_src/core/edge/user/zynq_dev.h
+index 6fe36c615..2abd7473b 100644
+--- a/src/runtime_src/core/edge/user/zynq_dev.h
+++ b/src/runtime_src/core/edge/user/zynq_dev.h
+@@ -19,6 +19,7 @@
+ #include <fstream>
+ #include <string>
+ #include <vector>
+#include <cstdint>
+ 
+ class zynq_device {
+ public:
+diff --git a/src/runtime_src/tools/xclbinutil/CBOR.h b/src/runtime_src/tools/xclbinutil/CBOR.h
+index 368459f59..acbf6ebae 100644
+--- a/src/runtime_src/tools/xclbinutil/CBOR.h
+++ b/src/runtime_src/tools/xclbinutil/CBOR.h
+@@ -22,6 +22,7 @@
+ // #includes here - please keep these to a bare minimum!
+ #include <string>
+ #include <sstream>
+#include <cstdint>
+ 
+ // ------------ F O R W A R D - D E C L A R A T I O N S ----------------------
+ // Forward declarations - use these instead whenever possible...
+diff --git a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
+index 361015962..2ec16360d 100644
+--- a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
+++ b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
+@@ -20,6 +20,7 @@
+ // ----------------------- I N C L U D E S -----------------------------------
+ #include <sstream>
+ #include <string>
+#include <cstdint>
+ 
+ // ----------- C L A S S :   D T C S t r i n g s B l o c k -------------------
+ 
+diff --git a/src/runtime_src/tools/xclbinutil/XclBinSignature.h b/src/runtime_src/tools/xclbinutil/XclBinSignature.h
+index b19ab56a4..f1b72d4d2 100644
+--- a/src/runtime_src/tools/xclbinutil/XclBinSignature.h
+++ b/src/runtime_src/tools/xclbinutil/XclBinSignature.h
+@@ -18,6 +18,7 @@
+ #define __XclBinSignature_h_
+ 
+ #include <string>
+#include <cstdint>
+ 
+ // ----------------------- I N C L U D E S -----------------------------------
+ 
+diff --git a/src/runtime_src/xdp/profile/database/events/vtf_event.h b/src/runtime_src/xdp/profile/database/events/vtf_event.h
+index 24a755a9a..a46a43e9d 100644
+--- a/src/runtime_src/xdp/profile/database/events/vtf_event.h
+++ b/src/runtime_src/xdp/profile/database/events/vtf_event.h
+@@ -18,6 +18,7 @@
+ #define VTF_EVENT_DOT_H
+ 
+ #include <fstream>
+#include <cstdint>
+ 
+ #include "xdp/config.h"
+ 
+diff --git a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
+index 98c57de2e..6f67c43df 100644
+--- a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
+++ b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
+@@ -18,6 +18,7 @@
+ #define XDP_PROFILE_AIE_TRACE_LOGGER_H
+ 
+ #include<iostream>
+#include<cstdint>
+ 
+ namespace xdp {
+ 
+diff --git a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
+index a88597464..f392ec0e6 100644
+--- a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
+++ b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
+@@ -19,6 +19,7 @@
+ 
+ #include <fstream>
+ #include <string>
+#include <cstdint>
+ 
+ #include "xdp/config.h"
+ 
+-- 
+2.34.1
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc
new file mode 100644
index 00000000..852a8de2
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc
@@ -0,0 +1,13 @@
+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= "2024.1"
+SRCREV_xrt = "ec83e2a3348f3e5158f7a91821e9cf4690462681"
+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"
+SRC_URI += "git://github.com/serge1/ELFIO.git;branch=main;name=ELFIO;destsuffix=git/src/runtime_src/core/common/elf;protocol=https"
+SRCREV_ELFIO = "a04810f12625207cce72665d783babb80f0175a8"
+SRCREV_FORMAT = "xrt"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0/xrt-cstdint.patch
new file mode 100644
index 00000000..b83c5ef7
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0/xrt-cstdint.patch
@@ -0,0 +1,32 @@
+Add cstdint as necessary
+In GCC 13.1 usage of uint64 and similar will result in an error without
+ #include <cstdint>
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+Index: src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+===================================================================
+--- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+@@ -18,6 +18,7 @@
+ 
+ #include <string>
+ #include <vector>
+#include <cstdint>
+ 
+ namespace adf
+ {
+Index: src/runtime_src/core/edge/user/zynq_dev.h
+===================================================================
+--- a/src/runtime_src/core/edge/user/zynq_dev.h
+++ b/src/runtime_src/core/edge/user/zynq_dev.h
+@@ -19,6 +19,7 @@
+ #include <fstream>
+ #include <string>
+ #include <vector>
+#include <cstdint>
+ 
+ class zynq_device {
+ public:
+ 
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
index 7a06a51c..c42e9a65 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
@@ -3,6 +3,8 @@ DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
 require xrt-${PV}.inc
+SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
 LICENSE = "GPL-2.0-or-later & Apache-2.0"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \
                    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
index 402d4ed2..cc5a9ed5 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
@@ -3,6 +3,8 @@ DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
 require xrt-${PV}.inc
+SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
 LICENSE = "GPL-2.0-or-later & Apache-2.0"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \
                    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb
new file mode 100644
index 00000000..d84d3b85
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb
@@ -0,0 +1,57 @@
+SUMMARY  = "Xilinx Runtime(XRT) libraries"
+DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
+require xrt-${PV}.inc
+SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
+LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
+                    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
+                    file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 "
+COMPATIBLE_MACHINE ?= "^$"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
+S = "${WORKDIR}/git/src"
+inherit cmake pkgconfig
+BBCLASSEXTEND = "native nativesdk"
+# util-linux is for libuuid-dev.
+DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson systemtap libdfx"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})"
+EXTRA_OECMAKE += " \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_EXPORT_COMPILE_COMANDS=ON \
+                -DXRT_LIBDFX=true \
+                "
+# Systems with AIE also require libmetal, this is implemented in the dynamic-layers
+# See: meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt_gt.bbappend
+# Note: If meta-openamp is not available, AIE will not be enabled.
+FILES_SOLIBSDEV = ""
+FILES:${PN} += "\
+    ${libdir}/lib*.so \
+    ${libdir}/lib*.so.* \
+    ${libdir}/ps_kernels_lib \
+    /lib/*.so* \
+    ${datadir}"
+INSANE_SKIP:${PN} += "dev-so"
+pkg_postinst_ontarget:${PN}() {
+  #!/bin/sh
+  if [ ! -e /etc/OpenCL/vendors/xilinx.icd ]; then
+        echo "INFO: Creating ICD entry for Xilinx Platform"
+        mkdir -p /etc/OpenCL/vendors
+        echo "libxilinxopencl.so" > /etc/OpenCL/vendors/xilinx.icd
+        chmod -R 755 /etc/OpenCL
+  fi
+}
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb
new file mode 100644
index 00000000..b91572f9
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb
@@ -0,0 +1,27 @@
+SUMMARY  = "Xilinx Runtime(XRT) driver module"
+DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
+COMPATIBLE_MACHINE:microblaze = "none"
+PROVIDES += "zocl"
+require recipes-xrt/xrt/xrt-${PV}.inc
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
+LICENSE = "GPL-2.0-or-later & Apache-2.0"
+COMPATIBLE_MACHINE ?= "^$"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
+S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+inherit module
+pkg_postinst_ontarget:${PN}() {
+  #!/bin/sh
+  echo "Unloading old XRT Linux kernel modules"
+  ( rmmod zocl || true ) > /dev/null 2>&1
+  echo "Loading new XRT Linux kernel modules"
+  modprobe zocl
+}