some more dependencies

diff --git a/common/xcf.batch b/common/xcf.batch
index 8766b075c95c1bcaf40545e3fbdce4deafcfdac5..0580d588c4f65926fcafde235afe74fe8ce68396 100644 (file)
--- a/common/xcf.batch
+++ b/common/xcf.batch
@@ -1,8 +1,8 @@
 setmode -bscan 
 setcable -p auto 
 identify
 setmode -bscan 
 setcable -p auto 
 identify

-assignFile -p 1 -file pci1.mcs
-assignFile -p 2 -file pci2.mcs
+assignFile -p 1 -file raggedstone-xcf02s.mcs
+assignFile -p 2 -file raggedstone-xcf04s.mcs

 program -e -v -p 1
 program -e -v -p 2
 quit
 program -e -v -p 1
 program -e -v -p 2
 quit

diff --git a/heartbeat/.cvsignore b/heartbeat/.cvsignore
index 5b315b4549260908f1e3162d13477a04166297e9..d4c4c6875c223e345a8655cd1a785e7765967c6d 100644 (file)
--- a/heartbeat/.cvsignore
+++ b/heartbeat/.cvsignore
@@ -1,9 +1,9 @@
 _impact*
 _ngo
 _impact*
 _ngo

-pci1.mcs
-pci1.prm
-pci2.mcs
-pci2.prm
+raggedstone-xcf02s.mcs
+raggedstone-xcf02s.prm
+raggedstone-xcf04s.mcs
+raggedstone-xcf04s.prm

 raggedstone.bgn
 raggedstone.bit
 raggedstone.bld
 raggedstone.bgn
 raggedstone.bit
 raggedstone.bld

diff --git a/heartbeat/Makefile b/heartbeat/Makefile
index 7688155fbe434fe038cda604d75c16d85b992ff3..13045a95ef7be361860acaaf72f971bfe8a9f505 100644 (file)
--- a/heartbeat/Makefile
+++ b/heartbeat/Makefile
@@ -41,21 +41,21 @@ $(PROJECT).bit: $(PROJECT).ncd
        @#cat $(PROJECT).drc
        @#cat $(PROJECT).bgn
 
        @#cat $(PROJECT).drc
        @#cat $(PROJECT).bgn
 

-mcs:
-       promgen -intstyle $(INTSTYLE) -w -p mcs -u 0 $(PROJECT) -o pci1 pci2 -x xcf02s xcf04s
+$(PROJECT)-xcf02s.mcs $(PROJECT)-xcf04s.mcs: $(PROJECT).bit
+       promgen -intstyle $(INTSTYLE) -w -p mcs -u 0 $(PROJECT) -o $(PROJECT)-xcf02s $(PROJECT)-xcf04s -x xcf02s xcf04s

 
 final:
        -@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
 
 
 final:
        -@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:
+burn: $(PROJECT).bit

        xc3sprog $(PROJECT).bit
 
        xc3sprog $(PROJECT).bit
 

-load:
+load: $(PROJECT).bit

        impact -batch xc3s1500.batch
 
        impact -batch xc3s1500.batch
 

-flash: mcs
+flash: $(PROJECT)-xcf02s.mcs $(PROJECT)-xcf04s.mcs

        impact -batch xcf.batch
 
 clean:
        impact -batch xcf.batch
 
 clean:


@@ -65,3 +65,5 @@ clean:
                _ngo xst  \
                build.log \
                $(PROJECT).unroutes *.xml
                _ngo xst  \
                build.log \
                $(PROJECT).unroutes *.xml

+
+.PHONY: all final burn load flash clean xst ngdbuild log