X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=4e4cbc47b9f97c4d247003c0de265482e273883e;hp=2d831e4be0b55db690f14379aab42d89499d04a6;hb=c98b9c687e78bc3e3708074f286b481a35370a07;hpb=b2b50319ab5ac602acc91963f366ed53ee5d434b

diff --git a/firmware/Makefile b/firmware/Makefile
index 2d831e4..4e4cbc4 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,17 +1,22 @@
 
-PORT=/dev/ttyUSB0
-BSL=msp430-bsl --invert-reset --invert-test -c $(PORT) --speed=38400
+#include `uname`.mak
 
-#mcu=msp430x1611
-mcu=msp430x1612
+GOODFET?=/dev/ttyUSB0
+BSL=../../contrib/tos-bsl --invert-reset --invert-test -c $(GOODFET) --speed=38400
 
-#ldscript is wonky
-GCCINC=-T ldscripts/161x.x
+#mcu=msp430x2274
+#mcu=msp430x2618
+mcu?=msp430x1612
 
-CC=msp430-gcc -g -mmcu=$(mcu) -DGCC $(GCCINC) -I include
 
-apps= apps/monitor/monitor.c apps/spi/spi.c apps/i2c/i2c.c apps/chipcon/chipcon.c apps/jtag/jtag.c apps/jtag/jtag430.c
-libs= lib/msp430f1612.c lib/command.c
+#N.B., gcc WILL NOT BITCH if this file doesn't exist.
+#GCCINC=-T ldscripts/161x.x
+GCCINC=-T ldscripts/$(mcu).x
+
+CC=msp430-gcc -Wall -g -mmcu=$(mcu) -DGCC $(GCCINC) -I include
+
+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
+libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
 app=goodfet
 
 all: $(app).hex
@@ -22,8 +27,13 @@ run:
 	../client/goodfet.msp430 test
 
 install: $(app).hex
-	$(BSL) -e -p $(app).hex 
-	$(BSL) -P $(app).hex -r
+	$(BSL) -e
+	#$(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
+	$(BSL) -p $(app).hex 
+verify:
+	$(BSL) -P $(app).hex -v $(app).hex
+dumpinfo:
+	$(BSL) --dumpinfo
 $(app): $(app).c $(libs) $(apps)
 $(app).hex: $(app)
 	msp430-objcopy goodfet -O ihex goodfet.hex
@@ -32,4 +42,4 @@ m4s: $(app).hex
 erase:
 	$(BSL) -e 
 clean:
-	rm -f $(app)
+	rm -f $(app) $(app).hex $(libs) $(apps)