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

diff --git a/firmware/Makefile b/firmware/Makefile
index 3e8271d..3220c1a 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -2,7 +2,10 @@
 #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
 
 #mcu=msp430x2274
 #mcu=msp430x2618
@@ -13,11 +16,15 @@ mcu?=msp430x1612
 #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 -g -mmcu=$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)
+
+#Define extra modules here.
+moreapps?=
 
-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
+apps= $(moreapps) apps/monitor/monitor.o apps/spi/spi.o apps/i2c/i2c.o apps/chipcon/chipcon.o apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o
 libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
-app=goodfet
+app= goodfet
 
 all: $(app).hex
 
@@ -28,12 +35,12 @@ run:
 
 install: $(app).hex
 	$(BSL) -e
-	#$(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
+	ls info.txt && $(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
 	$(BSL) -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