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

image builder: Add --build-ip-dir option

Browse Source 
Co-authored-by: Wade Fife <wade.fife@ni.com>


Original-commit: 94b4de39d61ac4165ab18001b7d1a27c34698795
This commit is contained in:
Martin Braun
2024-06-11 10:20:08 +02:00
committed by Joerg Hofrichter
co-authored by Wade Fife
parent 0e6459250b
commit 523212fa04
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/make/viv_preamble.mak
+9 -1
View File
@@ -29,9 +29,17 @@ HLS_IP_DIR = $(abspath $(LIB_DIR)/hls)
MAKEFILE_DIR = $(abspath .) MAKEFILE_DIR = $(abspath .)
IP_BUILD_DIR ?= $(abspath ./build-ip/$(subst /,,$(PART_ID)))
BUILD_BASE_DIR ?= $(abspath .) BUILD_BASE_DIR ?= $(abspath .)
# -------------------------------------------------------------------
# IP Build Directory. Call with BUILD_IP_DIR to use that as base dir.
# -------------------------------------------------------------------
ifdef BUILD_IP_DIR
IP_BUILD_DIR = $(abspath $(BUILD_IP_DIR)/$(subst /,,$(PART_ID)))
else
IP_BUILD_DIR = $(abspath $(BUILD_BASE_DIR)/build-ip/$(subst /,,$(PART_ID)))
endif
# ------------------------------------------------------------------- # -------------------------------------------------------------------
# Git Hash Retrieval # Git Hash Retrieval
# ------------------------------------------------------------------- # -------------------------------------------------------------------
top/x400/Makefile.x4xx.inc
+4 -1
View File
@@ -171,6 +171,9 @@ IMAGE_CORE_HEADER_DEF="RFNOC_IMAGE_CORE_HDR=$(BUILD_DIR)/rfnoc_image_core.vh"
VERILOG_DEFS=$(EXTRA_DEFS) $(CUSTOM_DEFS) $(GIT_HASH_VERILOG_DEF) $(IMAGE_CORE_HEADER_DEF) $(RFNOC_IMAGE_CORE_DEFS) VERILOG_DEFS=$(EXTRA_DEFS) $(CUSTOM_DEFS) $(GIT_HASH_VERILOG_DEF) $(IMAGE_CORE_HEADER_DEF) $(RFNOC_IMAGE_CORE_DEFS)
show-var:
@echo "IP_BUILD_DIR: $(IP_BUILD_DIR)"
# DESIGN_SRCS and VERILOG_DEFS must be defined # DESIGN_SRCS and VERILOG_DEFS must be defined
bin: .prereqs bin: .prereqs
@echo "Build directory:: $(BUILD_DIR)" @echo "Build directory:: $(BUILD_DIR)"
@@ -184,7 +187,7 @@ synth: .prereqs
rtl: .prereqs rtl: .prereqs
$(call CHECK_VIVADO_DESIGN,$(TOOLS_DIR)/scripts/viv_check_syntax.tcl,$(TOP_MODULE),$(ARCH),$(PART_ID)) $(call CHECK_VIVADO_DESIGN,$(TOOLS_DIR)/scripts/viv_check_syntax.tcl,$(TOP_MODULE),$(ARCH),$(PART_ID))
viv_ip: .prereqs $$(DESIGN_SRCS) ip viv_ip: show-var .prereqs $$(DESIGN_SRCS) ip
@echo "IP build for $(NAME) DONE . . ." @echo "IP build for $(NAME) DONE . . ."
secure_core: .prereqs secure_core: .prereqs