Platform definitions.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@619 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/firmware/Makefile b/firmware/Makefile
index 7f94842..c674531 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -3,6 +3,7 @@
 #GOODFET?=/dev/ttyUSB0
 
 
+
 #For tos-bsl, use --invert-reset --invert-test
 BSL?=goodfet.bsl --speed=38400
 
@@ -15,12 +16,17 @@ BSL?=goodfet.bsl --speed=38400
 #mcu?=msp430x1612
 mcu?=RUNCONFIG
 
+#platform=goodfet
+#platform=telosb
+#platform=z1
+platform?=goodfet
+
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.
 #GCCINC=-T ldscripts/161x.x
 GCCINC=-T ldscripts/$(mcu).x
 
 CCEXTRA?=
-CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)
+CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -Dplatform=$(platform) -DGCC $(GCCINC) -I include $(CCEXTRA)
 
 #Define extra modules here.
 #moreapps?=apps/i2c/i2c.o  apps/glitch/glitch.o apps/jtag/sbw.o apps/smartcard/smartcard.o apps/jtag/ejtag.o apps/jtag/jtagxscale.o
@@ -28,7 +34,6 @@ moreapps?=apps/jtag/sbw.o
 # should include apps/jtag/jtagarm7tdmi.o to build jtag for ARM7
 # should include apps/pic/dspic33f.o to build support for PIC24H/dsPIC33F
 
-
 apps= $(moreapps) apps/chipcon/chipcon.o apps/radios/nrf.o apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o 
 
 #apps/chipcon/chipconasm.o removed
@@ -44,16 +49,16 @@ lib/.o:
 lib/RUNCONFIG.o:
        ./configure
        false
-
+include/config.h:
+       cp platforms/$(platform).h include/config.h
 goodfet.hex: goodfet
 
 run:
        ../client/goodfet.msp430 test
 
 install: $(app).hex
-       #$(BSL) -e
-       ls info.txt && $(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
        $(BSL) -e -p $(app).hex 
+       ls info.txt && $(BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
 verify:
        $(BSL) -P $(app).hex -v $(app).hex
 dumpinfo:
@@ -66,9 +71,9 @@ m4s: $(app).hex
 erase:
        $(BSL) -e 
 clean:
-       rm -f $(app) $(app).hex $(libs) $(apps)
+       rm -f $(app) $(app).hex $(libs) $(apps) include/config.h
 docs:
        doxygen
 pushdocs: docs
        rsync --exclude .svn -ave ssh doc/html/* travisutk,goodfet@web.sourceforge.net:htdocs/docs/
-.FAKE: docs
+.FAKE: docs include/config.h

diff --git a/firmware/platforms/README.txt b/firmware/platforms/README.txt
new file mode 100644 (file)
index 0000000..8d075a1
--- /dev/null
+++ b/firmware/platforms/README.txt
@@ -0,0 +1,8 @@
+goodfet.h GoodFET hardware and neighborly clones.
+telosb.h  MSP430F1612-based Telos B and its clones.
+z1.h     Zolertia Z1, an MSP430F2617 mote.
+
+
+TODO:
+TRF7960 Dev Board
+

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/firmware/platforms/goodfet.h
@@ -0,0 +1 @@
+

diff --git a/firmware/platforms/telosb.h b/firmware/platforms/telosb.h
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/firmware/platforms/telosb.h
@@ -0,0 +1 @@
+

diff --git a/firmware/platforms/z1.h b/firmware/platforms/z1.h
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/firmware/platforms/z1.h
@@ -0,0 +1 @@
+

diff --git a/firmware/tests/echo/Makefile b/firmware/tests/echo/Makefile
index bcb9a93..86e4f2c 100644 (file)
--- a/firmware/tests/echo/Makefile
+++ b/firmware/tests/echo/Makefile
@@ -1,22 +1,25 @@
 
-PORT=/dev/ttyUSB0
-BSL=tos-bsl --invert-reset --invert-test -c $(PORT)
+
+BSL=goodfet.bsl
 
 #mcu=msp430x1611
-mcu=msp430x2618
+mcu?=msp430x2618
 
 #ldscript is wonky
 #GCCINC=-T ../../ldscripts/161x.x
 
 CC=msp430-gcc -g -mmcu=$(mcu) -DGCC $(GCCINC) -I ../../include
 
-libs=../../lib/msp430x2618.c
+libs=../../lib/$(mcu).c
 app=echo
 
 install: $(app)
-       $(BSL) -e -p $(app) 
-       $(BSL) -P $(app) -r
+       $(BSL) -e -p $(app).hex 
+       $(BSL) -P $(app).hex -r
+all: $(app).hex
 $(app): $(app).c $(libs)
+$(app).hex: $(app)
+       msp430-objcopy -O ihex $(app) $(app).hex
 erase:
        $(BSL) -e 
 clean: