From 48d0e230c56be8a2722851556b2b1e039c4847c4 Mon Sep 17 00:00:00 2001
From: bryan newbold <bnewbold@leaflabs.com>
Date: Wed, 13 Mar 2013 16:31:09 -0400
Subject: move stuff around; backup

---
 contrib/xilinx.mk  | 23 +++++++++++++++++------
 contrib/xilinx.opt | 42 ------------------------------------------
 2 files changed, 17 insertions(+), 48 deletions(-)
 delete mode 100644 contrib/xilinx.opt

(limited to 'contrib')

diff --git a/contrib/xilinx.mk b/contrib/xilinx.mk
index c03f4c3..8533121 100644
--- a/contrib/xilinx.mk
+++ b/contrib/xilinx.mk
@@ -1,9 +1,11 @@
-# This file came from excamera's build example.
+# This file oritinally came from excamera's build example.
 #
 # The top level module should define the variables below then include
 # this file.  The files listed should be in the same directory as the
 # Makefile.  
 #
+# TODO: update these listings
+#
 #   variable	description
 #   ----------  -------------
 #   project	project name (top level module should match this name)
@@ -53,7 +55,7 @@ local_corengcs = $(foreach ngc,$(corengcs),$(notdir $(ngc)))
 vfiles += $(foreach core,$(xilinx_cores),$(core:.xco=.v))
 junk += $(local_corengcs)
 
-.PHONY: default xilinx_cores clean twr etwr ise isim
+.PHONY: default xilinx_cores clean twr etwr ise
 default: build/$(project).bit build/$(project).mcs
 xilinx_cores: $(corengcs)
 twr: $(project).twr
@@ -151,14 +153,15 @@ junk += $(project).prj
 
 optfile += $(wildcard $(project).opt)
 top_module ?= $(project)
-build/$(project).scr: $(optfile) $(mkfiles) ./contrib/xilinx.opt
+build/$(project).scr: $(optfile) $(mkfiles) ./$(project).opt
 	mkdir -p build
 	echo "run" > $@
 	echo "-p $(part)" >> $@
 	echo "-top $(top_module)" >> $@
 	echo "-ifn $(project).prj" >> $@
 	echo "-ofn $(project).ngc" >> $@
-	cat ./contrib/xilinx.opt $(optfile) >> $@
+	cat $(optfile) >> $@
+	cp $@ build/$(project).xst
 junk += $(project).scr
 
 build/$(project).post_map.twr: build/$(project).ncd
@@ -176,6 +179,14 @@ junk += $(project)_err.twr $(project)_err.twx
 .gitignore: $(mkfiles)
 	echo programming_files $(junk) | sed 's, ,\n,g' > .gitignore
 
+ise:
+	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@echo "! WARNING: you might need to update ISE's project settings !"
+	@echo "!          (see README)                                    !"
+	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@mkdir -p build
+	bash -c "$(xil_env); ise .. &"
+
 clean::
-	rm -rf $(junk)
-	cd build; rm -rf $(junk)
+	rm -rf build
+#rm -rf $(junk)
diff --git a/contrib/xilinx.opt b/contrib/xilinx.opt
deleted file mode 100644
index 7fe9d8b..0000000
--- a/contrib/xilinx.opt
+++ /dev/null
@@ -1,42 +0,0 @@
--ifmt mixed
--ofmt NGC
--opt_mode speed
--opt_level 1
--iuc NO
--keep_hierarchy no
--netlist_hierarchy as_optimized
--rtlview no
--glob_opt AllClockNets
--read_cores yes
--write_timing_constraints NO
--cross_clock_analysis NO
--hierarchy_separator /
--bus_delimiter <>
--case maintain
--slice_utilization_ratio 100
--bram_utilization_ratio 100
-#-dsp_utilization_ratio 100
--safe_implementation No
--fsm_extract YES
--fsm_encoding Auto
--fsm_style lut
--ram_extract Yes
--ram_style Auto
--rom_extract Yes
--rom_style Auto
--shreg_extract YES
--auto_bram_packing NO
--resource_sharing YES
--async_to_sync NO
-#-use_dsp48 auto
--iobuf YES
--max_fanout 500
--register_duplication YES
--register_balancing No
--optimize_primitives NO
--use_clock_enable Auto
--use_sync_set Auto
--use_sync_reset Auto
--iob auto
--equivalent_register_removal YES
--slice_utilization_ratio_maxmargin 5
-- 
cgit v1.2.3