X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=44b60daa8402d69207a555b6d40f749fa33776c8;hp=f1607d63f2b3ccba703aa9509fa5f3f902eb5d7d;hb=3e2cb34748f8b81f2b584da8174fce3bbcd5ae9e;hpb=c4f077f724f9320a12605271722f61932b4c663c

diff --git a/firmware/Makefile b/firmware/Makefile
index f1607d6..44b60da 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,17 +1,19 @@
 
 PORT=/dev/ttyUSB0
-BSL=tos-bsl --invert-reset --invert-test -c $(PORT) --speed=38400
+BSL=msp430-bsl --invert-reset --invert-test -c $(PORT) --speed=38400
 
-#mcu=msp430x1611
+#mcu=msp430x2618
 mcu=msp430x1612
 
-#ldscript is wonky
-GCCINC=-T ldscripts/161x.x
 
-CC=msp430-gcc -g -mmcu=$(mcu) -DGCC $(GCCINC) -I include
+#N.B., gcc WILL NOT BITCH if this file doesn't exist.
+#GCCINC=-T ldscripts/161x.x
+GCCINC=-T ldscripts/$(mcu).x
 
-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
+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
@@ -19,11 +21,10 @@ all: $(app).hex
 goodfet.hex: goodfet
 
 run:
-	../../client/goodfet.msp430
+	../client/goodfet.msp430 test
 
 install: $(app).hex
 	$(BSL) -e -p $(app).hex 
-	$(BSL) -P $(app).hex -r
 $(app): $(app).c $(libs) $(apps)
 $(app).hex: $(app)
 	msp430-objcopy goodfet -O ihex goodfet.hex
@@ -32,4 +33,4 @@ m4s: $(app).hex
 erase:
 	$(BSL) -e 
 clean:
-	rm -f $(app)
+	rm -f $(app) $(app).hex $(libs) $(apps)