X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=55953d2805ed62522de0b7e9c52d4ddcf0f9f3e2;hp=9b738830ba34f414437c237eb87c0b9d1fb69b07;hb=d2478c7eeb0a3b55d4ab7746a65faf3212857cf3;hpb=511125f08e1abbb0160c70062aec514154367383

diff --git a/firmware/Makefile b/firmware/Makefile
index 9b73883..55953d2 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -4,7 +4,7 @@ GOODFET?=/dev/ttyUSB0
 
 
 #For tos-bsl, use --invert-reset --invert-test
-BSL=goodfet.bsl -c $(GOODFET) --speed=38400
+BSL?=goodfet.bsl -c $(GOODFET) --speed=38400
 
 
 #One of these should be defined explicitly.
@@ -23,14 +23,18 @@ 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
+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
-libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.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 apps/jtag/jtagxscale.o
+libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o apps/chipcon/chipconasm.o
 app= goodfet
 
 all: $(app).hex
 
+lib/.o:
+	./configure
+	false
 lib/RUNCONFIG.o:
 	./configure
 	false