X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=f9f6f7dfeb138531bbd38e23dafafa5bb303c099;hp=231745834f16ed91ac20c63b4a2e156a05b72ec0;hb=94fe2500d21c2c329f8a70f654e6fac0faf5730b;hpb=6ee7ff03148c7af2a50695337910e7fd6906d476

diff --git a/firmware/Makefile b/firmware/Makefile
index 2317458..f9f6f7d 100644
--- 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
@@ -14,12 +16,12 @@ mcu?=msp430x1612
 GCCINC=-T ldscripts/$(mcu).x
 
 CCEXTRA?=
-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?=
+moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o
 
-apps= $(moreapps) 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
 
@@ -32,7 +34,7 @@ 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
@@ -47,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