X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=443d016ca04bef983b288db243d3e6883dd0dd08;hp=4e4cbc47b9f97c4d247003c0de265482e273883e;hb=a05528f44a36773d3bb3cf642dcb77bca79c5a33;hpb=c5f9be41f72eaddb734b78396ee4bf7bd6273439

diff --git a/firmware/Makefile b/firmware/Makefile
index 4e4cbc4..443d016 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,35 +1,49 @@
 
 #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
+
+
+#One of these should be defined explicitly.
+#Default removed because of confusion.
 
 #mcu=msp430x2274
 #mcu=msp430x2618
-mcu?=msp430x1612
-
+#mcu?=msp430x1612
+mcu?=RUNCONFIG
 
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.
 #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)
 
-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
-libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
-app=goodfet
+#Define extra modules here.
+moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o apps/glitch/glitch.o apps/jtag/sbw.o apps/smartcard/smartcard.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 apps/jtag/ejtag.o
+libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o apps/chipcon/chipconasm.o
+app= goodfet
 
 all: $(app).hex
 
+lib/RUNCONFIG.o:
+	./configure
+	false
+
 goodfet.hex: goodfet
 
 run:
 	../client/goodfet.msp430 test
 
 install: $(app).hex
-	$(BSL) -e
-	#$(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
-	$(BSL) -p $(app).hex 
+	#$(BSL) -e
+	#ls info.txt && $(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
+	$(BSL) -e -p $(app).hex 
 verify:
 	$(BSL) -P $(app).hex -v $(app).hex
 dumpinfo:
@@ -43,3 +57,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