summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-xilinx-core/conf/layer.conf4
-rw-r--r--meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb2
-rw-r--r--meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb2
-rw-r--r--meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb2
-rw-r--r--meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb2
-rw-r--r--meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb2
-rw-r--r--meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb2
-rw-r--r--meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb2
-rw-r--r--meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb (renamed from meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb)1
-rw-r--r--meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb (renamed from meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb)2
-rw-r--r--meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb (renamed from meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb)2
-rw-r--r--meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb (renamed from meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb)2
-rw-r--r--meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb (renamed from meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb)2
13 files changed, 9 insertions, 18 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index f0a233cf..349463bf 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
30SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ 30SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
31 *->xrt \ 31 *->xrt \
32 *->kernel-module-zocl \ 32 *->zocl \
33 *->cairo \ 33 *->cairo \
34 *->libepoxy \ 34 *->libepoxy \
35 *->gstreamer1.0-plugins-base \ 35 *->gstreamer1.0-plugins-base \
@@ -80,7 +80,7 @@ XRT_ZOCL_VERSION[v2023.1] = "202310.2.15.0"
80XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0" 80XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0"
81XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.0" 81XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.0"
82PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 82PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
83PREFERRED_VERSION_kernel-module-zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 83PREFERRED_VERSION_zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
84 84
85# AI-Engine 85# AI-Engine
86AIEFAL_VERSION[v2022.1] = "1.4" 86AIEFAL_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 1d4ab5a3..b4de4fe6 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
23inherit cmake update-rc.d systemd 23inherit cmake update-rc.d systemd
24 24
25DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm" 25DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm"
26RDEPENDS:${PN} += " fru-print" 26RDEPENDS:${PN} += " fru-print"
27EXTRA_OECMAKE += " \ 27EXTRA_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 b15fff74..a4149d39 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
23inherit cmake update-rc.d systemd 23inherit cmake update-rc.d systemd
24 24
25DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm" 25DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm"
26RDEPENDS:${PN} += " freeipmi" 26RDEPENDS:${PN} += " freeipmi"
27EXTRA_OECMAKE += " \ 27EXTRA_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 60096e33..d09ab51e 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
23inherit cmake update-rc.d systemd 23inherit cmake update-rc.d systemd
24 24
25DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm systemd" 25DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm systemd"
26RDEPENDS:${PN} += " freeipmi" 26RDEPENDS:${PN} += " freeipmi"
27EXTRA_OECMAKE += " \ 27EXTRA_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 c42e9a65..0e9dd3db 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
@@ -21,7 +21,7 @@ BBCLASSEXTEND = "native nativesdk"
21 21
22# util-linux is for libuuid-dev. 22# util-linux is for libuuid-dev.
23DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson" 23DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson"
24RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" 24RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
25 25
26EXTRA_OECMAKE += " \ 26EXTRA_OECMAKE += " \
27 -DCMAKE_BUILD_TYPE=Release \ 27 -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 cc5a9ed5..7107c3df 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
@@ -20,7 +20,7 @@ BBCLASSEXTEND = "native nativesdk"
20 20
21# util-linux is for libuuid-dev. 21# util-linux is for libuuid-dev.
22DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson" 22DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson"
23RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" 23RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
24 24
25EXTRA_OECMAKE += " \ 25EXTRA_OECMAKE += " \
26 -DCMAKE_BUILD_TYPE=Release \ 26 -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 6d7d1257..cad8ccee 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.
26DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx" 26DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx"
27RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" 27RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
28 28
29EXTRA_OECMAKE += " \ 29EXTRA_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 a780684f..5824ae9c 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.
27DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx" 27DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx"
28RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" 28RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
29 29
30EXTRA_OECMAKE += " \ 30EXTRA_OECMAKE += " \
31 -DCMAKE_BUILD_TYPE=Release \ 31 -DCMAKE_BUILD_TYPE=Release \
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
index a7c7e540..7063178a 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
@@ -1,7 +1,6 @@
1SUMMARY = "Xilinx Runtime(XRT) driver module" 1SUMMARY = "Xilinx Runtime(XRT) driver module"
2DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" 2DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
3 3
4PROVIDES += "zocl"
5 4
6require recipes-xrt/xrt/xrt-${PV}.inc 5require recipes-xrt/xrt/xrt-${PV}.inc
7 6
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
index 8676639a..39e9f9fb 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
@@ -3,8 +3,6 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
3 3
4COMPATIBLE_MACHINE:microblaze = "none" 4COMPATIBLE_MACHINE:microblaze = "none"
5 5
6PROVIDES += "zocl"
7
8require recipes-xrt/xrt/xrt-${PV}.inc 6require recipes-xrt/xrt/xrt-${PV}.inc
9 7
10LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
index b91572f9..24f69aec 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
@@ -3,8 +3,6 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
3 3
4COMPATIBLE_MACHINE:microblaze = "none" 4COMPATIBLE_MACHINE:microblaze = "none"
5 5
6PROVIDES += "zocl"
7
8require recipes-xrt/xrt/xrt-${PV}.inc 6require recipes-xrt/xrt/xrt-${PV}.inc
9 7
10LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
index b91572f9..24f69aec 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
@@ -3,8 +3,6 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
3 3
4COMPATIBLE_MACHINE:microblaze = "none" 4COMPATIBLE_MACHINE:microblaze = "none"
5 5
6PROVIDES += "zocl"
7
8require recipes-xrt/xrt/xrt-${PV}.inc 6require recipes-xrt/xrt/xrt-${PV}.inc
9 7
10LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb
index b91572f9..24f69aec 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb
@@ -3,8 +3,6 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
3 3
4COMPATIBLE_MACHINE:microblaze = "none" 4COMPATIBLE_MACHINE:microblaze = "none"
5 5
6PROVIDES += "zocl"
7
8require recipes-xrt/xrt/xrt-${PV}.inc 6require recipes-xrt/xrt/xrt-${PV}.inc
9 7
10LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"