X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=83ee2127178785dd2a4d99bb968967eaa250c7a5;hp=2e7b08b52285d2f2bd74185e4c1a835f6c79f41a;hb=f217c730250832ae74a60b9d494111eac3763fd6;hpb=3924e6c10611bfeb4c3970a91bbe66c5ba7de6f2

diff --git a/firmware/Makefile b/firmware/Makefile
index 2e7b08b..83ee212 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,10 +1,10 @@
 
 #include `uname`.mak
-GOODFET?=/dev/ttyUSB0
+#GOODFET?=/dev/ttyUSB0
 
 
 #For tos-bsl, use --invert-reset --invert-test
-BSL?=goodfet.bsl -c $(GOODFET) --speed=38400
+BSL?=goodfet.bsl --speed=38400
 
 
 #One of these should be defined explicitly.
@@ -24,9 +24,13 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -DGCC $(GCCINC) -I include $(CC
 
 #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/chipcon/chipconasm.o removed
+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 apps/jtag/jtagarm7tdmi-disabled.o
-libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o apps/chipcon/chipconasm.o
 app= goodfet
 
 all: $(app).hex