X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=f4e66274b05aaf3c7635e482e280b0da96b6e86d;hp=f9f6f7dfeb138531bbd38e23dafafa5bb303c099;hb=eddb0eb08f187dc156a6cb51878104df67d97436;hpb=d8eef3ccb487fb87b2aca1dc6a0bd9b9bbe31861

diff --git a/firmware/Makefile b/firmware/Makefile
index f9f6f7d..f4e6627 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -6,10 +6,14 @@ GOODFET?=/dev/ttyUSB0
 #For tos-bsl, use --invert-reset --invert-test
 BSL=goodfet.bsl -c $(GOODFET) --speed=38400
 
+
+#One of these should be defined explicitly.
+#Default removed because of confusion.
+
 #mcu=msp430x2274
 #mcu=msp430x2618
-mcu?=msp430x1612
-
+#mcu?=msp430x1612
+mcu?=RUNCONFIG
 
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.
 #GCCINC=-T ldscripts/161x.x
@@ -19,7 +23,7 @@ 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
+moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o apps/glitch/glitch.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
 libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
@@ -27,15 +31,19 @@ app= goodfet
 
 all: $(app).hex
 
+lib/RUNCONFIG.o:
+	./configure
+	false
+
 goodfet.hex: goodfet
 
 run:
 	../client/goodfet.msp430 test
 
 install: $(app).hex
-	$(BSL) -e
-	ls info.txt && $(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
-	$(BSL) -p $(app).hex 
+	#$(BSL) -e
+	#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
 dumpinfo: