diff options
| -rw-r--r-- | rtl/build/Makefile | 1 | ||||
| l--------- | rtl/build/novena_baseline_top.ucf | 1 | ||||
| -rw-r--r-- | rtl/build/xilinx.mk | 10 |
3 files changed, 5 insertions, 7 deletions
diff --git a/rtl/build/Makefile b/rtl/build/Makefile index cfac6ae..c51e783 100644 --- a/rtl/build/Makefile +++ b/rtl/build/Makefile @@ -5,6 +5,7 @@ part = xc6slx45csg324-3 top_module = novena_baseline_top isedir = /opt/Xilinx/14.7/ISE_DS xil_env = . $(isedir)/settings64.sh +ucf = ../src/ucf/novena_baseline.ucf vfiles = \ ../src/verilog/cdc_bus_pulse.v \ diff --git a/rtl/build/novena_baseline_top.ucf b/rtl/build/novena_baseline_top.ucf deleted file mode 120000 index fddd839..0000000 --- a/rtl/build/novena_baseline_top.ucf +++ /dev/null @@ -1 +0,0 @@ -../src/ucf/novena_baseline.ucf
\ No newline at end of file diff --git a/rtl/build/xilinx.mk b/rtl/build/xilinx.mk index a3a0216..3f677bd 100644 --- a/rtl/build/xilinx.mk +++ b/rtl/build/xilinx.mk @@ -18,10 +18,7 @@ # map_opts (optional) options to give to map # par_opts (optional) options to give to par # intstyle (optional) intstyle option to all tools -# -# files description -# ---------- ------------ -# $(project).ucf ucf file +# ucf constraint file, defaults to $(project).ucf # # Library modules should have a modules.mk in their root directory, # namely $(libdir)/<libname>/module.mk, that simply adds to the vfiles @@ -39,6 +36,7 @@ par_opts ?= -ol high isedir ?= /opt/Xilinx/13.3/ISE_DS xil_env ?= . $(isedir)/settings32.sh flashsize ?= 8192 +ucf ?= $(project).ucf libmks = $(patsubst %,$(libdir)/%/module.mk,$(libs)) mkfiles = Makefile $(libmks) xilinx.mk @@ -129,8 +127,8 @@ junk += $(project).ncd $(project).pcf $(project).ngm $(project).mrp $(project).m junk += smartguide.ncd $(project).psr junk += $(project)_summary.xml $(project)_usage.xml -$(project).ngd: $(project).ngc $(project).ucf $(project).bmm - $(xil_env); ngdbuild $(intstyle) $(project).ngc -bm $(project).bmm +$(project).ngd: $(project).ngc $(ucf) $(project).bmm + $(xil_env); ngdbuild $(intstyle) $(project).ngc -uc $(ucf) -bm $(project).bmm junk += $(project).ngd $(project).bld $(project).ngc: $(vfiles) $(local_corengcs) $(project).scr $(project).prj |