X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=88411067830d21b2ba720c1ea48016d223ec8637;hp=3e8271db10788d2d73c18fc7036baf753fd6ef04;hb=e192ebab56a698ab6c9822f8667a4a94542a7690;hpb=9fff819ee3088834ef10c050bcdc0bc5f93dcd2a

diff --git a/firmware/Makefile b/firmware/Makefile
index 3e8271d..8841106 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,39 +1,60 @@
 
 #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)
+
+#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
+# should include apps/jtag/jtagarm7tdmi.o to build jtag for ARM7
+
+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 apps/jtag/jtagxscale.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
-libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
-app=goodfet
+#apps/chipcon/chipconasm.o removed
+libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o 
+
+app= goodfet
 
 all: $(app).hex
 
+lib/.o:
+	./configure
+	false
+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:
-	$(BSL) --dumpinfo -c /dev/ttyUSB0
+	$(BSL) --dumpinfo
 $(app): $(app).c $(libs) $(apps)
 $(app).hex: $(app)
 	msp430-objcopy goodfet -O ihex goodfet.hex
@@ -43,3 +64,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