Checkpoint. CC flash works, might break it soon.

[goodfet] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 3e8271d..f9f6f7d 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,8 +1,10 @@
 
 #include `uname`.mak
-
 GOODFET?=/dev/ttyUSB0
-BSL=../../contrib/tos-bsl --invert-reset --invert-test -c $(GOODFET) --speed=38400
+
+
+#For tos-bsl, use --invert-reset --invert-test
+BSL=goodfet.bsl -c $(GOODFET) --speed=38400
 
 #mcu=msp430x2274
 #mcu=msp430x2618
@@ -13,11 +15,15 @@ mcu?=msp430x1612
 #GCCINC=-T ldscripts/161x.x
 GCCINC=-T ldscripts/$(mcu).x
 
-CC=msp430-gcc -Wall -g -mmcu=$(mcu) -DGCC $(GCCINC) -I include
+CCEXTRA?=
+CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)
+
+#Define extra modules here.
+moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o
 
-apps= apps/monitor/monitor.o apps/spi/spi.o apps/i2c/i2c.o apps/chipcon/chipcon.o apps/jtag/jtag.o apps/jtag/jtag430.o
+apps= $(moreapps) apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o
 libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
-app=goodfet
+app= goodfet
 
 all: $(app).hex
 
@@ -28,12 +34,12 @@ run:
 
 install: $(app).hex
        $(BSL) -e
-       #$(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
+       ls info.txt && $(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
        $(BSL) -p $(app).hex 
 verify:
        $(BSL) -P $(app).hex -v $(app).hex
 dumpinfo:
-       $(BSL) --dumpinfo -c /dev/ttyUSB0
+       $(BSL) --dumpinfo
 $(app): $(app).c $(libs) $(apps)
 $(app).hex: $(app)
        msp430-objcopy goodfet -O ihex goodfet.hex
@@ -43,3 +49,8 @@ erase:
        $(BSL) -e 
 clean:
        rm -f $(app) $(app).hex $(libs) $(apps)
+docs:
+       doxygen
+pushdocs: docs
+       rsync --exclude .svn -ave ssh doc/html/* travisutk,goodfet@web.sourceforge.net:htdocs/docs/
+.FAKE: docs