115 files changed, 832 insertions, 2039 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 5f2b17b7..f0a233cf 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -29,7 +29,7 @@ LAYERSERIES_COMPAT_xilinx = "scarthgap"
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
  *->xrt \
-  *->zocl \
+  *->kernel-module-zocl \
  *->cairo \
  *->libepoxy \
  *->gstreamer1.0-plugins-base \
@@ -46,13 +46,6 @@ XILINX_RELEASE_VERSION ??= "v2024.1"
 BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION"
-XILINX_QEMU_VERSION[v2024.1] = "v8.1.0-xilinx-v2024.1%"
-PREFERRED_VERSION_qemu ?= "${@ '8.1%' if not (d.getVar('XILINX_RELEASE_VERSION') or 'undefined').startswith('v2024') else '8.1%'}"
-PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'v8.1%'}"
-PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'v8.1%'}"
-PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'v8.1%'}"
-PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-v2024.1%"
 DEFAULT_XILINX_QEMU = "qemu-xilinx"
 DEFAULT_XILINX_QEMU:arm = "qemu"
 PREFERRED_PROVIDER_qemu ?= "${DEFAULT_XILINX_QEMU}"
@@ -64,47 +57,22 @@ 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:v2021.01-xilinx-v2022.1%"
+XILINX_UBOOT_VERSION[v2022.1] = "1:2021.01-xilinx-v2022.1%"
-XILINX_UBOOT_VERSION[v2022.2] = "1:v2022.01-xilinx-v2022.2%"
+XILINX_UBOOT_VERSION[v2022.2] = "1:2022.01-xilinx-v2022.2%"
-XILINX_UBOOT_VERSION[v2023.1] = "1:v2023.01-xilinx-v2023.1%"
+XILINX_UBOOT_VERSION[v2023.1] = "1:2023.01-xilinx-v2023.1%"
-XILINX_UBOOT_VERSION[v2023.2] = "1:v2023.01-xilinx-v2023.2%"
+XILINX_UBOOT_VERSION[v2023.2] = "1:2023.01-xilinx-v2023.2%"
-XILINX_UBOOT_VERSION[v2024.1] = "1:v2024.01-xilinx-v2024.1%"
+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'}"
-XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%"
+XILINX_LINUX_VERSION[v2022.1] = "5.15.19%"
-XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%"
+XILINX_LINUX_VERSION[v2022.2] = "5.15.36%"
-XILINX_LINUX_VERSION[v2023.1] = "6.1.30-xilinx-v2023.1%"
+XILINX_LINUX_VERSION[v2023.1] = "6.1.30%"
-XILINX_LINUX_VERSION[v2023.2] = "6.1.60-xilinx-v2023.2%"
+XILINX_LINUX_VERSION[v2023.2] = "6.1.60%"
-XILINX_LINUX_VERSION[v2024.1] = "6.6.10-xilinx-v2024.1%"
+XILINX_LINUX_VERSION[v2024.1] = "6.6.10%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-# Mali needs to match the kernel version
-PREFERRED_VERSION_kernel-module-mali = "r9p0-01rel0-${XILINX_RELEASE_VERSION}"
-# DP kernel module
-KERNEL_MODULE_DP_VERSION[v2022.1] = "5.10.0+xilinx-v2022.1+git%"
-KERNEL_MODULE_DP_VERSION[v2022.2] = "5.10.0+xilinx-v2022.2+git%"
-KERNEL_MODULE_DP_VERSION[v2023.1] = "6.1.0+xilinx-v2023.1+git%"
-KERNEL_MODULE_DP_VERSION[v2023.2] = "6.1.0+xilinx-v2023.2+git%"
-KERNEL_MODULE_DP_VERSION[v2024.1] = "6.1.0+xilinx-v2024.1+git%"
-PREFERRED_VERSION_kernel-module-dp ?= "${@d.getVarFlag('KERNEL_MODULE_DP_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-# HDMI kernel module
-KERNEL_MODULE_HDMI_VERSION[v2022.1] = "5.15.0+xilinx-v2022.1+git%"
-KERNEL_MODULE_HDMI_VERSION[v2022.2] = "5.15.19+xilinx-v2022.2+git%"
-KERNEL_MODULE_HDMI_VERSION[v2023.1] = "6.1+xilinx-v2023.1+git%"
-KERNEL_MODULE_HDMI_VERSION[v2023.2] = "6.1+xilinx-v2023.2+git%"
-KERNEL_MODULE_HDMI_VERSION[v2024.1] = "6.1+xilinx-v2024.1+git%"
-PREFERRED_VERSION_kernel-module-hdmi ?= "${@d.getVarFlag('KERNEL_MODULE_HDMI_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-# VCU kernel module
-PREFERRED_VERSION_kernel-module-vcu = "1.0.0-xilinx-${XILINX_RELEASE_VERSION}+git%"
-# VDU kernel module
-PREFERRED_VERSION_kernel-module-vdu = "1.0.0-xilinx-${XILINX_RELEASE_VERSION}+git%"
 # XRT/ZOCL
 XRT_ZOCL_VERSION[v2022.1] = "202210.2.13.479"
 XRT_ZOCL_VERSION[v2022.2] = "202220.2.14.0"
@@ -112,7 +80,7 @@ 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_zocl ?= "${@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'}"
 # AI-Engine
 AIEFAL_VERSION[v2022.1] = "1.4"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb
index b33d5064..a03912d7 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2024.1.bb
@@ -2,7 +2,7 @@ SRCBRANCH ?= "2024"
 SRCREV = "e2fdb4fecbebe41b4cd1c0b4fbfa3496bcded485"
 BRANCH = "xlnx_rel_v2024.1"
 LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
-PV = "${SRCBRANCH}+git${SRCPV}"
+PV = "${SRCBRANCH}+git"
 REPO = "git://github.com/Xilinx/libmetal.git;protocol=https"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
index c1fda947..94535abc 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
@@ -2,7 +2,7 @@ SRCBRANCH ?= "2024"
 SRCREV = "dbf0857389190f4c4cedfb77bd1f9bdd7ab404f3"
 BRANCH = "xlnx_rel_v2024.1"
 LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
-PV = "${SRCBRANCH}+git${SRCPV}"
+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
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_8.1%.bbappend
index 74aa15fb..74aa15fb 100644
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-devtools/qemu/qemu-xilinx_8.1%.bbappend
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
index 9249060c..df97c3cf 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
@@ -14,9 +14,7 @@ B = "${WORKDIR}/build"
 SYSROOT_DIRS += "/boot"
-ATF_VERSION ?= "2.2"
+PV .= "+git"
-ATF_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}"
-PV = "${ATF_VERSION}${ATF_VERSION_EXTENSION}+git${SRCPV}"
 BRANCH ?= ""
 REPO ?= "git://github.com/Xilinx/arm-trusted-firmware.git;protocol=https"
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2024.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.10-xilinx-v2024.1.bb
index fee8e069..fee8e069 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2024.1.bb
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.10-xilinx-v2024.1.bb
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.1.bb
index f02bb879..348ad757 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.1.bb
@@ -1,4 +1,3 @@
-ATF_VERSION = "2.6"
 SRCREV = "67ca59c67f542322554d78820bf9ddaa736d6a84"
 BRANCH = "xlnx_rebase_v2.6"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.2.bb
index 5ef2e6ac..365bbbc5 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.2.bb
@@ -1,4 +1,3 @@
-ATF_VERSION = "2.6"
 SRCREV = "0897efd45ccad29a3dbab610578c70e3a52b2caa"
 BRANCH = "xlnx_rebase_v2.6"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.1.bb
index 2bcbe7d4..0246e2ff 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.1.bb
@@ -1,4 +1,3 @@
-ATF_VERSION = "2.8"
 SRCREV = "c9b71dc96f3f18ca94cad590612aae3224c8c84d"
 BRANCH = "xlnx_rebase_v2.8"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.2.bb
index 6ebd6cb5..e160f57c 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.2.bb
@@ -1,4 +1,3 @@
-ATF_VERSION = "2.8"
 SRCREV = "6be857cb66300fb21e3f61308e4197911c8ac30d"
 BRANCH = "xlnx_rebase_v2.8"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
diff --git a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb
deleted file mode 100644
index fdf28f41..00000000
--- a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Building and installing bootgen"
-DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stitch binary files together and generate device boot images"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1"
-S = "${WORKDIR}/git"
-DEPENDS += "openssl"
-RDEPENDS:${PN} += "openssl"
-REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
-BRANCH ?= "xlnx_rel_v2022.2"
-SRCREV = "cf4ba93b99644dc4429ef633471a639e1382f0e7"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-EXTRA_OEMAKE += 'CROSS_COMPILER="${CXX}" -C ${S}'
-CXXFLAGS:append = " -std=c++0x"
-TARGET_CC_ARCH += "${LDFLAGS}"
-do_install() {
-    install -d ${D}${bindir}
-    install -Dm 0755 ${S}/bootgen ${D}${bindir}
-}
-FILES:${PN} = "${bindir}/bootgen"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2023.1.bb b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2023.1.bb
deleted file mode 100644
index a934230d..00000000
--- a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2023.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Building and installing bootgen"
-DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stitch binary files together and generate device boot images"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1"
-S = "${WORKDIR}/git"
-DEPENDS += "openssl"
-RDEPENDS:${PN} += "openssl"
-REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
-BRANCH = "xlnx_rel_v2023.1"
-SRCREV = "4f1e1caf2c09cdeacc35cbeedaf2550c6e44c7fd"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-EXTRA_OEMAKE += 'CROSS_COMPILER="${CXX}" -C ${S}'
-CXXFLAGS:append = " -std=c++0x"
-TARGET_CC_ARCH += "${LDFLAGS}"
-do_install() {
-    install -d ${D}${bindir}
-    install -Dm 0755 ${S}/bootgen ${D}${bindir}
-}
-FILES:${PN} = "${bindir}/bootgen"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2023.2.bb b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2023.2.bb
deleted file mode 100644
index 03f323e1..00000000
--- a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2023.2.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Building and installing bootgen"
-DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stitch binary files together and generate device boot images"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1"
-S = "${WORKDIR}/git"
-DEPENDS += "openssl"
-RDEPENDS:${PN} += "openssl"
-REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
-BRANCH = "xlnx_rel_v2023.2"
-SRCREV = "8e6702bb5064b806e45028486de7376962470a36"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-EXTRA_OEMAKE += 'CROSS_COMPILER="${CXX}" -C ${S}'
-CXXFLAGS:append = " -std=c++0x"
-TARGET_CC_ARCH += "${LDFLAGS}"
-do_install() {
-    install -d ${D}${bindir}
-    install -Dm 0755 ${S}/bootgen ${D}${bindir}
-}
-FILES:${PN} = "${bindir}/bootgen"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
index b4de4fe6..1d4ab5a3 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
@@ -22,7 +22,7 @@ S = "${WORKDIR}/git"
 inherit cmake update-rc.d systemd
-DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm"
+DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm"
 RDEPENDS:${PN} += " fru-print"
 EXTRA_OECMAKE += " \
               -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
index a4149d39..b15fff74 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
@@ -22,7 +22,7 @@ S = "${WORKDIR}/git"
 inherit cmake update-rc.d systemd
-DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm"
+DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm"
 RDEPENDS:${PN} += " freeipmi"
 EXTRA_OECMAKE += " \
               -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
index d09ab51e..60096e33 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
@@ -22,7 +22,7 @@ S = "${WORKDIR}/git"
 inherit cmake update-rc.d systemd
-DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm systemd"
+DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm systemd"
 RDEPENDS:${PN} += " freeipmi"
 EXTRA_OECMAKE += " \
               -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2021.01-xilinx-v2022.1.bb
index 94369955..94369955 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2021.01-xilinx-v2022.1.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.01-xilinx-v2022.2.bb
index 6b033f0f..6b033f0f 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.01-xilinx-v2022.2.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.1.bb
index fe5ecf79..fe5ecf79 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.1.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.2.bb
index 43fec635..43fec635 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.2.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.1.bb
index 590d1755..590d1755 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2024.01-xilinx-v2024.1.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc
index a0c0b50d..69c7a639 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc
@@ -1,5 +1,3 @@
-UBOOT_VERSION = "v2021.01"
 UBRANCH ?= "xlnx_rebase_v2022.01_2022.1_update"
 SRCREV = "91ad7924e7f59584d597353e1bb86794341e0a7e"
@@ -15,3 +13,5 @@ HAS_PLATFORM_INIT ?= " \
                "
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2021.01:"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc
index f9b8f52b..d111ae99 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc
@@ -1,5 +1,3 @@
-UBOOT_VERSION = "v2022.01"
 UBRANCH ?= "xlnx_rebase_v2022.01"
 SRCREV = "b31476685debf5512ed0d4e8000fa5167a22f530"
@@ -15,3 +13,5 @@ HAS_PLATFORM_INIT ?= " \
                "
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2022.01:"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
index 72f43f71..1fd191f0 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
@@ -1,5 +1,3 @@
-UBOOT_VERSION = "v2023.01"
 UBRANCH = "xlnx_rebase_v2023.01_update"
 SRCREV = "1689570b68dd3827e527a520805aa0bb7f58ee09"
@@ -15,3 +13,5 @@ HAS_PLATFORM_INIT ?= " \
                "
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2023.01:"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
index 2e761ebe..86ba82bb 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
@@ -1,5 +1,3 @@
-UBOOT_VERSION = "v2023.01"
 UBRANCH = "xlnx_rebase_v2023.01"
 SRCREV = "2b54ad6f1d278c419b927d10db2edf323d844578"
@@ -18,6 +16,8 @@ DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
 SRC_URI:append:microblaze = " file://microblaze-generic-top.h"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2023.01:"
 do_configure:prepend:microblaze () {
    install ${WORKDIR}/microblaze-generic-top.h ${S}/include/configs/
 }
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
index 7844468c..425bb029 100644
--- 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
@@ -1,5 +1,3 @@
-UBOOT_VERSION = "v2024.01"
 UBRANCH = "xlnx_rebase_v2024.01"
 SRCREV = "fbed1010e50d75e7d25acc1c2d09e1c34cb7e882"
@@ -15,3 +13,5 @@ HAS_PLATFORM_INIT ?= " \
                "
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2024.01:"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc
index b447c92a..765af276 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc
@@ -1,6 +1,4 @@
-# Use the name of the .bb for the extension
+PV .= "+git"
-UBOOT_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}"
-PV = "${UBOOT_VERSION}${UBOOT_VERSION_EXTENSION}+git${SRCPV}"
 UBOOTURI ?= "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https"
 UBRANCH ?= ""
@@ -11,8 +9,6 @@ SRC_URI = "${UBOOTURI};${UBRANCHARG}"
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
-FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-${UBOOT_VERSION}:"
 UBOOT_MB_INC = ""
 UBOOT_MB_INC:microblaze = "u-boot-xlnx-microblaze.inc"
 require ${UBOOT_MB_INC}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-dev.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
index c0005bc5..31cb420d 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
@@ -15,5 +15,5 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce
 SRCREV_DEFAULT = "aebea9d20a5aa32857f320c07ca8f9fd1b3dec1f"
 SRCREV ?= "${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/bootloader", "u-boot-xlnx-dev", "${AUTOREV}", "${SRCREV_DEFAULT}", d)}"
-PV = "${UBRANCH}-xilinx-dev+git${SRCPV}"
+PV = "${UBRANCH}-xilinx-dev+git"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.01-xilinx-v2022.1.bb
index c1c45e56..c1c45e56 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.01-xilinx-v2022.1.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.01-xilinx-v2022.2.bb
index b10f321b..b10f321b 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.01-xilinx-v2022.2.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.1.bb
index fd76bc51..fd76bc51 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.1.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.2.bb
index 22075424..22075424 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.2.bb
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.1.bb
index 718ad9d4..718ad9d4 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2024.01-xilinx-v2024.1.bb
diff --git a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2024.1.bb b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.1.bb
index 3c68f10d..3c68f10d 100644
--- a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2024.1.bb
+++ b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.1.bb
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
index b08b414f..3e56e349 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
@@ -7,7 +7,7 @@ inherit deploy
 LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912cb1dee68d6c68d99"
-PV = "xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+PV .= "+git"
 REPO ?= "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc
deleted file mode 100644
index d48350b2..00000000
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-XILINX_QEMU_VERSION = "v8.1.0"
-BRANCH = "xlnx_rel_v2024.1"
-SRCREV = "2319c870e754148ec3b9d40be0d3dbee959c3251"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
index ad2af244..179903c5 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
@@ -8,12 +8,15 @@ COMPATIBLE_HOST:arm = "null"
 # x86_64 is needed to build nativesdks
 QEMU_TARGETS = "aarch64 arm microblaze microblazeel riscv32 x86_64"
+BRANCH = "xlnx_rel_v2024.1"
+SRCREV = "2319c870e754148ec3b9d40be0d3dbee959c3251"
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                    file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
 FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-8.1.0:"
-PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+PV .= "+git"
 REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_8.1.0.bb
index 5ffdeb98..49ffbe6e 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_8.1.0.bb
@@ -2,7 +2,6 @@ BPN = "qemu-xilinx"
 DEPENDS += "glib-2.0-native zlib-native"
-require qemu-xilinx-2024.1.inc
 require qemu-xilinx-native-8.1.inc
 require qemu-native-alt.inc
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb
index 7e985088..0e3bfc84 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb
@@ -1,7 +1,6 @@
 BPN = "qemu-xilinx"
 require qemu-system-native-alt.inc
-require qemu-xilinx-2024.1.inc
 require qemu-xilinx-native-8.1.inc
 # As some of the files installed by qemu-native and qemu-system-native
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_8.1.0.bb
index cff60bd6..50d9922f 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_8.1.0.bb
@@ -1,6 +1,5 @@
 BBCLASSEXTEND = "nativesdk"
-require qemu-xilinx-2024.1.inc
 require qemu-8.1.inc
 require qemu-xilinx-8.1.inc
 require qemu-alt.inc
diff --git a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb
index 82c411a2..7f5fba0b 100644
--- a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
+++ b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb
@@ -17,7 +17,6 @@ BRANCH ?= "xlnx_rel_v2024.1"
 SRCREV ?= "b3a772aad859cdadc8513b11c3e995546c20e75e"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-PV = "r9p0-01rel0"
 SRC_URI = " \
    ${REPO};${BRANCHARG} \
    file://egl.pc \
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch
index f3bcd4f1..eb5406f4 100644
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch
@@ -23,7 +23,7 @@ index fcdcaac..72e28a8 100644
 #include "mali_memory_virtual.h"
 #include "mali_pp_job.h"
 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 15, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
 +MODULE_IMPORT_NS(DMA_BUF);
 +#endif
 +
@@ -38,7 +38,7 @@ index 7de3920..5bf08f8 100644
        dma_set_attr(DMA_ATTR_WRITE_COMBINE, &dma_attrs_wc);
 #endif
 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 15, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
 +       register_shrinker(&mali_mem_os_allocator.shrinker, "mali");
 +#else
        register_shrinker(&mali_mem_os_allocator.shrinker);
@@ -55,7 +55,7 @@ index cebd1c8..a9d932f 100644
 #endif
 #include <linux/dma-buf.h>
 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 15, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
 +MODULE_IMPORT_NS(DMA_BUF);
 +#endif
 +
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb
deleted file mode 100644
index 56431a7f..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-SUMMARY = "A Mali 400 Linux Kernel module"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = " \
-        file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \
-        "
-MALI_VERSION = "r9p0-01rel0"
-PV =. "${MALI_VERSION}-v"
-SRC_URI = " \
-        https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \
-        file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \
-        file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \
-        file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \
-        file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \
-        file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \
-        file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \
-        file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \
-        file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\
-        file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\
-        file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\
-        file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\
-        file://0015-fix-driver-failed-to-check-map-error.patch \
-        file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \
-        file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \
-        file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \
-        file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \
-        file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \
-        file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \
-        file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \
-        file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \
-        file://0024-Use-community-device-tree-names.patch \
-        file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \
-        file://0026-Fix-gpu-driver-probe-failure.patch \
-        file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \
-        "
-SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
-SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
-inherit features_check module
-PARALLEL_MAKE = "-j 1"
-S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali"
-REQUIRED_MACHINE_FEATURES = "mali400"
-EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \
-                ARCH="${ARCH}" \
-                BUILD=release \
-                MALI_PLATFORM="arm" \
-                USING_DT=1 \
-                MALI_SHARED_INTERRUPTS=1 \
-                CROSS_COMPILE="${TARGET_PREFIX}" \
-                MALI_QUIET=1 \
-                '
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.2.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.2.bb
deleted file mode 100644
index e8e46543..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.2.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-SUMMARY = "A Mali 400 Linux Kernel module"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = " \
-        file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \
-        "
-MALI_VERSION = "r9p0-01rel0"
-PV =. "${MALI_VERSION}-v"
-SRC_URI = " \
-        https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \
-        file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \
-        file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \
-        file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \
-        file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \
-        file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \
-        file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \
-        file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \
-        file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\
-        file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\
-        file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\
-        file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\
-        file://0015-fix-driver-failed-to-check-map-error.patch \
-        file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \
-        file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \
-        file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \
-        file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \
-        file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \
-        file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \
-        file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \
-        file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \
-        "
-SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
-SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
-inherit features_check module
-PARALLEL_MAKE = "-j 1"
-S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali"
-REQUIRED_MACHINE_FEATURES = "mali400"
-EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \
-                ARCH="${ARCH}" \
-                BUILD=release \
-                MALI_PLATFORM="arm" \
-                USING_DT=1 \
-                MALI_SHARED_INTERRUPTS=1 \
-                CROSS_COMPILE="${TARGET_PREFIX}" \
-                MALI_QUIET=1 \
-                '
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.1.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.1.bb
deleted file mode 100644
index 56431a7f..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.1.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-SUMMARY = "A Mali 400 Linux Kernel module"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = " \
-        file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \
-        "
-MALI_VERSION = "r9p0-01rel0"
-PV =. "${MALI_VERSION}-v"
-SRC_URI = " \
-        https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \
-        file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \
-        file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \
-        file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \
-        file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \
-        file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \
-        file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \
-        file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \
-        file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\
-        file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\
-        file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\
-        file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\
-        file://0015-fix-driver-failed-to-check-map-error.patch \
-        file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \
-        file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \
-        file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \
-        file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \
-        file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \
-        file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \
-        file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \
-        file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \
-        file://0024-Use-community-device-tree-names.patch \
-        file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \
-        file://0026-Fix-gpu-driver-probe-failure.patch \
-        file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \
-        "
-SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
-SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
-inherit features_check module
-PARALLEL_MAKE = "-j 1"
-S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali"
-REQUIRED_MACHINE_FEATURES = "mali400"
-EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \
-                ARCH="${ARCH}" \
-                BUILD=release \
-                MALI_PLATFORM="arm" \
-                USING_DT=1 \
-                MALI_SHARED_INTERRUPTS=1 \
-                CROSS_COMPILE="${TARGET_PREFIX}" \
-                MALI_QUIET=1 \
-                '
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.2.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.2.bb
deleted file mode 100644
index 56431a7f..00000000
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.2.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-SUMMARY = "A Mali 400 Linux Kernel module"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = " \
-        file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \
-        "
-MALI_VERSION = "r9p0-01rel0"
-PV =. "${MALI_VERSION}-v"
-SRC_URI = " \
-        https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \
-        file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \
-        file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \
-        file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \
-        file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \
-        file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \
-        file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \
-        file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \
-        file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\
-        file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\
-        file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\
-        file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\
-        file://0015-fix-driver-failed-to-check-map-error.patch \
-        file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \
-        file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \
-        file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \
-        file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \
-        file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \
-        file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \
-        file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \
-        file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \
-        file://0024-Use-community-device-tree-names.patch \
-        file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \
-        file://0026-Fix-gpu-driver-probe-failure.patch \
-        file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \
-        "
-SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
-SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
-inherit features_check module
-PARALLEL_MAKE = "-j 1"
-S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali"
-REQUIRED_MACHINE_FEATURES = "mali400"
-EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \
-                ARCH="${ARCH}" \
-                BUILD=release \
-                MALI_PLATFORM="arm" \
-                USING_DT=1 \
-                MALI_SHARED_INTERRUPTS=1 \
-                CROSS_COMPILE="${TARGET_PREFIX}" \
-                MALI_QUIET=1 \
-                '
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2024.1.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb
index 72bd7759..c25970e7 100644
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2024.1.bb
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb
@@ -6,11 +6,8 @@ LIC_FILES_CHKSUM = " \
        file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \
        "
-MALI_VERSION = "r9p0-01rel0"
-PV =. "${MALI_VERSION}-v"
 SRC_URI = " \
-        https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \
+        https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${PV}.tgz \
        file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \
        file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \
        file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \
@@ -45,7 +42,7 @@ inherit features_check module
 PARALLEL_MAKE = "-j 1"
-S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali"
+S = "${WORKDIR}/DX910-SW-99002-${PV}/driver/src/devicedrv/mali"
 REQUIRED_MACHINE_FEATURES = "mali400"
diff --git a/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch b/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch
new file mode 100644
index 00000000..dde59936
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch
@@ -0,0 +1,343 @@
+From adc957ce85d431da42dc42ed4074322d6c94932f Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Thu, 16 May 2024 20:31:29 -0600
+Subject: [PATCH] Support both pre 6.4.0 and current i2c probing
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ dp/xfmc/dp141.c                          | 13 +++++++++++++
+ dp/xfmc/fmc.c                            | 13 +++++++++++++
+ dp/xfmc/fmc64.c                          | 14 ++++++++++++++
+ dp/xfmc/fmc65.c                          | 13 +++++++++++++
+ dp/xfmc/idt.c                            | 21 +++++++++++++++++----
+ dp/xfmc/mcdp6000.c                       | 13 +++++++++++++
+ dp/xfmc/tipower.c                        | 13 +++++++++++++
+ 7 files changed, 96 insertions(+), 4 deletions(-)
+diff --git a/dp/xfmc/dp141.c b/dp/xfmc/dp141.c
+index dfdb6f4..5fddd2b
+--- a/dp/xfmc/dp141.c
+++ b/dp/xfmc/dp141.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
+#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -105,7 +106,12 @@ static const struct i2c_device_id dp141_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, dp141_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int dp141_probe(struct i2c_client *client)
+#else
+static int dp141_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -134,9 +140,16 @@ err_regmap:
+        return ret;
+ }
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void dp141_remove(struct i2c_client *client)
+ {
+ }
+#else
+static int dp141_remove(struct i2c_client *client)
+{
+       return 0;
+}
+#endif
+ 
+ static struct i2c_driver dp141_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/fmc.c b/dp/xfmc/fmc.c
+index 3447785..2ed136c
+--- a/dp/xfmc/fmc.c
+++ b/dp/xfmc/fmc.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
+#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -93,7 +94,12 @@ static const struct i2c_device_id fmc_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc_probe(struct i2c_client *client)
+#else
+static int fmc_probe(struct i2c_client *client,
+                    const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -121,9 +127,16 @@ err_regmap:
+        return ret;
+ }
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void fmc_remove(struct i2c_client *client)
+ {
+ }
+#else
+static int fmc_remove(struct i2c_client *client)
+{
+       return 0;
+}
+#endif
+ 
+ static struct i2c_driver fmc_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/fmc64.c b/dp/xfmc/fmc64.c
+index 6f5562c..a0bad7a
+--- a/dp/xfmc/fmc64.c
+++ b/dp/xfmc/fmc64.c
+@@ -14,6 +14,8 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
+#include <linux/version.h>
+
+ /**************************** Type Definitions *******************************/
+ static const struct regmap_config fmc64_regmap_config = {
+        .reg_bits = 16,
+@@ -89,7 +91,12 @@ static const struct i2c_device_id fmc64_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc64_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc64_probe(struct i2c_client *client)
+#else
+static int fmc64_probe(struct i2c_client *client,
+                      const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -118,9 +125,16 @@ err_regmap:
+        return ret;
+ }
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void fmc64_remove(struct i2c_client *client)
+ {
+ }
+#else
+static int fmc64_remove(struct i2c_client *client)
+{
+       return 0;
+}
+#endif
+ 
+ static struct i2c_driver fmc64_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/fmc65.c b/dp/xfmc/fmc65.c
+index 9f091f9..ce7f884
+--- a/dp/xfmc/fmc65.c
+++ b/dp/xfmc/fmc65.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
+#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -91,7 +92,12 @@ static const struct i2c_device_id fmc65_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc65_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc65_probe(struct i2c_client *client)
+#else
+static int fmc65_probe(struct i2c_client *client,
+                      const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -120,9 +126,16 @@ err_regmap:
+        return ret;
+ }
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void fmc65_remove(struct i2c_client *client)
+ {
+ }
+#else
+static int fmc65_remove(struct i2c_client *client)
+{
+       return 0;
+}
+#endif
+ 
+ static struct i2c_driver fmc65_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/idt.c b/dp/xfmc/idt.c
+index 348c863..f332277
+--- a/dp/xfmc/idt.c
+++ b/dp/xfmc/idt.c
+@@ -17,6 +17,7 @@
+ #include <linux/of_gpio.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
+#include <linux/version.h>
+ 
+ #define IDT_8T49N24X_REVID 0x0    /**< Device Revision */
+ #define IDT_8T49N24X_DEVID 0x0607 /**< Device ID Code */
+@@ -38,8 +39,8 @@
+ #define IDT_8T49N24X_P_MAX pow(2, 22)  //!< Maximum P divider value
+ #define IDT_8T49N24X_M_MAX pow(2, 24)  //!< Maximum M multiplier value
+ 
+-#define TRUE 1
+-#define FALSE 0
+#define IDT_TRUE 1
+#define IDT_FALSE 0
+ #define XPAR_IIC_0_BASEADDR 0xA0080000
+ #define I2C_IDT8N49_ADDR 0x7C
+ /*
+@@ -455,7 +456,7 @@ int IDT_8T49N24x_Init(void)
+        int ret = 0;
+ 
+        msleep_range(30);
+-       ret = idt_enable(FALSE);
+       ret = idt_enable(IDT_FALSE);
+        if (ret)
+                dev_dbg(&idt->client->dev,
+                        "IDT_8T49N24x_enable 0  I2C progmming failed\n");
+@@ -468,7 +469,7 @@ int IDT_8T49N24x_Init(void)
+ 
+        msleep_range(30);
+        /* enable DPLL and APLL calibration. */
+-       ret = idt_enable(TRUE);
+       ret = idt_enable(IDT_TRUE);
+        if (ret)
+                dev_dbg(&idt->client->dev,
+                        "IDT_8T49N24x_enable 1 I2C progmming failed\n");
+@@ -489,7 +490,12 @@ static const struct i2c_device_id idt_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, idt_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int idt_probe(struct i2c_client *client)
+#else
+static int idt_probe(struct i2c_client *client,
+                    const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -517,9 +523,16 @@ err_regmap:
+        return ret;
+ }
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void idt_remove(struct i2c_client *client)
+ {
+ }
+#else
+static int idt_remove(struct i2c_client *client)
+{
+       return 0;
+}
+#endif
+ 
+ static struct i2c_driver idt_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/mcdp6000.c b/dp/xfmc/mcdp6000.c
+index 5a7c5b2..f13979b
+--- a/dp/xfmc/mcdp6000.c
+++ b/dp/xfmc/mcdp6000.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
+#include <linux/version.h>
+ 
+ #define SWAP_BYTES(u32Value) ((u32Value & 0x000000FF) << 24)\
+ |((u32Value & 0x0000FF00) << 8) \
+@@ -363,7 +364,12 @@ static const struct i2c_device_id mcdp6000_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, mcdp6000_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int mcdp6000_probe(struct i2c_client *client)
+#else
+static int mcdp6000_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -393,9 +399,16 @@ err_regmap:
+        return ret;
+ }
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void mcdp6000_remove(struct i2c_client *client)
+ {
+ }
+#else
+static int mcdp6000_remove(struct i2c_client *client)
+{
+       return 0;
+}
+#endif
+ 
+ static struct i2c_driver mcdp6000_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/tipower.c b/dp/xfmc/tipower.c
+index 46c3de1..6d247a8
+--- a/dp/xfmc/tipower.c
+++ b/dp/xfmc/tipower.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
+#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -131,7 +132,12 @@ static const struct i2c_device_id tipower_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, tipower_id);
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int tipower_probe(struct i2c_client *client)
+#else
+static int tipower_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+#endif
+ {
+        int ret;
+ 
+@@ -162,9 +168,16 @@ err_regmap:
+        return ret;
+ }
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void tipower_remove(struct i2c_client *client)
+ {
+ }
+#else
+static int tipower_remove(struct i2c_client *client)
+{
+       return 0;
+}
+#endif
+ 
+ static struct i2c_driver tipower_i2c_driver = {
+        .driver = {
+-- 
+2.34.1
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.1.bb
deleted file mode 100755
index 31c810ba..00000000
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx DisplayPort Linux Kernel module"
-DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XLNX_DP_VERSION = "5.10.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" 
-S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2022.1"
-REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "9a025fdb7134a8af12de8d69f5a428c8284ae9b3"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-inherit module
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb
deleted file mode 100644
index dda6ec31..00000000
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx DisplayPort Linux Kernel module"
-DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XLNX_DP_VERSION = "5.10.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" 
-S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "c57b2ce95ee6c86f35caecbc7007644ff8f6d337"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-inherit module
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb
deleted file mode 100644
index 28770994..00000000
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx DisplayPort Linux Kernel module"
-DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XLNX_DP_VERSION = "6.1.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "5b0969ac09f301c33bccc140c8f60e832f5cf222"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-inherit module
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.2.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.2.bb
deleted file mode 100644
index d1c6bd3d..00000000
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx DisplayPort Linux Kernel module"
-DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XLNX_DP_VERSION = "6.1.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "5b0969ac09f301c33bccc140c8f60e832f5cf222"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-inherit module
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2024.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
index 503cee02..3aaac030 100644
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2024.1.bb
+++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
@@ -4,8 +4,7 @@ SECTION = "kernel/modules"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XLNX_DP_VERSION = "6.1.0"
+PV .= "+git"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
 S = "${WORKDIR}/git"
@@ -16,6 +15,8 @@ SRCREV ?= "e20942b256e6fb18eaef919c7441f65ad8afcf43"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
+SRC_URI += "file://0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch"
 inherit module
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
diff --git a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch b/meta-xilinx-core/recipes-kernel/dtc/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
deleted file mode 100644
index cf4739eb..00000000
--- a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Wed, 19 Jan 2022 12:46:42 -0500
-Subject: [PATCH] Revert "libfdt: overlay: make overlay_get_target() public"
-This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb.
---
- libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++-------
- libfdt/libfdt.h      | 18 ------------------
- libfdt/version.lds   |  1 -
- 3 files changed, 22 insertions(+), 26 deletions(-)
-diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
-index 5c0c398..d217e79 100644
--- a/libfdt/fdt_overlay.c
-+++ b/libfdt/fdt_overlay.c
-@@ -40,22 +40,37 @@ static uint32_t overlay_get_target_phandle(const void *fdto, int fragment)
-        return fdt32_to_cpu(*val);
- }
- 
-int fdt_overlay_target_offset(const void *fdt, const void *fdto,
-                             int fragment_offset, char const **pathp)
-+/**
-+ * overlay_get_target - retrieves the offset of a fragment's target
-+ * @fdt: Base device tree blob
-+ * @fdto: Device tree overlay blob
-+ * @fragment: node offset of the fragment in the overlay
-+ * @pathp: pointer which receives the path of the target (or NULL)
-+ *
-+ * overlay_get_target() retrieves the target offset in the base
-+ * device tree of a fragment, no matter how the actual targeting is
-+ * done (through a phandle or a path)
-+ *
-+ * returns:
-+ *      the targeted node offset in the base device tree
-+ *      Negative error code on error
-+ */
-+static int overlay_get_target(const void *fdt, const void *fdto,
-+                             int fragment, char const **pathp)
- {
-        uint32_t phandle;
-        const char *path = NULL;
-        int path_len = 0, ret;
- 
-        /* Try first to do a phandle based lookup */
-       phandle = overlay_get_target_phandle(fdto, fragment_offset);
-+       phandle = overlay_get_target_phandle(fdto, fragment);
-        if (phandle == (uint32_t)-1)
-                return -FDT_ERR_BADPHANDLE;
- 
-        /* no phandle, try path */
-        if (!phandle) {
-                /* And then a path based lookup */
-               path = fdt_getprop(fdto, fragment_offset, "target-path", &path_len);
-+               path = fdt_getprop(fdto, fragment, "target-path", &path_len);
-                if (path)
-                        ret = fdt_path_offset(fdt, path);
-                else
-@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto)
-                if (overlay < 0)
-                        return overlay;
- 
-               target = fdt_overlay_target_offset(fdt, fdto, fragment, NULL);
-+               target = overlay_get_target(fdt, fdto, fragment, NULL);
-                if (target < 0)
-                        return target;
- 
-@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
-                        return -FDT_ERR_BADOVERLAY;
- 
-                /* get the target of the fragment */
-               ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path);
-+               ret = overlay_get_target(fdt, fdto, fragment, &target_path);
-                if (ret < 0)
-                        return ret;
-                target = ret;
-@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
- 
-                if (!target_path) {
-                        /* again in case setprop_placeholder changed it */
-                       ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path);
-+                       ret = overlay_get_target(fdt, fdto, fragment, &target_path);
-                        if (ret < 0)
-                                return ret;
-                        target = ret;
-diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
-index a7f432c..7f117e8 100644
--- a/libfdt/libfdt.h
-+++ b/libfdt/libfdt.h
-@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
-  */
- int fdt_overlay_apply(void *fdt, void *fdto);
- 
-/**
- * fdt_overlay_target_offset - retrieves the offset of a fragment's target
- * @fdt: Base device tree blob
- * @fdto: Device tree overlay blob
- * @fragment_offset: node offset of the fragment in the overlay
- * @pathp: pointer which receives the path of the target (or NULL)
- *
- * fdt_overlay_target_offset() retrieves the target offset in the base
- * device tree of a fragment, no matter how the actual targeting is
- * done (through a phandle or a path)
- *
- * returns:
- *      the targeted node offset in the base device tree
- *      Negative error code on error
- */
-int fdt_overlay_target_offset(const void *fdt, const void *fdto,
-                             int fragment_offset, char const **pathp);
-
- /**********************************************************************/
- /* Debugging / informational functions                                */
- /**********************************************************************/
-diff --git a/libfdt/version.lds b/libfdt/version.lds
-index cbce5d4..7ab85f1 100644
--- a/libfdt/version.lds
-+++ b/libfdt/version.lds
-@@ -77,7 +77,6 @@ LIBFDT_1.2 {
-                fdt_appendprop_addrrange;
-                fdt_setprop_inplace_namelen_partial;
-                fdt_create_with_flags;
-               fdt_overlay_target_offset;
-        local:
-                *;
- };
-- 
-2.19.1
diff --git a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.1.bb
deleted file mode 100644
index a868bd01..00000000
--- a/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Python Library for the Device Tree Compiler"
-HOMEPAGE = "https://devicetree.org/"
-DESCRIPTION = "A python library for the Device Tree Compiler, a tool used to manipulate Device Tree files which contain a data structure for describing hardware."
-SECTION = "bootloader"
-LICENSE = "GPL-2.0-only | BSD-2-Clause"
-DEPENDS = "flex-native bison-native swig-native python3-setuptools-scm-native libyaml dtc"
-SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \
-           file://0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch \
-          "
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
-LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90"
-SRCREV = "c001fc01a43e7a06447c06ea3d50bd60641322b8"
-PV = "1.6.1+git${SRCPV}"
-S = "${WORKDIR}/git"
-PYPA_WHEEL = "${S}/dist/libfdt-1.6.2*.whl"
-inherit setuptools3 pkgconfig
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch b/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch
new file mode 100644
index 00000000..9bdbfc94
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch
@@ -0,0 +1,82 @@
+From e1352e6872edc2b521ad44eb776ce093553192e3 Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Fri, 17 May 2024 10:44:37 -0600
+Subject: [PATCH] Support both pre 6.4.0 and current kernels
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ hdmi/xilinx_drm_hdmi.c |  3 +++
+ misc/dp159.c           | 14 ++++++++++++++
+ 2 files changed, 17 insertions(+)
+diff --git a/hdmi/xilinx_drm_hdmi.c b/hdmi/xilinx_drm_hdmi.c
+index 104fc3d..6ebbdca 100644
+--- a/hdmi/xilinx_drm_hdmi.c
+++ b/hdmi/xilinx_drm_hdmi.c
+@@ -17,6 +17,7 @@
+  * GNU General Public License for more details.
+  */
+ 
+#include <linux/version.h>
+ #include <drm/drm_atomic_helper.h>
+ #include <drm/drm_connector.h>
+ #include <drm/drm_crtc.h>
+@@ -27,7 +28,9 @@
+ #include <drm/drm_of.h>
+ #include <drm/drm_probe_helper.h>
+ #include <drm/drm_sysfs.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ #include <drm/display/drm_hdmi_helper.h>
+#endif
+ 
+ #include <linux/clk.h>
+ #include <linux/delay.h>
+diff --git a/misc/dp159.c b/misc/dp159.c
+index 73e886f..d2c60d9 100644
+--- a/misc/dp159.c
+++ b/misc/dp159.c
+@@ -28,6 +28,7 @@
+ #include <linux/of.h>
+ #include <linux/of.h>
+ #include <linux/clk-provider.h>
+#include <linux/version.h>
+ 
+ MODULE_DESCRIPTION("i2c device driver for dp159 redriver and retimer");
+ MODULE_AUTHOR("Leon Woestenberg");
+@@ -133,7 +134,12 @@ struct clk_ops clk_tx_rate_ops = {
+        .round_rate             = &clk_tx_round_rate,
+ };
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int dp159_probe(struct i2c_client *client)
+#else
+static int dp159_probe(struct i2c_client *client,
+                      const struct i2c_device_id *id)
+#endif
+ {
+        struct clk_tx_linerate *clk_tx;
+        struct clk *clk;
+@@ -191,12 +197,20 @@ static int dp159_probe(struct i2c_client *client)
+        return 0;
+ }
+ 
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void dp159_remove(struct i2c_client *client)
+#else
+static int dp159_remove(struct i2c_client *client)
+#endif
+ {
+        struct clk_tx_linerate *clk_tx;
+        clk_tx = (struct clk_tx_linerate *)i2c_get_clientdata(client);
+        if (clk_tx)
+                clk_unregister(clk_tx->clk);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)
+       return 0;
+#endif
+ }
+ 
+ static const struct i2c_device_id dp159_id[] = {
+-- 
+2.34.1
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.bb
deleted file mode 100644
index ea649bc4..00000000
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx HDMI Linux Kernel module"
-DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
-XLNX_HDMI_VERSION = "5.15.0"
-PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2022.1"
-REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
-SRCREV = "25b6fe7a26a975be15c002b48cfd4c291486491e"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-inherit module
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb
deleted file mode 100644
index c1f66013..00000000
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx HDMI Linux Kernel module"
-DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
-XLNX_HDMI_VERSION = "5.15.19"
-PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
-SRCREV = "25b6fe7a26a975be15c002b48cfd4c291486491e"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-inherit module
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb
deleted file mode 100644
index 20acb8b3..00000000
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx HDMI Linux Kernel module"
-DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
-XLNX_HDMI_VERSION = "6.1"
-PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
-SRCREV = "1c6330f02fea68992e22400fdbc8c0d0e63e2958"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-inherit module
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb
deleted file mode 100644
index bc89f5f3..00000000
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx HDMI Linux Kernel module"
-DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
-XLNX_HDMI_VERSION = "6.1"
-PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
-SRCREV = "82209b0021a7b5d7ef71a859eed4bafeb541ed08"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-inherit module
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb
index 73a22d30..7e25fe1f 100644
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb
@@ -4,8 +4,7 @@ SECTION = "kernel/modules"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
-XLNX_HDMI_VERSION = "6.1"
+PV .= "+git"
-PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
 S = "${WORKDIR}/git"
@@ -16,6 +15,8 @@ SRCREV = "edd297762e0bac3f4c5b64ef67244968e22020e2"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
+SRC_URI += "file://0001-Support-both-pre-6.4.0-and-current-kernels.patch"
 inherit module
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
index 2355d090..897fbb1c 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
@@ -1,6 +1,6 @@
 # This version extension should match CONFIG_LOCALVERSION in defconfig
-LINUX_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}"
+LINUX_VERSION_EXTENSION ?= "-xilinx"
-PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}"
+PV = "${LINUX_VERSION}+git"
 # Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits
 KBRANCH ?= "undefined"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.1.bb
index 41c1ffe2..41c1ffe2 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.1.bb
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.2.bb
index 260224b8..260224b8 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.2.bb
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.1.bb
index d229f21c..d229f21c 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.1.bb
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.2.bb
index ec5827e6..ec5827e6 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.2.bb
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.10-v2024.1.bb
index 71ac690e..71ac690e 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.6.10-v2024.1.bb
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/kernel-module-vcu_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb
deleted file mode 100644
index 7ef1d5fd..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Linux kernel module for Video Code Unit"
-DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S = "${WORKDIR}/git"
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-BRANCH = "xlnx_rel_v2022.1"
-REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "9d2657550eccebccce08cacfcdd369367b9f6be4"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = " \
-    ${REPO};${BRANCHARG} \
-    file://99-vcu-enc-dec.rules \
-    "
-inherit module features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-RDEPENDS:${PN} = "vcu-firmware"
-KERNEL_MODULE_AUTOLOAD += "dmaproxy"
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb
deleted file mode 100644
index b1c96d3c..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Linux kernel module for Video Code Unit"
-DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S = "${WORKDIR}/git"
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-BRANCH = "xlnx_rel_v2022.2"
-REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "b131e220285e06658b6ab27f9e19b1c592a55f3a"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = " \
-    ${REPO};${BRANCHARG} \
-    file://99-vcu-enc-dec.rules \
-    "
-inherit module features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-RDEPENDS:${PN} = "vcu-firmware"
-KERNEL_MODULE_AUTOLOAD += "dmaproxy"
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb
deleted file mode 100644
index 9adfcade..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Linux kernel module for Video Code Unit"
-DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S = "${WORKDIR}/git"
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-BRANCH = "xlnx_rel_v2023.1"
-REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "4afe0ab4eb3b7f2d17bcb823dee0caa0f03ab7a0"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = " \
-    ${REPO};${BRANCHARG} \
-    file://99-vcu-enc-dec.rules \
-    "
-inherit module features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-RDEPENDS:${PN} = "vcu-firmware"
-KERNEL_MODULE_AUTOLOAD += "dmaproxy"
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
deleted file mode 100644
index e8bd3397..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Linux kernel module for Video Code Unit"
-DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S = "${WORKDIR}/git"
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-BRANCH = "xlnx_rel_v2023.2"
-REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "689c8d823b383e2a8a5249be49de627f866cfaf2"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = " \
-    ${REPO};${BRANCHARG} \
-    file://99-vcu-enc-dec.rules \
-    "
-inherit module features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-RDEPENDS:${PN} = "vcu-firmware"
-KERNEL_MODULE_AUTOLOAD += "dmaproxy"
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
index 3a6e3721..2d3c3a89 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
@@ -4,8 +4,7 @@ SECTION = "kernel/modules"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XILINX_VCU_VERSION = "1.0.0"
+PV .= "+git"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
 S = "${WORKDIR}/git"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb
deleted file mode 100644
index 47c521c4..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2022.1"
-REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "b3308c608be7ed9250b9c6732f6e0a02b1a2e985"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-S  = "${WORKDIR}/git"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-    install -Dm 0755 ${S}/bin/omx_decoder ${D}/${bindir}/omx_decoder
-    install -Dm 0755 ${S}/bin/omx_encoder ${D}/${bindir}/omx_encoder
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb
deleted file mode 100644
index c5b956bc..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "6752f5da88a8783f689ae762065295b89902d6d4"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-S  = "${WORKDIR}/git"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-    install -Dm 0755 ${S}/bin/omx_decoder ${D}/${bindir}/omx_decoder
-    install -Dm 0755 ${S}/bin/omx_encoder ${D}/${bindir}/omx_encoder
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb
deleted file mode 100644
index 75a05fed..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5375796c5ae4ee85ea1f2c1603e58509"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "4773b372b72b88ccbabc122b023f042fb22a019e"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-SRC_URI += "file://0001-Current-gcc-requires-cstdint-for-C-types.patch"
-S  = "${WORKDIR}/git"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-    install -Dm 0755 ${S}/bin/omx_decoder ${D}/${bindir}/omx_decoder
-    install -Dm 0755 ${S}/bin/omx_encoder ${D}/${bindir}/omx_encoder
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb
deleted file mode 100644
index 0c215605..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ef69c2bb405668101824f0b644631e2e"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "3a04b5adc661a0eced626c1373dbbfe699ae6fe0"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-SRC_URI += "file://0001-Current-gcc-requires-cstdint-for-C-types.patch"
-S  = "${WORKDIR}/git"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-    oe_runmake install INSTALL_PATH=${D}${bindir}
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2024.1.bb
index e3f656b0..c968af52 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2024.1.bb
@@ -3,8 +3,10 @@ DESCRIPTION = "Control software libraries, test applications and headers provide
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
-XILINX_VCU_VERSION = "1.0.0"
+# Recipe has been renamed
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+PROVIDES += "libvcu-xlnx"
+PV .= "+git"
 BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
@@ -19,6 +21,8 @@ inherit features_check
 REQUIRED_MACHINE_FEATURES = "vcu"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 RDEPENDS:${PN} = "kernel-module-vcu"
 EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb
index 14226aa7..92ef7301 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb
@@ -3,8 +3,11 @@ DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
-XILINX_VCU_VERSION = "1.0.0"
+# Recipe has been renamed
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+PROVIDES += "libomxil-xlnx"
+# Version from core/core_version.mk
+PV .= "+git"
 BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
@@ -21,8 +24,8 @@ REQUIRED_MACHINE_FEATURES = "vcu"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-DEPENDS = "libvcu-xlnx"
+DEPENDS = "libvcu-ctrlsw"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
+RDEPENDS:${PN} = "kernel-module-vcu libvcu-ctrlsw"
 EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb
deleted file mode 100644
index 71e6e572..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2022.1"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "5bf158af204b181f00ac009c8745557642ecfe5f"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-S  = "${WORKDIR}/git"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-RDEPENDS:${PN} = "kernel-module-vcu"
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-    install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder
-    install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb
deleted file mode 100644
index 130d79bc..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "3c59dede1923a159a8db736ce0b4ab55633a2114"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-S  = "${WORKDIR}/git"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-RDEPENDS:${PN} = "kernel-module-vcu"
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-    install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder
-    install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb
deleted file mode 100644
index 53a03f45..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5375796c5ae4ee85ea1f2c1603e58509"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "83aabb84c26667f7d6aee632654c63e504838061"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-SRC_URI += "file://0001-Support-updated-gcc-add-cstdint-where-necessary.patch"
-S  = "${WORKDIR}/git"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-RDEPENDS:${PN} = "kernel-module-vcu"
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-    install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder
-    install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb
deleted file mode 100644
index a2c7d98c..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ef69c2bb405668101824f0b644631e2e"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "84b0856cad7844d69f57ac4d9447c20930875475"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-SRC_URI += "file://0001-Support-updated-gcc-add-cstdint-where-necessary.patch"
-S  = "${WORKDIR}/git"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-RDEPENDS:${PN} = "kernel-module-vcu"
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include INSTALL_PATH=${D}/${bindir}
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.1.bb
deleted file mode 100644
index c5c2b045..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Firmware for VCU"
-DESCRIPTION = "Firmware binaries provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=63b45903a9a50120df488435f03cf498"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S  = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2022.1"
-REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "569f980527fd58f43baf16bd0b294bf8c7cdf963"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-do_install() {
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}/lib/firmware/al5d_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}/lib/firmware/al5d.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}/lib/firmware/al5e_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}/lib/firmware/al5e.fw
-}
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "/lib/firmware/*"
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb
deleted file mode 100644
index 594a94c3..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Firmware for VCU"
-DESCRIPTION = "Firmware binaries provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=63b45903a9a50120df488435f03cf498"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S  = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "3980c778d71fa51a15e89bf70fd8fb28d5cb12e0"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-do_install() {
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}/lib/firmware/al5d_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}/lib/firmware/al5d.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}/lib/firmware/al5e_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}/lib/firmware/al5e.fw
-}
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "/lib/firmware/*"
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb
deleted file mode 100644
index a90d307f..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Firmware for VCU"
-DESCRIPTION = "Firmware binaries provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6da65299754e921b31f03e9b11d77a74"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S  = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "c90288595ac9a12ff401de6dfa680b1f9adce5f6"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-do_install() {
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}${nonarch_base_libdir}/firmware/al5d_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}${nonarch_base_libdir}/firmware/al5d.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}${nonarch_base_libdir}/firmware/al5e_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}${nonarch_base_libdir}/firmware/al5e.fw
-}
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb
deleted file mode 100644
index 73fc2201..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Firmware for VCU"
-DESCRIPTION = "Firmware binaries provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=52eb1e8f27e0e189b175c7d75f028cc6"
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-S  = "${WORKDIR}/git"
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "f4ab98d26aa3e244a487f518f5a76071137c8402"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "vcu"
-do_install() {
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}${nonarch_base_libdir}/firmware/al5d_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}${nonarch_base_libdir}/firmware/al5d.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}${nonarch_base_libdir}/firmware/al5e_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}${nonarch_base_libdir}/firmware/al5e.fw
-}
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb
index 1031f892..f500ec36 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "Firmware binaries provider for VCU"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9bef8aa9d1eba8aca1b7dffdef500262"
-XILINX_VCU_VERSION = "1.0.0"
+PV .= "+git"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
 S  = "${WORKDIR}/git"
@@ -19,11 +18,15 @@ inherit features_check
 REQUIRED_MACHINE_FEATURES = "vcu"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+do_compile[noexec] = "1"
 do_install() {
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}${nonarch_base_libdir}/firmware/al5d_b.fw
+    install -Dm 0644 ${S}/1.0.0/lib/firmware/al5d_b.fw ${D}${nonarch_base_libdir}/firmware/al5d_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d.fw ${D}${nonarch_base_libdir}/firmware/al5d.fw
+    install -Dm 0644 ${S}/1.0.0/lib/firmware/al5d.fw ${D}${nonarch_base_libdir}/firmware/al5d.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e_b.fw ${D}${nonarch_base_libdir}/firmware/al5e_b.fw
+    install -Dm 0644 ${S}/1.0.0/lib/firmware/al5e_b.fw ${D}${nonarch_base_libdir}/firmware/al5e_b.fw
-    install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5e.fw ${D}${nonarch_base_libdir}/firmware/al5e.fw
+    install -Dm 0644 ${S}/1.0.0/lib/firmware/al5e.fw ${D}${nonarch_base_libdir}/firmware/al5e.fw
 }
 # Inhibit warnings about files being stripped
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-include-libapp-Parser.h-Add-cstdint.patch b/meta-xilinx-core/recipes-multimedia/vdu/files/0001-include-libapp-Parser.h-Add-cstdint.patch
deleted file mode 100644
index 04d59c60..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-include-libapp-Parser.h-Add-cstdint.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 79eddc5c5474c9b61bf6b2e648eba8bca61469b9 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Thu, 25 Jan 2024 12:30:24 -0700
-Subject: [PATCH] include/libapp/Parser.h: Add cstdint
-Resolves usages of unit32_t being undefined
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
- include/lib_app/Parser.h | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/include/lib_app/Parser.h b/include/lib_app/Parser.h
-index 976a835..6fa63ce 100644
--- a/include/lib_app/Parser.h
-+++ b/include/lib_app/Parser.h
-@@ -35,6 +35,7 @@
- #include <sstream>
- #include <vector>
- #include <iomanip>
-+#include <cstdint>
- 
- std::deque<Token> toReversePolish(std::deque<Token>& tokens);
- std::string parseString(std::deque<Token>& tokens);
-- 
-2.34.1
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch b/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch
deleted file mode 100644
index db23ed00..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7fc63cdd6642ea84b78db62fccafc460af0ff23e Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Thu, 25 Jan 2024 12:50:18 -0700
-Subject: [PATCH] Fix missing definitions
-Fix issues such as:
-| module/module_structs.h:370:3: error: 'uint8_t' does not name a type
-|   370 |   uint8_t distributionMaxrgbPercentages[MAX_MAXRGB_PERCENTILES_ST2094_40];
-|       |   ^~~~~~~
-| module/module_structs.h:370:3: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-| module/module_structs.h:371:3: error: 'uint32_t' does not name a type
-|   371 |   uint32_t distributionMaxrgbPercentiles[MAX_MAXRGB_PERCENTILES_ST2094_40];
-|       |   ^~~~~~~~
-| module/module_structs.h:371:3: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-and
-| ./utility/processor_fifo.h:80:15: error: field 'name_' has incomplete type 'std::string' {aka 'std::__cxx11::basic_string<char>'}
-|    80 |   std::string name_;
-|       |               ^~~~~
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
- module/module_structs.h  | 1 +
- utility/processor_fifo.h | 1 +
- 2 files changed, 2 insertions(+)
-diff --git a/module/module_structs.h b/module/module_structs.h
-index 75bdff6..594076f 100644
--- a/module/module_structs.h
-+++ b/module/module_structs.h
-@@ -27,6 +27,7 @@
- #include "module_enums.h"
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- template<typename T>
- struct InputOutput
-diff --git a/utility/processor_fifo.h b/utility/processor_fifo.h
-index e0dd47c..f047267 100644
--- a/utility/processor_fifo.h
-+++ b/utility/processor_fifo.h
-@@ -27,6 +27,7 @@
- #include <utility/locked_queue.h>
- #include <thread>
- #include <functional>
-+#include <string>
- 
- #if defined __linux__
- #include <sys/prctl.h>
-- 
-2.34.1
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb
deleted file mode 100644
index df943bc6..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Linux kernel module for Video Decode Unit"
-DESCRIPTION = "Out-of-tree VDU decoder common kernel modules"
-SECTION = "kernel/modules"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-S = "${WORKDIR}/git"
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO ?= "git://github.com/Xilinx/vdu-modules.git;protocol=https"
-SRCREV ?= "82d06e395c93a1e941b83cccbb6f2e4e6d966f1c"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-        file://99-vdu-enc-dec.rules \
-"
-inherit module features_check
-REQUIRED_MACHINE_FEATURES = "vdu"
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-RDEPENDS:${PN} = "vdu-firmware"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
deleted file mode 100644
index 6856ec3a..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Linux kernel module for Video Decode Unit"
-DESCRIPTION = "Out-of-tree VDU decoder common kernel modules"
-SECTION = "kernel/modules"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-S = "${WORKDIR}/git"
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO ?= "git://github.com/Xilinx/vdu-modules.git;protocol=https"
-SRCREV ?= "4d5134f54006f904f0b28f00e05dd3febd5fcfd3"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-        file://99-vdu-enc-dec.rules \
-"
-inherit module features_check
-REQUIRED_MACHINE_FEATURES = "vdu"
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-RDEPENDS:${PN} = "vdu-firmware"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-do_install:append() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
-}
-FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
index 63936e2e..7f5fc367 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
@@ -4,9 +4,7 @@ SECTION = "kernel/modules"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-XILINX_VDU_VERSION = "1.0.0"
+PV .= "+git"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
 S = "${WORKDIR}/git"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
@@ -17,7 +15,7 @@ SRCREV ?= "25773344ce1e539e7136c5a30cdee98a6cf490a8"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG} \
-        file://99-vdu-enc-dec.rules \
+    file://99-vdu-enc-dec.rules \
 "
 inherit module features_check
@@ -28,8 +26,6 @@ EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 RDEPENDS:${PN} = "vdu-firmware"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 do_install:append() {
    install -d ${D}${sysconfdir}/udev/rules.d
    install -m 0644 ${WORKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.79-xilinx-v2024.1.bb
index 88ddb885..7dfaf20b 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.79-xilinx-v2024.1.bb
@@ -3,13 +3,7 @@ DESCRIPTION = "Control software libraries, test applications and headers provide
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
-XILINX_VDU_VERSION = "1.0.0"
+PV .= "+git"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-inherit autotools features_check
-REQUIRED_MACHINE_FEATURES = "vdu"
 BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
@@ -18,9 +12,14 @@ SRCREV ?= "fb8730a808b707bfb86d3d64881899214a951ff6"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
-S  = "${WORKDIR}/git"
+S = "${WORKDIR}/git"
+B = "${S}"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+inherit autotools features_check
+REQUIRED_MACHINE_FEATURES = "vdu"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 RDEPENDS:${PN} = "kernel-module-vdu"
@@ -39,3 +38,6 @@ do_install:append() {
 # explicitly depends upon them.
 EXCLUDE_FROM_WORLD = "1"
+# Disable buildpaths QA check warnings.
+INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb
deleted file mode 100644
index c553d99b..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.1.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SUMMARY = "Control Software for VDU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VDU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-inherit autotools features_check
-REQUIRED_MACHINE_FEATURES = "vdu"
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
-SRCREV ?= "06fc18b303b40d4fee7549ad162c22ee1bc31582"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-           file://0001-include-libapp-Parser.h-Add-cstdint.patch \
-          "
-S  = "${WORKDIR}/git"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-RDEPENDS:${PN} = "kernel-module-vdu"
-do_compile[dirs] = "${S}"
-do_install[dirs] = "${S}"
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-EXTRA_OEMAKE +=" INSTALL_HDR_PATH=${D}${includedir}/vdu-ctrl-sw/include INSTALL_PATH=${D}${bindir}"
-do_install:append() {
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb
deleted file mode 100644
index 5c47a81e..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2023.2.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SUMMARY = "Control Software for VDU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VDU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-inherit autotools features_check
-REQUIRED_MACHINE_FEATURES = "vdu"
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
-SRCREV ?= "1beb8f247d01b1a728faea36ce8f7847c895482f"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-           file://0001-include-libapp-Parser.h-Add-cstdint.patch \
-          "
-S  = "${WORKDIR}/git"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-RDEPENDS:${PN} = "kernel-module-vdu"
-do_compile[dirs] = "${S}"
-do_install[dirs] = "${S}"
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-EXTRA_OEMAKE +=" INSTALL_HDR_PATH=${D}${includedir}/vdu-ctrl-sw/include INSTALL_PATH=${D}${bindir}"
-do_install:append() {
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb
index 5ba604f8..6f09b8eb 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb
@@ -3,8 +3,6 @@ DESCRIPTION = "OMX IL Libraries,test application and headers for VDU"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=002a0a92906100955ea6ed02dcd2c2cd"
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
 PV .= "+git${SRCPV}"
 BRANCH ?= "xlnx_rel_v2024.1"
@@ -12,15 +10,16 @@ REPO   ?= "git://github.com/Xilinx/vdu-omx-il.git;protocol=https"
 SRCREV ?= "af9c6e8935799f4dcd579b0164dd05eb039b569d"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
+SRC_URI = "${REPO};${BRANCHARG}"
-          "
-S  = "${WORKDIR}/git"
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/git"
 inherit autotools features_check
 REQUIRED_MACHINE_FEATURES = "vdu"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS = "libvdu-ctrlsw"
 RDEPENDS:${PN} = "kernel-module-vdu libvdu-ctrlsw"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb
deleted file mode 100644
index f501212d..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VDU"
-DESCRIPTION = "OMX IL Libraries,test application and headers for VDU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/vdu-omx-il.git;protocol=https"
-SRCREV ?= "811eefac953fd5e098c69cada97a0dd35f5e9015"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-           file://0001-libvdu-omxil-Fix-missing-definitions.patch \
-          "
-S  = "${WORKDIR}/git"
-inherit autotools features_check
-REQUIRED_MACHINE_FEATURES = "vdu"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-DEPENDS = "libvdu-ctrlsw"
-RDEPENDS:${PN} = "kernel-module-vdu libvdu-ctrlsw"
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vdu-ctrl-sw/include"
-do_compile[dirs] = "${S}"
-do_install[dirs] = "${S}"
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    INSTALL_PATH=${D}${bindir} \
-    INCLUDE_INST_PATH=${D}${includedir} \
-    "
-do_install:append() {
-    install -d ${D}${libdir}
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb
deleted file mode 100644
index fe66c20c..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VDU"
-DESCRIPTION = "OMX IL Libraries,test application and headers for VDU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/Xilinx/vdu-omx-il.git;protocol=https"
-SRCREV ?= "811eefac953fd5e098c69cada97a0dd35f5e9015"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-           file://0001-libvdu-omxil-Fix-missing-definitions.patch \
-          "
-S  = "${WORKDIR}/git"
-inherit autotools features_check
-REQUIRED_MACHINE_FEATURES = "vdu"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-DEPENDS = "libvdu-ctrlsw"
-RDEPENDS:${PN} = "kernel-module-vdu libvdu-ctrlsw"
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vdu-ctrl-sw/include"
-do_compile[dirs] = "${S}"
-do_install[dirs] = "${S}"
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    INSTALL_PATH=${D}${bindir} \
-    INCLUDE_INST_PATH=${D}${includedir} \
-    "
-do_install:append() {
-    install -d ${D}${libdir}
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-}
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
deleted file mode 100644
index bdb4a7be..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Firmware for VDU"
-DESCRIPTION = "Firmware binaries provider for VDU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c5784f63397086d836580d8785d1deb9"
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-S  = "${WORKDIR}/git"
-inherit autotools features_check
-REQUIRED_MACHINE_FEATURES = "vdu"
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO ?= "git://github.com/Xilinx/vdu-firmware.git;protocol=https"
-SRCREV ?= "63fe2fce6e46d5bf03e33300a58a37d8568722ee"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
-do_compile[noexec] = "1"
-do_install[dirs] = "${S}"
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
deleted file mode 100644
index b60b66c2..00000000
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Firmware for VDU"
-DESCRIPTION = "Firmware binaries provider for VDU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c5784f63397086d836580d8785d1deb9"
-XILINX_VDU_VERSION = "1.0.0"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-S  = "${WORKDIR}/git"
-inherit autotools features_check
-REQUIRED_MACHINE_FEATURES = "vdu"
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO ?= "git://github.com/Xilinx/vdu-firmware.git;protocol=https"
-SRCREV ?= "731897772730178f6a4e77eedeb4fb53faa1ab4d"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI   = "${REPO};${BRANCHARG}"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
-do_compile[noexec] = "1"
-do_install[dirs] = "${S}"
-# Inhibit warnings about files being stripped
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb
index 86f977b4..c4330a3c 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb
@@ -3,15 +3,10 @@ DESCRIPTION = "Firmware binaries provider for VDU"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=722a9d20bf58ac06585a6d91ee36e60e"
-XILINX_VDU_VERSION = "1.0.0"
+PV .= "+git"
-PV =. "${XILINX_VDU_VERSION}-xilinx-v"
-PV .= "+git${SRCPV}"
-S  = "${WORKDIR}/git"
+S = "${WORKDIR}/git"
+B = "${S}"
-inherit autotools features_check
-REQUIRED_MACHINE_FEATURES = "vdu"
 BRANCH ?= "xlnx_rel_v2024.1"
 REPO ?= "git://github.com/Xilinx/vdu-firmware.git;protocol=https"
@@ -20,7 +15,12 @@ SRCREV ?= "724de80630edcb87d865d69f1a6c0dc61c3f9f12"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+inherit autotools features_check
+REQUIRED_MACHINE_FEATURES = "vdu"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
 do_compile[noexec] = "1"
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_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
index 64702022..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 \
@@ -19,7 +21,7 @@ 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"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})"
 EXTRA_OECMAKE += " \
                -DCMAKE_BUILD_TYPE=Release \
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 5f6e0034..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 \
@@ -18,7 +20,7 @@ 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"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})"
 EXTRA_OECMAKE += " \
                -DCMAKE_BUILD_TYPE=Release \
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
index cad8ccee..6d7d1257 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
@@ -24,7 +24,7 @@ BBCLASSEXTEND = "native nativesdk"
 # util-linux is for libuuid-dev.
 DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})"
 EXTRA_OECMAKE += " \
                -DCMAKE_BUILD_TYPE=Release \
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
index 5824ae9c..a780684f 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
@@ -25,7 +25,7 @@ BBCLASSEXTEND = "native nativesdk"
 # util-linux is for libuuid-dev.
 DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})"
 EXTRA_OECMAKE += " \
                -DCMAKE_BUILD_TYPE=Release \
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
index 7f211e6f..d84d3b85 100644
--- 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
@@ -25,7 +25,7 @@ BBCLASSEXTEND = "native nativesdk"
 # util-linux is for libuuid-dev.
 DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson systemtap libdfx"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})"
 EXTRA_OECMAKE += " \
                -DCMAKE_BUILD_TYPE=Release \
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb
index 7063178a..a7c7e540 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb
@@ -1,6 +1,7 @@
 SUMMARY  = "Xilinx Runtime(XRT) driver module"
 DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
+PROVIDES += "zocl"
 require recipes-xrt/xrt/xrt-${PV}.inc
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb
index 39e9f9fb..8676639a 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb
@@ -3,6 +3,8 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 COMPATIBLE_MACHINE:microblaze = "none"
+PROVIDES += "zocl"
 require recipes-xrt/xrt/xrt-${PV}.inc
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb
index 24f69aec..b91572f9 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb
@@ -3,6 +3,8 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 COMPATIBLE_MACHINE:microblaze = "none"
+PROVIDES += "zocl"
 require recipes-xrt/xrt/xrt-${PV}.inc
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb
index 24f69aec..b91572f9 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb
@@ -3,6 +3,8 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 COMPATIBLE_MACHINE:microblaze = "none"
+PROVIDES += "zocl"
 require recipes-xrt/xrt/xrt-${PV}.inc
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb
index 24f69aec..b91572f9 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb
@@ -3,6 +3,8 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 COMPATIBLE_MACHINE:microblaze = "none"
+PROVIDES += "zocl"
 require recipes-xrt/xrt/xrt-${PV}.inc
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"