From 91f2c546e89b95337c02a9850b6ae2d010f0466f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 18 Apr 2024 13:25:13 -0600 Subject: xrt: Fix older versions for Scarthgap Add in necessary libmetal dependency (dynamic) Patch the sources using the xrt-cstdint.patch where applicable. Signed-off-by: Mark Hatle --- .../recipes-xrt/xrt/xrt_202310.2.15.0.bbappend | 3 + .../recipes-xrt/xrt/xrt_202320.2.16.0.bbappend | 3 + .../xrt/xrt-202310.2.15.0/xrt-cstdint.patch | 117 +++++++++++++++++++++ .../recipes-xrt/xrt/xrt_202310.2.15.0.bb | 2 + 4 files changed, 125 insertions(+) create mode 100644 meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend create mode 100644 meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend create mode 100644 meta-xilinx-core/recipes-xrt/xrt/xrt-202310.2.15.0/xrt-cstdint.patch diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend new file mode 100644 index 00000000..89f1b4ad --- /dev/null +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend @@ -0,0 +1,3 @@ +# Older xrt requires a manual dependency on libmetal +DEPENDS:append:versal-ai-core = " libmetal" +DEPENDS:append:versal-ai-edge = " libmetal" diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend new file mode 100644 index 00000000..89f1b4ad --- /dev/null +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend @@ -0,0 +1,3 @@ +# Older xrt requires a manual dependency on libmetal +DEPENDS:append:versal-ai-core = " libmetal" +DEPENDS:append:versal-ai-edge = " libmetal" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202310.2.15.0/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202310.2.15.0/xrt-cstdint.patch new file mode 100644 index 00000000..67ca68c6 --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202310.2.15.0/xrt-cstdint.patch @@ -0,0 +1,117 @@ +Add cstdint as necessary + +In GCC 13.1 usage of uint64 and similar will result in an error without + #include + +Signed-off-by: Mark Hatle + +diff --git a/src/runtime_src/core/common/time.h b/src/runtime_src/core/common/time.h +index a4a96b11d..585d38756 100644 +--- a/src/runtime_src/core/common/time.h ++++ b/src/runtime_src/core/common/time.h +@@ -19,6 +19,7 @@ + + #include "core/common/config.h" + #include ++#include + + namespace xrt_core { + +diff --git a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h +index 196304765..36ce35e80 +--- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h ++++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + namespace adf + { +diff --git a/src/runtime_src/core/edge/user/zynq_dev.h b/src/runtime_src/core/edge/user/zynq_dev.h +index 6fe36c615..2abd7473b 100644 +--- a/src/runtime_src/core/edge/user/zynq_dev.h ++++ b/src/runtime_src/core/edge/user/zynq_dev.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + class zynq_device { + public: +diff --git a/src/runtime_src/tools/xclbinutil/CBOR.h b/src/runtime_src/tools/xclbinutil/CBOR.h +index 368459f59..acbf6ebae 100644 +--- a/src/runtime_src/tools/xclbinutil/CBOR.h ++++ b/src/runtime_src/tools/xclbinutil/CBOR.h +@@ -22,6 +22,7 @@ + // #includes here - please keep these to a bare minimum! + #include + #include ++#include + + // ------------ F O R W A R D - D E C L A R A T I O N S ---------------------- + // Forward declarations - use these instead whenever possible... +diff --git a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h +index 361015962..1c3bca18d 100644 +--- a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h ++++ b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h +@@ -19,6 +19,7 @@ + + // ----------------------- I N C L U D E S ----------------------------------- + #include ++#include + #include + + // ----------- C L A S S : D T C S t r i n g s B l o c k ------------------- +diff --git a/src/runtime_src/tools/xclbinutil/XclBinSignature.h b/src/runtime_src/tools/xclbinutil/XclBinSignature.h +index b19ab56a4..f1b72d4d2 100644 +--- a/src/runtime_src/tools/xclbinutil/XclBinSignature.h ++++ b/src/runtime_src/tools/xclbinutil/XclBinSignature.h +@@ -18,6 +18,7 @@ + #define __XclBinSignature_h_ + + #include ++#include + + // ----------------------- I N C L U D E S ----------------------------------- + +diff --git a/src/runtime_src/xdp/profile/database/events/vtf_event.h b/src/runtime_src/xdp/profile/database/events/vtf_event.h +index f8d0121db..b5f36554c 100644 +--- a/src/runtime_src/xdp/profile/database/events/vtf_event.h ++++ b/src/runtime_src/xdp/profile/database/events/vtf_event.h +@@ -19,6 +19,7 @@ + #define VTF_EVENT_DOT_H + + #include ++#include + + #include "xdp/config.h" + +diff --git a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h +index 98c57de2e..6077bd247 100644 +--- a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h ++++ b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h +@@ -17,7 +17,8 @@ + #ifndef XDP_PROFILE_AIE_TRACE_LOGGER_H + #define XDP_PROFILE_AIE_TRACE_LOGGER_H + +-#include ++#include ++#include + + namespace xdp { + +diff --git a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h +index a88597464..f392ec0e6 100644 +--- a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h ++++ b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h +@@ -19,6 +19,7 @@ + + #include + #include ++#include + + #include "xdp/config.h" + 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 7bb0d05a..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 @@ -3,6 +3,8 @@ DESCRIPTION = "Xilinx Runtime User Space Libraries and headers" require xrt-${PV}.inc +SRC_URI += "file://xrt-cstdint.patch;striplevel=2" + LICENSE = "GPL-2.0-or-later & Apache-2.0" LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \ file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \ -- cgit v1.2.3-54-g00ecf