miegl/b210-k7-fpga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fpga: tools: Fix HLS IP build with Cygwin

Browse Source 
Original-commit: be252febd001feac093b36c987d276720e4244ab
This commit is contained in:
Humberto Jimenez
2020-05-12 13:47:20 -05:00
committed by Wade Fife
parent 5188f1a6d5
commit f5a79baba7
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/make/viv_hls_ip_builder.mak
+4 -3
View File
@@ -9,6 +9,7 @@
# $3 = HLS_IP_SRCS (Absolute paths to the HLS IP source files) # $3 = HLS_IP_SRCS (Absolute paths to the HLS IP source files)
# $4 = HLS_IP_SRC_DIR (Absolute path to the top level HLS IP src dir) # $4 = HLS_IP_SRC_DIR (Absolute path to the top level HLS IP src dir)
# $5 = HLS_IP_BUILD_DIR (Absolute path to the top level HLS IP build dir) # $5 = HLS_IP_BUILD_DIR (Absolute path to the top level HLS IP build dir)
# $6 = HLS_IP_INCLUDES (Absolute path to IP include dir)
# Prereqs: # Prereqs:
# - TOOLS_DIR must be defined globally # - TOOLS_DIR must be defined globally
# ------------------------------------------------------------------- # -------------------------------------------------------------------
@@ -19,15 +20,15 @@ BUILD_VIVADO_HLS_IP = \
echo "========================================================"; \ echo "========================================================"; \
export HLS_IP_NAME=$(1); \ export HLS_IP_NAME=$(1); \
export PART_NAME=$(subst /,,$(2)); \ export PART_NAME=$(subst /,,$(2)); \
export HLS_IP_SRCS='$(3)'; \ export HLS_IP_SRCS=$(call RESOLVE_PATHS,$(3)); \
export HLS_IP_INCLUDES='$(6)'; \ export HLS_IP_INCLUDES=$(call RESOLVE_PATHS,$(6)); \
echo "BUILDER: Staging HLS IP in build directory..."; \ echo "BUILDER: Staging HLS IP in build directory..."; \
$(TOOLS_DIR)/scripts/shared-ip-loc-manage.sh --path=$(5)/$(1) reserve; \ $(TOOLS_DIR)/scripts/shared-ip-loc-manage.sh --path=$(5)/$(1) reserve; \
cp -rf $(4)/$(1)/* $(5)/$(1); \ cp -rf $(4)/$(1)/* $(5)/$(1); \
cd $(5); \ cd $(5); \
echo "BUILDER: Building HLS IP..."; \ echo "BUILDER: Building HLS IP..."; \
export VIV_ERR=0; \ export VIV_ERR=0; \
vivado_hls -f $(TOOLS_DIR)/scripts/viv_generate_hls_ip.tcl -l $(1).log || export VIV_ERR=$$?; \ vivado_hls -f $(call RESOLVE_PATH,$(TOOLS_DIR)/scripts/viv_generate_hls_ip.tcl) -l $(1).log || export VIV_ERR=$$?; \
$(TOOLS_DIR)/scripts/shared-ip-loc-manage.sh --path=$(5)/$(1) release; \ $(TOOLS_DIR)/scripts/shared-ip-loc-manage.sh --path=$(5)/$(1) release; \
exit $$(($$VIV_ERR)) exit $$(($$VIV_ERR))
tools/scripts/viv_generate_hls_ip.tcl
+6 -1
View File
@@ -8,7 +8,12 @@
set part_name $::env(PART_NAME) ;# Full Xilinx part name set part_name $::env(PART_NAME) ;# Full Xilinx part name
set hls_ip_name $::env(HLS_IP_NAME) ;# High level synthesis IP name set hls_ip_name $::env(HLS_IP_NAME) ;# High level synthesis IP name
set hls_ip_srcs $::env(HLS_IP_SRCS) ;# High level synthesis IP source files set hls_ip_srcs $::env(HLS_IP_SRCS) ;# High level synthesis IP source files
set hls_ip_inc $::env(HLS_IP_INCLUDES) ;# High level synthesis IP include directories
if {[info exists env(HLS_IP_INCLUDES)]} {
set hls_ip_inc $::env(HLS_IP_INCLUDES); # High level synthesis IP include directories
} else {
set hls_ip_inc {}
}
# --------------------------------------- # ---------------------------------------
# Vivado Commands # Vivado Commands