summaryrefslogtreecommitdiff
path: root/meta-xilinx/meta-xilinx-bsp/recipes-xrt
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-12-12 01:25:29 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-12-12 01:25:34 +0300
commit10fa14942b9cb27780f9496382107516639208b4 (patch)
treef4b195505178e47c4b21ece7b3a898d9402b2daa /meta-xilinx/meta-xilinx-bsp/recipes-xrt
parent6d8913e6c02e578d4e41b7fe88113f4e4822992d (diff)
downloadopenbmc-10fa14942b9cb27780f9496382107516639208b4.tar.xz
meta-xilinx: subtree update:569f52f275..b3e37df5d9
Mark Hatle (11): meta-microblaze: Move gcc patch that was missed in the prior work Uprev standalone toolchain bbappends pmu-firmware: Latest toolchain always treats 'assert' as a macro binutils: update to early gatesgarth version gdb: update to early gatesgarth version gcc: update to early gatesgarth version newlib: update to early gatesgarth version machine/aarch64-tc.conf: Fix incorrect ilp32 pkgarch libgcc.bbappend: Clear empty lib directory newlib: Upstream now disabled builtin symbols gdb: Fix on-target GDB compilation Sai Hari Chandana Kalluri (5): linux-xlnx_2020.2: Fix previous git cherry-pick xrt: Remove stale patch to fix endian issues with latest version of boost opencl-clhpp, ocl-icd: Remove recipes from meta-xilinx esw.bbclass: Remove trailing / after S Remove recipe bbappends pointing to older versions Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I18b028388a5b55a49ef135b98290228fa797e38d
Diffstat (limited to 'meta-xilinx/meta-xilinx-bsp/recipes-xrt')
-rw-r--r--meta-xilinx/meta-xilinx-bsp/recipes-xrt/ocl-icd/ocl-icd_git.bb19
-rw-r--r--meta-xilinx/meta-xilinx-bsp/recipes-xrt/opencl-clhpp/opencl-clhpp_git.bb29
-rw-r--r--meta-xilinx/meta-xilinx-bsp/recipes-xrt/xrt/xrt/0001-Replace-boost-detail-endian.hpp-with-boost-predef-ot.patch80
-rw-r--r--meta-xilinx/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb2
4 files changed, 0 insertions, 130 deletions
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-xrt/ocl-icd/ocl-icd_git.bb b/meta-xilinx/meta-xilinx-bsp/recipes-xrt/ocl-icd/ocl-icd_git.bb
deleted file mode 100644
index d14ec53e3d..0000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-xrt/ocl-icd/ocl-icd_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "OpenCL ICD library"
-DESCRIPTION = "Open Source alternative to vendor specific OpenCL ICD loaders."
-
-# The LICENSE is BSD 2-Clause "Simplified" License
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=232257bbf7320320725ca9529d3782ab"
-
-SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https"
-
-PV = "2.2.12+git${SRCPV}"
-SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01"
-
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-DEPENDS = "ruby-native"
-
-BBCLASSEXTEND = "native"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-xrt/opencl-clhpp/opencl-clhpp_git.bb b/meta-xilinx/meta-xilinx-bsp/recipes-xrt/opencl-clhpp/opencl-clhpp_git.bb
deleted file mode 100644
index 9af4442da1..0000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-xrt/opencl-clhpp/opencl-clhpp_git.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "Host API C++ bindings"
-DESCRIPTION = "OpenCL compute API headers C++ bindings from Khronos Group"
-LICENSE = "Khronos"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7e4a01f0c56b39419aa287361a82df00"
-SECTION = "base"
-
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https"
-
-PV = "2.0.10+git${SRCPV}"
-SRCREV = "acd6972bc65845aa28bd9f670dec84cbf8b760f3"
-
-S = "${WORKDIR}/git"
-
-do_configure () {
-:
-}
-
-# Only cl2.hpp is necessary.
-# Base on the repo, Directly input_cl2.hpp copied as cl2.hpp
-do_compile () {
-:
-}
-
-do_install () {
- install -d ${D}${includedir}/CL/
- install -m 0644 ${S}/input_cl2.hpp ${D}${includedir}/CL/cl2.hpp
-}
-
-ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-xrt/xrt/xrt/0001-Replace-boost-detail-endian.hpp-with-boost-predef-ot.patch b/meta-xilinx/meta-xilinx-bsp/recipes-xrt/xrt/xrt/0001-Replace-boost-detail-endian.hpp-with-boost-predef-ot.patch
deleted file mode 100644
index 2ad7f01a21..0000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-xrt/xrt/xrt/0001-Replace-boost-detail-endian.hpp-with-boost-predef-ot.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From aa556b2142b8d6c62c457f82f4470430e9fe80e7 Mon Sep 17 00:00:00 2001
-From: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
-Date: Thu, 29 Oct 2020 15:28:06 -0700
-Subject: [PATCH] Replace boost/detail/endian.hpp with
- boost/predef/other/endian.h
-
-The use of BOOST_*_ENDIAN and BOOST_BYTE_ORDER is deprecated. Include
-<boost/predef/other/endian.h> and use __BYTE_ORDER and1234
-
-Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
----
- runtime_src/core/common/api/xrt_kernel.cpp | 8 ++++----
- runtime_src/xocl/core/kernel.cpp | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/runtime_src/core/common/api/xrt_kernel.cpp b/runtime_src/core/common/api/xrt_kernel.cpp
-index 1025e9d..1fb7caf 100644
---- a/runtime_src/core/common/api/xrt_kernel.cpp
-+++ b/runtime_src/core/common/api/xrt_kernel.cpp
-@@ -48,7 +48,7 @@
- #include <cstdlib>
- using namespace std::chrono_literals;
-
--#include <boost/detail/endian.hpp>
-+#include <boost/predef/other/endian.h>
-
- #ifdef _WIN32
- # pragma warning( disable : 4244 4267 4996)
-@@ -464,7 +464,7 @@ class argument
- virtual std::vector<uint32_t>
- get_value(std::va_list* args) const
- {
-- static_assert(BOOST_BYTE_ORDER==1234,"Big endian detected");
-+ static_assert(__BYTE_ORDER==1234,"Big endian detected");
-
- HostType value = va_arg(*args, VaArgType);
- return value_to_uint32_vector(value);
-@@ -485,7 +485,7 @@ class argument
- virtual std::vector<uint32_t>
- get_value(std::va_list* args) const
- {
-- static_assert(BOOST_BYTE_ORDER==1234,"Big endian detected");
-+ static_assert(__BYTE_ORDER==1234,"Big endian detected");
-
- HostType* value = va_arg(*args, VaArgType*);
- return value_to_uint32_vector(value, size);
-@@ -507,7 +507,7 @@ class argument
- virtual std::vector<uint32_t>
- get_value(std::va_list* args) const
- {
-- static_assert(BOOST_BYTE_ORDER==1234,"Big endian detected");
-+ static_assert(__BYTE_ORDER==1234,"Big endian detected");
- if (xrt_core::config::get_xrt_bo()) {
- auto bo = va_arg(*args, xrtBufferHandle);
- return value_to_uint32_vector(xrt_core::bo::address(bo));
-diff --git a/runtime_src/xocl/core/kernel.cpp b/runtime_src/xocl/core/kernel.cpp
-index f4f7edf..ec71c7e 100644
---- a/runtime_src/xocl/core/kernel.cpp
-+++ b/runtime_src/xocl/core/kernel.cpp
-@@ -21,7 +21,7 @@
- #include "compute_unit.h"
- #include "core/common/xclbin_parser.h"
-
--#include <boost/detail/endian.hpp>
-+#include <boost/predef/other/endian.h>
-
- #include <sstream>
- #include <iostream>
-@@ -130,7 +130,7 @@ void
- kernel::scalar_argument::
- set(size_t size, const void* cvalue)
- {
-- static_assert(BOOST_BYTE_ORDER==1234,"Big endian detected");
-+ static_assert(__BYTE_ORDER==1234,"Big endian detected");
-
- if (size != m_sz)
- throw error(CL_INVALID_ARG_SIZE,"Invalid scalar argument size, expected "
---
-2.7.4
-
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 e814f11e8c..97a7a40126 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
@@ -14,8 +14,6 @@ REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
SRC_URI = "${REPO};${BRANCHARG}"
-FILESEXTRAPATHS_prepend := "${THISDIR}/xrt:"
-SRC_URI_append = " file://0001-Replace-boost-detail-endian.hpp-with-boost-predef-ot.patch"
PV = "202020.2.8.0"
SRCREV ?= "f19a872233fbfe2eb933f25fa3d9a780ced774e5"