aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbryan newbold <bnewbold@leaflabs.com>2013-10-04 14:28:03 -0400
committerbryan newbold <bnewbold@leaflabs.com>2013-10-04 14:29:19 -0400
commit9d418f09a83c3f0482fe6f0eca2ddd009732461a (patch)
treeeeb7a099be32732ce19f5635825eb6e27e075972
parent02173564251454ca5e6e2663715ef8a08229cad9 (diff)
downloadbasic-hdl-template-9d418f09a83c3f0482fe6f0eca2ddd009732461a.tar.gz
basic-hdl-template-9d418f09a83c3f0482fe6f0eca2ddd009732461a.zip
backport improvements from SNG project
-rw-r--r--BUGS1
-rw-r--r--contrib/xilinx.mk10
2 files changed, 8 insertions, 3 deletions
diff --git a/BUGS b/BUGS
index 176c166..389d42b 100644
--- a/BUGS
+++ b/BUGS
@@ -1 +1,2 @@
For some reason ./tb/isim.sdb can swell to 8GB or more.
+'lint' should use vfiles, not -I./hdl
diff --git a/contrib/xilinx.mk b/contrib/xilinx.mk
index cd739f3..1f3898d 100644
--- a/contrib/xilinx.mk
+++ b/contrib/xilinx.mk
@@ -39,7 +39,9 @@
#
# NOTE: DO NOT edit this file to change settings; instead edit Makefile
-unconst_timing ?= -u 10
+vgenerics ?=
+unconst_timing ?= -u 50
+const_timing_limit ?= 50
synth_effort ?= high
coregen_work_dir ?= ./coregen-tmp
map_opts ?= -timing -ol $(synth_effort) -detail -pr b -register_duplication -w
@@ -148,6 +150,7 @@ build/$(project).ngd: build/$(project).ngc $(project).ucf $(project).bmm
ngdbuild $(intstyle) $(project).ngc -bm ../$(project).bmm -sd ../cores -uc ../$(project).ucf -aul $(colorize)"
build/$(project).ngc: $(vfiles) $(local_corengcs) build/$(project).scr build/$(project).prj
+ @bash -c "rm build/$(project).scr; make build/$(project).scr"
@bash -c "$(xil_env); xst $(intstyle) -ifn $(project).scr $(colorize)"
build/$(project).prj: $(vfiles)
@@ -164,15 +167,16 @@ build/$(project).scr: $(optfile) $(mkfiles) ./$(project).opt
@echo "-top $(top_module)" >> $@
@echo "-ifn $(project).prj" >> $@
@echo "-ofn $(project).ngc" >> $@
+ @echo '-generics {$(vgenerics)}' >> $@
@cat $(optfile) >> $@
cp $@ build/$(project).xst
build/$(project)_post_map.twr: build/$(project).ncd
- @bash -c "$(xil_env); trce $(unconst_timing) -e 20 -l 10 $(project).ncd $(project).pcf -o $(project)_post_map.twr $(colorize)"
+ @bash -c "$(xil_env); trce $(unconst_timing) -e $(const_timing_limit) -l $(const_timing_limit) $(project).ncd $(project).pcf -o $(project)_post_map.twr $(colorize)"
@echo "Read $@ for timing analysis details"
build/$(project)_post_par.twr: build/$(project)_par.ncd
- @bash -c "$(xil_env); trce $(unconst_timing) -e 20 -l 10 $(project)_par.ncd $(project).pcf -o $(project)_post_par.twr $(colorize)"
+ @bash -c "$(xil_env); trce $(unconst_timing) -e $(const_timing_limit) -l $(const_timing_limit) $(project)_par.ncd $(project).pcf -o $(project)_post_par.twr $(colorize)"
@echo "See $@ for timing analysis details"
tb/simulate_isim.prj: $(tbfiles) $(vfiles) $(mkfiles)