move common files to common subdir

let "make load" and "make flash" work for other projects, too

diff --git a/common/Makefile.common b/common/Makefile.common
index 51494f98fce9a90a0db6be70b2e7d85e5f7cf854..c275a06eed175ba6ad5463da6fd24862609b73c4 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -54,12 +54,12 @@ burn: $(PROJECT).bit
        xc3sprog $(PROJECT).bit
 
 load: $(PROJECT).bit
        xc3sprog $(PROJECT).bit
 
 load: $(PROJECT).bit

-       @sed -e "s|%CABLE%|$(CABLE)|g" xc3s1500.batch >xc3s1500.batch.tmp
+       @sed -e "s|%CABLE%|$(CABLE)|g" -e "s|%PROJECT%|$(PROJECT)|g" ../common/xc3s1500.batch >xc3s1500.batch.tmp

        impact -batch xc3s1500.batch.tmp
        @rm xc3s1500.batch.tmp
 
 flash: $(PROJECT)-xcf02s.mcs $(PROJECT)-xcf04s.mcs
        impact -batch xc3s1500.batch.tmp
        @rm xc3s1500.batch.tmp
 
 flash: $(PROJECT)-xcf02s.mcs $(PROJECT)-xcf04s.mcs

-       @sed -e "s|%CABLE%|$(CABLE)|g" xcf.batch >xcf.batch.tmp
+       @sed -e "s|%CABLE%|$(CABLE)|g" -e "s|%PROJECT%|$(PROJECT)|g" ../common/xcf.batch >xcf.batch.tmp

        impact -batch xcf.batch.tmp
        @rm xcf.batch.tmp
 
        impact -batch xcf.batch.tmp
        @rm xcf.batch.tmp
 

diff --git a/common/xc3s1500.batch b/common/xc3s1500.batch
index 2671e040a4017f7b5e6c2b3006971e7855162142..90228dd8a69e09d7637ff3c3d6b4c9f868692463 100644 (file)
--- a/common/xc3s1500.batch
+++ b/common/xc3s1500.batch
@@ -1,6 +1,6 @@
 setmode -bscan 
 setcable -p %CABLE%
 identify
 setmode -bscan 
 setcable -p %CABLE%
 identify

-assignFile -p 3 -file raggedstone.bit
+assignFile -p 3 -file %PROJECT%.bit

 program -p 3
 quit
 program -p 3
 quit

diff --git a/common/xcf.batch b/common/xcf.batch
index a4fad2b2be05521c2c97d65f50e81591e073ddf0..6b9acdba734323a2de3f6508bbb7a83bd70c9d1d 100644 (file)
--- a/common/xcf.batch
+++ b/common/xcf.batch
@@ -1,8 +1,8 @@
 setmode -bscan 
 setcable -p %CABLE%
 identify
 setmode -bscan 
 setcable -p %CABLE%
 identify

-assignFile -p 1 -file raggedstone-xcf02s.mcs
-assignFile -p 2 -file raggedstone-xcf04s.mcs
+assignFile -p 1 -file %PROJECT%-xcf02s.mcs
+assignFile -p 2 -file %PROJECT%-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/Makefile b/heartbeat/Makefile
index 37710430636a3c40a0dbd015ee76fb86024f70fb..0bf5c9800db4b0a44c50d1639b4fb9cecfbc1090 100644 (file)
--- a/heartbeat/Makefile
+++ b/heartbeat/Makefile
@@ -1,3 +1,3 @@
 PROJECT := raggedstone
 
 PROJECT := raggedstone
 

-include ../Makefile.common
+include ../common/Makefile.common