Merge remote-tracking branch 'xilinx/master' into master_2024.1

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

16 files changed, 148 insertions, 198 deletions

diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 603db4c1..5f2b17b7 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -64,11 +64,11 @@ XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%"
 XILINX_ATF_VERSION[v2024.1] = "2.10-xilinx-v2024.1%"
 PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
-XILINX_UBOOT_VERSION[v2022.1] = "v2021.01-xilinx-v2022.1%"
-XILINX_UBOOT_VERSION[v2022.2] = "v2022.01-xilinx-v2022.2%"
-XILINX_UBOOT_VERSION[v2023.1] = "v2023.01-xilinx-v2023.1%"
-XILINX_UBOOT_VERSION[v2023.2] = "v2023.01-xilinx-v2023.2%"
-XILINX_UBOOT_VERSION[v2024.1] = "v2024.01-xilinx-v2024.1%"
+XILINX_UBOOT_VERSION[v2022.1] = "1:v2021.01-xilinx-v2022.1%"
+XILINX_UBOOT_VERSION[v2022.2] = "1:v2022.01-xilinx-v2022.2%"
+XILINX_UBOOT_VERSION[v2023.1] = "1:v2023.01-xilinx-v2023.1%"
+XILINX_UBOOT_VERSION[v2023.2] = "1:v2023.01-xilinx-v2023.2%"
+XILINX_UBOOT_VERSION[v2024.1] = "1:v2024.01-xilinx-v2024.1%"
 
 PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.1.bb
deleted file mode 100644
index 30ca3501..00000000
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SRCBRANCH ?= "2023.1"
-SRCREV = "be635252271de342014a146825870b64bd41d6eb"
-BRANCH = "xlnx_rel_v2023.1"
-LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
-PV = "${SRCBRANCH}+git${SRCPV}"
-
-REPO = "git://github.com/Xilinx/libmetal.git;protocol=https"
-
-include ${LAYER_PATH_openamp-layer}/recipes-openamp/libmetal/libmetal.inc
-
-RPROVIDES:${PN}-dbg += "libmetal-dbg"
-RPROVIDES:${PN}-dev += "libmetal-dev"
-RPROVIDES:${PN}-lic += "libmetal-lic"
-RPROVIDES:${PN}-src += "libmetal-src"
-RPROVIDES:${PN}-staticdev += "libmetal-staticdev"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.2.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.2.bb
deleted file mode 100644
index 5618ae88..00000000
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SRCBRANCH ?= "2023.2"
-SRCREV = "00fd771adc7adaed664ed6c5bc3d48d25856fe5c"
-BRANCH = "xlnx_rel_v2023.2"
-LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
-PV = "${SRCBRANCH}+git${SRCPV}"
-
-REPO = "git://github.com/Xilinx/libmetal.git;protocol=https"
-
-include ${LAYER_PATH_openamp-layer}/recipes-openamp/libmetal/libmetal.inc
-
-RPROVIDES:${PN}-dbg += "libmetal-dbg"
-RPROVIDES:${PN}-dev += "libmetal-dev"
-RPROVIDES:${PN}-lic += "libmetal-lic"
-RPROVIDES:${PN}-src += "libmetal-src"
-RPROVIDES:${PN}-staticdev += "libmetal-staticdev"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.1.bb
deleted file mode 100644
index e295b869..00000000
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SRCBRANCH ?= "2023.1"
-SRCREV = "c8aaf2f26d5493f492f0af09dd558d45908636da"
-BRANCH = "xlnx_rel_v2023.1"
-LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
-PV = "${SRCBRANCH}+git${SRCPV}"
-REPO = "git://github.com/Xilinx/open-amp.git;protocol=https"
-
-include ${LAYER_PATH_openamp-layer}/recipes-openamp/open-amp/open-amp.inc
-require ${LAYER_PATH_openamp-layer}/vendor/xilinx/recipes-openamp/open-amp/open-amp-xlnx.inc
-
-RPROVIDES:${PN}-dbg += "open-amp-dbg"
-RPROVIDES:${PN}-dev += "open-amp-dev"
-RPROVIDES:${PN}-lic += "open-amp-lic"
-RPROVIDES:${PN}-src += "open-amp-src"
-RPROVIDES:${PN}-staticdev += "open-amp-staticdev"
-
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.2.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.2.bb
deleted file mode 100644
index 8c6b4431..00000000
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SRCBRANCH ?= "2023.2"
-SRCREV = "73a546f2b5faffe71680b1e5389f3328be60773f"
-BRANCH = "xlnx_rel_v2023.2"
-LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
-PV = "${SRCBRANCH}+git${SRCPV}"
-REPO = "git://github.com/Xilinx/open-amp.git;protocol=https"
-
-include ${LAYER_PATH_openamp-layer}/recipes-openamp/open-amp/open-amp.inc
-require ${LAYER_PATH_openamp-layer}/vendor/xilinx/recipes-openamp/open-amp/open-amp-xlnx.inc
-
-RPROVIDES:${PN}-dbg += "open-amp-dbg"
-RPROVIDES:${PN}-dev += "open-amp-dev"
-RPROVIDES:${PN}-lic += "open-amp-lic"
-RPROVIDES:${PN}-src += "open-amp-src"
-RPROVIDES:${PN}-staticdev += "open-amp-staticdev"
-
diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.0.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.0.bb
deleted file mode 100644
index 8a707df4..00000000
--- a/meta-xilinx-core/recipes-apps/image-update/image-update_1.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Image update is used to update alternate images on compatible firmware."
-SUMMARY = "Image update is used to update alternate image on compatible firmware. \
-        If the current image is ImageA, ImageB will get updated and vice versa. \
-        Usage: image_update <Input Image File>"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b"
-
-BRANCH = "xlnx_rel_v2023.2"
-SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https"
-SRCREV = "4f0b7b1b20933ddc454124fc3472f1b8894ddf08"
-
-RDEPENDS:${PN} += "freeipmi"
-
-S = "${WORKDIR}/git"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-
-PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}"
-
-# Force the make system to use the flags we want!
-EXTRA_OEMAKE = 'CC="${CC} ${TARGET_CFLAGS} ${TARGET_LDFLAGS}" all'
-
-do_install () {
-    install -d ${D}${bindir}
-    install -m 0755 ${S}/image_update ${D}${bindir}/
-}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb
index 44636872..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.2.bb
@@ -19,3 +19,20 @@ do_compile () {
         oe_runmake -C ${S} cross_tools NO_SDL=1 O=${B}
 }
 
+# mkeficapsule is not available in this version of u-boot
+PROVIDES:remove = "${MLPREFIX}u-boot-mkeficapsule"
+PROVIDES:class-native:remove = "u-boot-mkeficapsule-native"
+PACKAGES:remove = "${PN}-mkeficapsule"
+RDEPENDS:${PN}:remove = "${PN}-mkeficapsule"
+
+do_install:prepend() {
+        # Avoid do_install failure
+        mkdir -p tools
+        touch tools/mkeficapsule
+}
+
+do_install:append() {
+        # Avoid failure
+        rm -rf ${D}${bindir}/uboot-mkeficapsule
+        rm -rf ${D}${bindir}/mkeficapsule
+}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h
new file mode 100644
index 00000000..08c1c16c
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h
@@ -0,0 +1,10 @@
+/*
+ * This file is use for addition u-boot configurations for microblaze.
+ */
+#include <configs/microblaze-generic.h>
+
+/* Core microblaze boot configurations */
+#define XILINX_USE_DCACHE       1
+#define CONFIG_CMD_IRQ
+#define CONFIG_DCACHE
+#define CONFIG_ICACHE
\ No newline at end of file
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg
new file mode 100644
index 00000000..0f784f73
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg
@@ -0,0 +1,81 @@
+# SPDX-License-Identifier: MIT
+
+#........................................................................
+#                                WARNING
+#
+# This file is a u-boot configuration fragment, and not a full u-boot
+# configuration file. The final u-boot configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on u-boot configuration, please
+# refer the product documentation.
+#
+#.......................................................................
+
+#
+# Definitions for Generic Microbalze machine.
+#
+CONFIG_BOOTDELAY=4
+CONFIG_SYS_TEXT_BASE=0x80100000
+CONFIG_SYS_PROMPT="U-Boot>"
+CONFIG_SYS_CONFIG_NAME="microblaze-generic-top"
+CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000
+# CONFIG_SYS_NS16550 is not set
+# CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set
+# CONFIG_SYS_FLASH_CFI is not set
+# CONFIG_FLASH_CFI_DRIVER is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_MTD_NOR_FLASH is not set
+# CONFIG_MTD_DEVICE is not set
+# CONFIG_SYS_FLASH_PROTECTION is not set
+# CONFIG_SPI_FLASH_SST is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_PHY_VITESSE is not set
+# CONFIG_CMD_EXT2 is not set
+# CONFIG_CMD_EXT4 is not set
+# CONFIG_CMD_EXT4_WRITE is not set
+# CONFIG_CMD_FAT is not set
+# CONFIG_DOS_PARTITION is not set
+# CONFIG_FAT_WRITE is not set
+CONFIG_DM=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_XILINX_UARTLITE=y
+CONFIG_XILINX_AXIEMAC=y
+CONFIG_PHY_XILINX=y
+CONFIG_PHY_TI=y
+CONFIG_NET=y
+CONFIG_PHY_GIGE=y
+CONFIG_NETDEVICES=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_DHCP=y
+CONFIG_PHYLIB=y
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_NFS=y
+CONFIG_CMD_MII=y
+CONFIG_PHY_MARVELL=y
+CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NATSEMI=y
+CONFIG_XILINX_SPI=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_SF=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_DM_SPI=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI=y
+CONFIG_SPI_FLASH_ISSI=y
+# CONFIG_BOOTARGS is not set
+# CONFIG_USE_BOOTARGS is not set
+# CONFIG_SPL is not set
+# CONFIG_I2C_EEPROM is not set
+# CONFIG_CMD_EEPROM is not set
+# CONFIG_SYS_I2C_EEPROM_ADDR is not set
+# CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set
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 6415861d..f9b8f52b 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,4 +1,4 @@
-UBOOT_VERSION = "v2021.01"
+UBOOT_VERSION = "v2022.01"
 
 UBRANCH ?= "xlnx_rebase_v2022.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 33b302e9..2e761ebe 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
@@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01"
 
 UBRANCH = "xlnx_rebase_v2023.01"
 
-SRCREV = "4da834fc7644b4124f7417e0e2789c7afcb40352"
+SRCREV = "2b54ad6f1d278c419b927d10db2edf323d844578"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
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
index e8e46543..56431a7f 100644
--- 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
@@ -31,6 +31,10 @@ SRC_URI = " \
         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"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb
new file mode 100644
index 00000000..6cf10817
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb
@@ -0,0 +1,29 @@
+SUMMARY  = "Xilinx Runtime(XRT) - minimal native build for xclbinutil"
+DESCRIPTION = "Native build of xclbinutil using XRT codebase"
+
+require xrt-202320.2.16.0.inc
+
+FILESEXTRAPATHS:append := ":${THISDIR}/xrt"
+
+LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = " \
+    file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
+    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
+    file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \
+"
+
+S = "${WORKDIR}/git/src"
+
+inherit cmake pkgconfig native
+
+DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native"
+
+EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
+}
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
deleted file mode 100644
index 14b2b968..00000000
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG};name=xrt"
-
-BRANCH= "2023.2"
-SRCREV_xrt = "2865a62b6a417dea523d2d5646154aa94a2cbc28"
-PV = "202320.2.16.0"
-
-SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https"
-SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578"
-
-SRC_URI += "git://github.com/serge1/ELFIO.git;branch=main;name=ELFIO;destsuffix=git/src/runtime_src/core/common/elf;protocol=https"
-SRCREV_ELFIO = "a04810f12625207cce72665d783babb80f0175a8"
-SRCREV_FORMAT = "xrt"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
deleted file mode 100644
index ef3c7172..00000000
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY  = "Xilinx Runtime(XRT) libraries"
-DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
-
-require xrt.inc
-
-SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
-
-LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
-                    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
-                    file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 "
-
-COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE:zynqmp = ".*"
-COMPATIBLE_MACHINE:versal = ".*"
-
-S = "${WORKDIR}/git/src"
-
-inherit cmake pkgconfig
-
-BBCLASSEXTEND = "native nativesdk"
-
-# util-linux is for libuuid-dev.
-DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
-
-EXTRA_OECMAKE += " \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_EXPORT_COMPILE_COMANDS=ON \
-                "
-
-# Systems with AIE also require libmetal, this is implemented in the dynamic-layers
-# See: meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt_gt.bbappend
-# Note: If meta-openamp is not available, AIE will not be enabled.
-
-EXTRA_OECMAKE:append:versal = " -DXRT_LIBDFX=true"
-EXTRA_OECMAKE:append:zynqmp = " -DXRT_LIBDFX=true"
-DEPENDS:append:versal = " libdfx"
-DEPENDS:append:zynqmp = " libdfx"
-
-
-FILES_SOLIBSDEV = ""
-FILES:${PN} += "\
-    ${libdir}/lib*.so \
-    ${libdir}/lib*.so.* \
-    ${libdir}/ps_kernels_lib \
-    /lib/*.so* \
-    ${datadir}"
-INSANE_SKIP:${PN} += "dev-so"
-
-pkg_postinst_ontarget:${PN}() {
-  #!/bin/sh
-  if [ ! -e /etc/OpenCL/vendors/xilinx.icd ]; then
-        echo "INFO: Creating ICD entry for Xilinx Platform"
-        mkdir -p /etc/OpenCL/vendors
-        echo "libxilinxopencl.so" > /etc/OpenCL/vendors/xilinx.icd
-        chmod -R 755 /etc/OpenCL
-  fi
-}
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_git.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_git.bb
deleted file mode 100644
index 6bd579f4..00000000
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY  = "Xilinx Runtime(XRT) driver module"
-DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
-
-COMPATIBLE_MACHINE:microblaze = "none"
-
-require recipes-xrt/xrt/xrt.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
-LICENSE = "GPL-2.0-or-later & Apache-2.0"
-
-COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE:zynqmp = ".*"
-COMPATIBLE_MACHINE:versal = ".*"
-
-S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
-
-inherit module
-
-pkg_postinst_ontarget:${PN}() {
-  #!/bin/sh
-  echo "Unloading old XRT Linux kernel modules"
-  ( rmmod zocl || true ) > /dev/null 2>&1
-  echo "Loading new XRT Linux kernel modules"
-  modprobe zocl
-}