fix broken grep

[raggedstone] / heartbeat / Makefile

diff --git a/heartbeat/Makefile b/heartbeat/Makefile
index b0ba87c1c193ada3b5be37ac1e74e43f4ff9ce0c..d645c38d0551a81dbd6e90c1baadf249475c634e 100644 (file)
--- a/heartbeat/Makefile
+++ b/heartbeat/Makefile
@@ -5,9 +5,9 @@ XST := $(shell which xst)
 TMP = tmp/
 $(shell mkdir tmp)
 
-PROJECT := pci_7seg
+PROJECT := raggedstone
 
-all: xst ngdbuild map par trace prom mcs final
+all: xst ngdbuild map par trace prom final
 
 log:
        time make all &>build.log
@@ -19,7 +19,7 @@ ngdbuild: $(PROJECT).ngc $(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 &> tmp/build.xst.log
+       xst -intstyle ise -ifn $(PROJECT).xst -ofn $(PROJECT).syr
        #cat $(PROJECT).syr
        mv $(PROJECT).syr $(TMP)
        mv $(PROJECT).ngr $(PROJECT).lso $(TMP)
@@ -56,13 +56,13 @@ prom:
        mv $(PROJECT).bgn  $(TMP)
 
 mcs:
-       promgen -p mcs -u 0 $(PROJECT) -o pci1 pci2 -x xcf02s xcf04s
+       promgen -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/build.xst.log
+       -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
 
@@ -72,8 +72,14 @@ burn:
 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
+       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