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

diff --git a/firmware/Makefile b/firmware/Makefile
index 443d016..9fbf41c 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,13 +24,21 @@ 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
+# should include apps/pic/dspic33f.o to build support for PIC24H/dsPIC33F
+
+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  lib/dco_calib.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/.o:
+	./configure
+	false
 lib/RUNCONFIG.o:
 	./configure
 	false