diff options
12 files changed, 16 insertions, 9 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 1dea221f..b140fce4 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf | |||
@@ -29,7 +29,7 @@ LAYERSERIES_COMPAT_xilinx = "scarthgap" | |||
29 | 29 | ||
30 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | 30 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ |
31 | *->xrt \ | 31 | *->xrt \ |
32 | *->zocl \ | 32 | *->kernel-module-zocl \ |
33 | *->cairo \ | 33 | *->cairo \ |
34 | *->libepoxy \ | 34 | *->libepoxy \ |
35 | *->gstreamer1.0-plugins-base \ | 35 | *->gstreamer1.0-plugins-base \ |
@@ -76,7 +76,7 @@ XRT_ZOCL_VERSION[v2022.2] = "202220.2.14.0" | |||
76 | XRT_ZOCL_VERSION[v2023.1] = "202310.2.15.0" | 76 | XRT_ZOCL_VERSION[v2023.1] = "202310.2.15.0" |
77 | XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0" | 77 | XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0" |
78 | PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 78 | PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
79 | PREFERRED_VERSION_zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 79 | PREFERRED_VERSION_kernel-module-zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
80 | 80 | ||
81 | # AI-Engine | 81 | # AI-Engine |
82 | AIEFAL_VERSION[v2022.1] = "1.4" | 82 | AIEFAL_VERSION[v2022.1] = "1.4" |
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" | |||
22 | 22 | ||
23 | inherit cmake update-rc.d systemd | 23 | inherit cmake update-rc.d systemd |
24 | 24 | ||
25 | DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm" | 25 | DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm" |
26 | RDEPENDS:${PN} += " fru-print" | 26 | RDEPENDS:${PN} += " fru-print" |
27 | EXTRA_OECMAKE += " \ | 27 | EXTRA_OECMAKE += " \ |
28 | -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ | 28 | -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" | |||
22 | 22 | ||
23 | inherit cmake update-rc.d systemd | 23 | inherit cmake update-rc.d systemd |
24 | 24 | ||
25 | DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm" | 25 | DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm" |
26 | RDEPENDS:${PN} += " freeipmi" | 26 | RDEPENDS:${PN} += " freeipmi" |
27 | EXTRA_OECMAKE += " \ | 27 | EXTRA_OECMAKE += " \ |
28 | -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ | 28 | -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" | |||
22 | 22 | ||
23 | inherit cmake update-rc.d systemd | 23 | inherit cmake update-rc.d systemd |
24 | 24 | ||
25 | DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm systemd" | 25 | DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm systemd" |
26 | RDEPENDS:${PN} += " freeipmi" | 26 | RDEPENDS:${PN} += " freeipmi" |
27 | EXTRA_OECMAKE += " \ | 27 | EXTRA_OECMAKE += " \ |
28 | -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ | 28 | -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ |
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..7a06a51c 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 | |||
@@ -19,7 +19,7 @@ BBCLASSEXTEND = "native nativesdk" | |||
19 | 19 | ||
20 | # util-linux is for libuuid-dev. | 20 | # util-linux is for libuuid-dev. |
21 | DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson" | 21 | DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson" |
22 | RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" | 22 | RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" |
23 | 23 | ||
24 | EXTRA_OECMAKE += " \ | 24 | EXTRA_OECMAKE += " \ |
25 | -DCMAKE_BUILD_TYPE=Release \ | 25 | -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..402d4ed2 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 | |||
@@ -18,7 +18,7 @@ BBCLASSEXTEND = "native nativesdk" | |||
18 | 18 | ||
19 | # util-linux is for libuuid-dev. | 19 | # util-linux is for libuuid-dev. |
20 | DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson" | 20 | DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson" |
21 | RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" | 21 | RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" |
22 | 22 | ||
23 | EXTRA_OECMAKE += " \ | 23 | EXTRA_OECMAKE += " \ |
24 | -DCMAKE_BUILD_TYPE=Release \ | 24 | -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" | |||
24 | 24 | ||
25 | # util-linux is for libuuid-dev. | 25 | # util-linux is for libuuid-dev. |
26 | DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx" | 26 | DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx" |
27 | RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" | 27 | RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" |
28 | 28 | ||
29 | EXTRA_OECMAKE += " \ | 29 | EXTRA_OECMAKE += " \ |
30 | -DCMAKE_BUILD_TYPE=Release \ | 30 | -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" | |||
25 | 25 | ||
26 | # util-linux is for libuuid-dev. | 26 | # util-linux is for libuuid-dev. |
27 | DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx" | 27 | DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx" |
28 | RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" | 28 | RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" |
29 | 29 | ||
30 | EXTRA_OECMAKE += " \ | 30 | EXTRA_OECMAKE += " \ |
31 | -DCMAKE_BUILD_TYPE=Release \ | 31 | -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 @@ | |||
1 | SUMMARY = "Xilinx Runtime(XRT) driver module" | 1 | SUMMARY = "Xilinx Runtime(XRT) driver module" |
2 | DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" | 2 | DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" |
3 | 3 | ||
4 | PROVIDES += "zocl" | ||
4 | 5 | ||
5 | require recipes-xrt/xrt/xrt-${PV}.inc | 6 | require recipes-xrt/xrt/xrt-${PV}.inc |
6 | 7 | ||
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 | |||
3 | 3 | ||
4 | COMPATIBLE_MACHINE:microblaze = "none" | 4 | COMPATIBLE_MACHINE:microblaze = "none" |
5 | 5 | ||
6 | PROVIDES += "zocl" | ||
7 | |||
6 | require recipes-xrt/xrt/xrt-${PV}.inc | 8 | require recipes-xrt/xrt/xrt-${PV}.inc |
7 | 9 | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" | 10 | 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 | |||
3 | 3 | ||
4 | COMPATIBLE_MACHINE:microblaze = "none" | 4 | COMPATIBLE_MACHINE:microblaze = "none" |
5 | 5 | ||
6 | PROVIDES += "zocl" | ||
7 | |||
6 | require recipes-xrt/xrt/xrt-${PV}.inc | 8 | require recipes-xrt/xrt/xrt-${PV}.inc |
7 | 9 | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" | 10 | 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 | |||
3 | 3 | ||
4 | COMPATIBLE_MACHINE:microblaze = "none" | 4 | COMPATIBLE_MACHINE:microblaze = "none" |
5 | 5 | ||
6 | PROVIDES += "zocl" | ||
7 | |||
6 | require recipes-xrt/xrt/xrt-${PV}.inc | 8 | require recipes-xrt/xrt/xrt-${PV}.inc |
7 | 9 | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" |