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

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

3 files changed, 29 insertions, 76 deletions

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
-}