X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=7f94842431c4d2dc8ab47725aa7de2105a691828;hp=a92574bb7b12680570b59f22901c560f4a0d939d;hb=dd259c9289deb11e84be93647c144192e5ba10b6;hpb=5e18fb77f7a1bb37e805ac8941c1a6a59c631903

diff --git a/firmware/Makefile b/firmware/Makefile
index a92574b..7f94842 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.
@@ -23,14 +23,24 @@ 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
+#moreapps?=apps/i2c/i2c.o  apps/glitch/glitch.o apps/jtag/sbw.o apps/smartcard/smartcard.o apps/jtag/ejtag.o apps/jtag/jtagxscale.o
+moreapps?=apps/jtag/sbw.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/chipcon/chipcon.o apps/radios/nrf.o 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/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 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
 
+lib/.o:
+	./configure
+	false
 lib/RUNCONFIG.o:
 	./configure
 	false
@@ -42,7 +52,7 @@ run:
 
 install: $(app).hex
 	#$(BSL) -e
-	#ls info.txt && $(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
+	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