Nearing support for the MSP430F2618 in lieu of the 1612.

[goodfet] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 2d831e4..75ada15 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,17 +1,19 @@
 
 PORT=/dev/ttyUSB0
-BSL=msp430-bsl --invert-reset --invert-test -c $(PORT) --speed=38400
+BSL=../../contrib/tos-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
@@ -22,8 +24,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 -c /dev/ttyUSB0
 $(app): $(app).c $(libs) $(apps)
 $(app).hex: $(app)
        msp430-objcopy goodfet -O ihex goodfet.hex
@@ -32,4 +39,4 @@ m4s: $(app).hex
 erase:
        $(BSL) -e 
 clean:
-       rm -f $(app)
+       rm -f $(app) $(app).hex $(libs) $(apps)