diff options
author | Mark Hatle <mark.hatle@amd.com> | 2022-06-22 14:14:44 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2022-06-22 14:15:03 -0700 |
commit | 574eba1a8e952a0b0dae4e0848dd7fcd80eee80f (patch) | |
tree | 7141eef6490a81f91fe4dce95a1be57f4a52129a /meta-xilinx-core/recipes-xrt | |
parent | 510f582ec8566a5772ca3925e8055706d715fe85 (diff) | |
download | meta-xilinx-574eba1a8e952a0b0dae4e0848dd7fcd80eee80f.tar.gz |
Revert "xrt: Add workaround for xrt/xrt_kernel.h issue"
This reverts commit ca0ae12186c4d13305d72cc636e9107a67e38ad2.
No longer necessary
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/recipes-xrt')
-rw-r--r-- | meta-xilinx-core/recipes-xrt/xrt/xrt/0001-xrt_kernel.h-experimental-xrt_hw_context.h-requries-.patch | 31 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb | 3 |
2 files changed, 0 insertions, 34 deletions
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt/0001-xrt_kernel.h-experimental-xrt_hw_context.h-requries-.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt/0001-xrt_kernel.h-experimental-xrt_hw_context.h-requries-.patch deleted file mode 100644 index 05b59c35..00000000 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt/0001-xrt_kernel.h-experimental-xrt_hw_context.h-requries-.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 16adf8611f9b6de41c7fa37f0222441720efe503 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Hatle <mhatle@xilinx.com> | ||
3 | Date: Mon, 6 Jun 2022 14:11:47 -0700 | ||
4 | Subject: [PATCH] xrt_kernel.h: experimental/xrt_hw_context.h requries C++ | ||
5 | |||
6 | Move the include under the cplusplus check to avoid the error: | ||
7 | # error xrt_hwcontext is only implemented for C++ | ||
8 | |||
9 | Signed-off-by: Mark Hatle <mhatle@xilinx.com> | ||
10 | --- | ||
11 | src/runtime_src/core/include/xrt/xrt_kernel.h | 3 +-- | ||
12 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/src/runtime_src/core/include/xrt/xrt_kernel.h b/src/runtime_src/core/include/xrt/xrt_kernel.h | ||
15 | index bbc9a30d5..93445dc81 100644 | ||
16 | --- a/src/runtime_src/core/include/xrt/xrt_kernel.h | ||
17 | +++ b/src/runtime_src/core/include/xrt/xrt_kernel.h | ||
18 | @@ -11,9 +11,8 @@ | ||
19 | #include "xrt/xrt_device.h" | ||
20 | #include "xrt/xrt_uuid.h" | ||
21 | |||
22 | -#include "experimental/xrt_hw_context.h" | ||
23 | - | ||
24 | #ifdef __cplusplus | ||
25 | +# include "experimental/xrt_hw_context.h" | ||
26 | # include "experimental/xrt_enqueue.h" | ||
27 | # include <chrono> | ||
28 | # include <cstdint> | ||
29 | -- | ||
30 | 2.17.1 | ||
31 | |||
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb index fc55b3d3..4a697bf4 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb | |||
@@ -10,9 +10,6 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \ | |||
10 | file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 10 | file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
11 | file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 " | 11 | file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 " |
12 | 12 | ||
13 | # Temporary fix | ||
14 | SRC_URI += "file://0001-xrt_kernel.h-experimental-xrt_hw_context.h-requries-.patch;striplevel=2" | ||
15 | |||
16 | S = "${WORKDIR}/git/src" | 13 | S = "${WORKDIR}/git/src" |
17 | 14 | ||
18 | inherit cmake | 15 | inherit cmake |