diff options
Diffstat (limited to 'meta-xilinx/meta-xilinx-bsp/recipes-xrt')
-rw-r--r-- | meta-xilinx/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb | 36 | ||||
-rw-r--r-- | meta-xilinx/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb | 23 |
2 files changed, 45 insertions, 14 deletions
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb index 4bb41b7d7..6d50c2347 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb +++ b/meta-xilinx/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb @@ -2,15 +2,20 @@ SUMMARY = "Xilinx Runtime(XRT) libraries" DESCRIPTION = "Xilinx Runtime User Space Libraries and headers" LICENSE = "GPLv2 & Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=fa343562af4b9b922b8d7fe7b0b6d000 \ - file://runtime_src/driver/xclng/drm/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://runtime_src/driver/xclng/xrt/user_gem/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://runtime_src/driver/xclng/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \ + 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/pcie/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 \ + file://runtime_src/core/edge/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 " -SRC_URI = "git://github.com/Xilinx/XRT.git;protocol=https;nobranch=1" +BRANCH ?= "2020.1" +REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" +BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" +SRC_URI = "${REPO};${BRANCHARG}" -PV = "2.2.0+git${SRCPV}" -SRCREV = "da87ac894a037d7e11c0496361458efed4bab438" +PV = "202010.2.6.0" +SRCREV ?= "2d6bfe4ce91051d4e5b499d38fc493586dd4859a" S = "${WORKDIR}/git/src" @@ -19,10 +24,25 @@ inherit cmake BBCLASSEXTEND = "native nativesdk" # util-linux is for libuuid-dev. -DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native" +DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf" RDEPENDS_${PN} = "bash ocl-icd boost-system boost-filesystem" EXTRA_OECMAKE += " \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_EXPORT_COMPILE_COMANDS=ON \ " + +EXTRA_OECMAKE_append_versal += "-DXRT_AIE_BUILD=true" +TARGET_CXXFLAGS_append_versal += "-DXRT_ENABLE_AIE" +DEPENDS_append_versal += " libmetal libxaiengine" +RDEPENDS_${PN}_append_versal += " libxaiengine" + +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/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb b/meta-xilinx/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb index b47f45fde..2c3f0b441 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb +++ b/meta-xilinx/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb @@ -1,14 +1,25 @@ SUMMARY = "Xilinx Runtime(XRT) driver module" DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "GPLv2 & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" -SRC_URI = "git://github.com/Xilinx/XRT.git;protocol=https" +BRANCH ?= "2020.1" +REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" +BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" +SRC_URI = "${REPO};${BRANCHARG}" -PV = "2.2.0+git${SRCPV}" -SRCREV = "da87ac894a037d7e11c0496361458efed4bab438" +PV = "202010.2.6.0" +SRCREV ?= "2d6bfe4ce91051d4e5b499d38fc493586dd4859a" -S = "${WORKDIR}/git/src/runtime_src/driver/zynq/drm/zocl" +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 +} |