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

diff --git a/firmware/Makefile b/firmware/Makefile
index 3e8271d..f0c2345 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -13,11 +13,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)
 
-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
+#Define extra modules here.
+moreapps?=
+
+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 +32,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