some cleanups for build-system

diff --git a/heartbeat/.cvsignore b/heartbeat/.cvsignore
index 983944307df35d666036b59f15d01d812937434d..5b315b4549260908f1e3162d13477a04166297e9 100644 (file)
--- a/heartbeat/.cvsignore
+++ b/heartbeat/.cvsignore
@@ -1,8 +1,34 @@
+_impact*
+_ngo
 pci1.mcs
 pci1.prm
 pci2.mcs
 pci2.prm
+raggedstone.bgn
 raggedstone.bit
+raggedstone.bld
+raggedstone.drc
+raggedstone.lso
+raggedstone.ncd
+raggedstone.ngc
+raggedstone.ngd
+raggedstone.ngr
+raggedstone.pad
+raggedstone.par
+raggedstone.pcf
+raggedstone.syr
+raggedstone.twr
+raggedstone.twx
+raggedstone.unroutes
+raggedstone.xpi
+raggedstone_map.map
+raggedstone_map.mrp
+raggedstone_map.ncd
+raggedstone_map.ngm
+raggedstone_pad.csv
+raggedstone_pad.txt
+raggedstone_summary.xml
+raggedstone_usage.xml
 timing.twr
 tmp
-_impact*
+xst

diff --git a/heartbeat/Makefile b/heartbeat/Makefile
index d645c38d0551a81dbd6e90c1baadf249475c634e..0db7a4798874f7ce38e7452d859872514a8af695 100644 (file)
--- a/heartbeat/Makefile
+++ b/heartbeat/Makefile
@@ -1,9 +1,6 @@
 PWD := $(shell pwd)
 
-XST := $(shell which xst)
-
-TMP = tmp/
-$(shell mkdir tmp)
+INTSTYLE := silent
 
 PROJECT := raggedstone
 
@@ -14,72 +11,55 @@ log:
 
 xst: $(PROJECT).ngc
 
-ngdbuild: $(PROJECT).ngc $(PROJECT).ngd
+ngdbuild: $(PROJECT).ngd
 
 $(PROJECT).ngc:
        @# echo synclib > $(PROJECT).lso # hmm. things are different in ise 9.1
        echo work > $(PROJECT).lso
-       xst -intstyle ise -ifn $(PROJECT).xst -ofn $(PROJECT).syr
-       #cat $(PROJECT).syr
-       mv $(PROJECT).syr $(TMP)
-       mv $(PROJECT).ngr $(PROJECT).lso $(TMP)
-       mv xst $(TMP)
+       xst -intstyle $(INTSTYLE) -ifn $(PROJECT).xst -ofn $(PROJECT).syr
+       @#cat $(PROJECT).syr
 
-$(PROJECT).ngd:
-       ngdbuild -intstyle ise -dd "$(PWD)/_ngo" -nt timestamp -uc $(PROJECT).ucf  -p xc3s1500-fg456-4 $(PROJECT).ngc $(PROJECT).ngd &> tmp/build.ngdbuild.log
-       mv $(PROJECT).bld $(TMP)
-       mv _ngo  $(TMP)
+$(PROJECT).ngd: $(PROJECT).ngc
+       ngdbuild -intstyle $(INTSTYLE) -dd "$(PWD)/_ngo" -nt timestamp -uc $(PROJECT).ucf  -p xc3s1500-fg456-4 $(PROJECT).ngc $(PROJECT).ngd
 
 map:
-       map -intstyle ise -p xc3s1500-fg456-4 -cm area -pr b -k 4 -c 100 -o $(PROJECT)_map.ncd $(PROJECT).ngd $(PROJECT).pcf &> tmp/build.map.log
-       mv $(PROJECT)_map.mrp $(PROJECT)_map.ngm $(PROJECT).ngc $(TMP)
+       map -intstyle $(INTSTYLE) -p xc3s1500-fg456-4 -cm area -pr b -k 4 -c 100 -o $(PROJECT)_map.ncd $(PROJECT).ngd $(PROJECT).pcf
 
 par:
-       @#par -w -intstyle ise -ol std -n 4 -t 1 $(PROJECT)_map.ncd $(PROJECT).dir $(PROJECT).pcf &> tmp/build.par.log
-       par -w -intstyle ise -ol std -t 1 $(PROJECT)_map.ncd $(PROJECT).ncd $(PROJECT).pcf &> tmp/build.par.log
-       mv $(PROJECT).xpi $(PROJECT).par $(PROJECT).pad $(TMP)
-       mv $(PROJECT)_pad.csv $(PROJECT)_pad.txt $(TMP)
+       @#par -w -intstyle $(INTSTYLE) -ol std -n 4 -t 1 $(PROJECT)_map.ncd $(PROJECT).dir $(PROJECT).pcf
+       par -w -intstyle $(INTSTYLE) -ol std -t 1 $(PROJECT)_map.ncd $(PROJECT).ncd $(PROJECT).pcf
 
 trace:
-       trce -intstyle ise -e 3 -l 3 -s 4 -xml $(PROJECT) $(PROJECT).ncd -o $(PROJECT).twr $(PROJECT).pcf &> tmp/build.trce.log
-       #cat $(PROJECT).twr
-       mv $(PROJECT).twr $(TMP)
-       mv $(PROJECT).twx $(TMP)
-       mv $(PROJECT)_map.ncd $(PROJECT).ngd $(PROJECT).pcf $(TMP)
+       trce -intstyle $(INTSTYLE) -e 3 -l 3 -s 4 -xml $(PROJECT) $(PROJECT).ncd -o $(PROJECT).twr $(PROJECT).pcf
+       @#cat $(PROJECT).twr
 
 prom:
-       bitgen -intstyle ise -f $(PROJECT).ut $(PROJECT).ncd &> tmp/build.bitgen.log
-       # cp $(PROJECT).bit ../jcarr_last.bit
-       #cat $(PROJECT).drc
-       mv $(PROJECT).drc  $(TMP)
-       #cat $(PROJECT).bgn
-       mv $(PROJECT).bgn  $(TMP)
+       bitgen -intstyle $(INTSTYLE) -f $(PROJECT).ut $(PROJECT).ncd
+       @# cp $(PROJECT).bit ../jcarr_last.bit
+       @#cat $(PROJECT).drc
+       @#cat $(PROJECT).bgn
 
 mcs:
-       promgen -w -p mcs -u 0 $(PROJECT) -o pci1 pci2 -x xcf02s xcf04s
+       promgen -intstyle $(INTSTYLE) -w -p mcs -u 0 $(PROJECT) -o pci1 pci2 -x xcf02s xcf04s
 
 final:
-       -mv $(PROJECT).unroutes *.xml $(TMP)
-       -mv $(PROJECT)*.map $(TMP)
-       -mv $(PROJECT).ncd $(TMP)
-       -grep -A 8 -B 1 ^Selected\ Device tmp/$(PROJECT).syr
-       -grep -A 8 -B 1 ^Timing\ Summary tmp/build.xst.log
-       -grep -A 21 -B 1 ^Design\ Summary tmp/build.map.log
+       -@grep -A 8 -B 1 ^Selected\ Device $(PROJECT).syr
+       -@grep -A 8 -B 1 ^Timing\ Summary $(PROJECT).syr
+       -@grep -A 21 -B 1 ^Design\ Summary $(PROJECT)_map.map
 
 burn:
        xc3sprog $(PROJECT).bit
 
+load:
+       impact -batch xc3s1500.batch
+
+flash: mcs
+       impact -batch xcf.batch
+
 clean:
-       rm -rf $(TMP)
        rm -rf *.bit *.bgn *.mcs *.prm *.bld *.drc *.mcs *.ncd *.ngc *.ngd
        rm -rf *.ngr *.pad *.par *.pcf *.prm *.syr *.twr *.twx *.xpi *.lso *.prm *.mcs _impact*
        rm -rf $(PROJECT)_map.* $(PROJECT)_pad.*
        rm -rf _ngo xst 
        rm -rf build.log
        rm -rf $(PROJECT).unroutes *.xml
-
-load:
-       impact -batch xc3s1500.batch
-
-flash: mcs
-       impact -batch xcf.batch

diff --git a/heartbeat/raggedstone.xst b/heartbeat/raggedstone.xst
index b94c962233b415e5ab6882f4faabb52a19f11444..e6c1305a3354d22d50ea6c701fc6595528c5c0c3 100644 (file)
--- a/heartbeat/raggedstone.xst
+++ b/heartbeat/raggedstone.xst
@@ -4,7 +4,7 @@ run
 -ifmt mixed
 -ofn raggedstone
 -ofmt NGC
--p xc3s1500-4-fg456
+-p xc3s1500-fg456-4
 -top raggedstone
 -opt_mode Speed
 -opt_level 1