diff options
| author | Paul Selkirk <paul@psgd.org> | 2019-01-22 19:39:09 -0500 |
|---|---|---|
| committer | Paul Selkirk <paul@psgd.org> | 2019-01-22 20:15:26 -0500 |
| commit | 516b2975958b05c72f573c37c075e5793c514101 (patch) | |
| tree | ded6ab7cc8e02729e3e444c058c9ee8fd766ffa1 | |
| parent | f01086416f290352c2c9faa0f1c6b1fce31e8f01 (diff) | |
Upon reflection, I prefer the way Pavel handled include paths in 8cd28d0
(which he only committed on fmc_clk, and I was only looking at master).
But I moved the curly brackets from Makefile to xilinx.mk, because
a) Makefile shouldn't need to know the picky details of xst option
syntax, and
b) xst will throw an uninformative error if called with '-vlgincdir '
versus '-vlgincdir {}', if vlgincdir isn't defined in Makefile.
| -rw-r--r-- | build/Makefile | 4 | ||||
| -rw-r--r-- | build/xilinx.mk | 1 | ||||
| -rw-r--r-- | build/xilinx.opt | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile index f573ace..60e55f9 100644 --- a/build/Makefile +++ b/build/Makefile @@ -18,6 +18,10 @@ isedir = /opt/Xilinx/14.7/ISE_DS xil_env = . $(isedir)/settings$(WORD_SIZE).sh ucf ?= ../ucf/$(project).ucf +# Verilog include directories, if needed + +vlgincdir = $(CORE_TREE)/lib/lowlevel $(CORE_TREE)/math/ecdsalib/rtl/microcode + all: $(project).bit # Build the default core_selector if it doesn't already exist. diff --git a/build/xilinx.mk b/build/xilinx.mk index 9af9366..4bfefde 100644 --- a/build/xilinx.mk +++ b/build/xilinx.mk @@ -154,6 +154,7 @@ $(project).scr: $(optfile) $(mkfiles) ./xilinx.opt echo "-top $(top_module)" >> $@ echo "-ifn $(project).prj" >> $@ echo "-ofn $(project).ngc" >> $@ + echo "-vlgincdir {$(vlgincdir)}" >> $@ cat ./xilinx.opt $(optfile) >> $@ junk += $(project).scr diff --git a/build/xilinx.opt b/build/xilinx.opt index 933f7df..1ac8957 100644 --- a/build/xilinx.opt +++ b/build/xilinx.opt @@ -45,4 +45,3 @@ -iob auto -equivalent_register_removal YES -slice_utilization_ratio_maxmargin 5 --vlgincdir {../../../lib/lowlevel ../../../math/ecdsalib/rtl/microcode} |