X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=b17708b6828a04a25abb1eb6f8a1aa1b7e6cef4b;hp=7912810fee643088021bfeb2807b0650e963d518;hb=d0d48d9cdb77bee064236d148002f98f3c247121;hpb=2f150be975db20a127c21351bf6cb4b8d3c12511

diff --git a/firmware/Makefile b/firmware/Makefile
index 7912810..b17708b 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,13 +1,35 @@
 
 PORT=/dev/ttyUSB0
-BSL=tos-bsl --invert-reset --invert-test -c $(PORT)
+BSL=msp430-bsl --invert-reset --invert-test -c $(PORT) --speed=38400
 
-CC=msp430-gcc -g -mmcu=msp430x1611 -DGCC
+#mcu=msp430x1611
+mcu=msp430x1612
 
-app=blink
+#ldscript is wonky
+GCCINC=-T ldscripts/161x.x
 
-install: $(app)
-	$(BSL) -e -p $(app)
-	$(BSL) -P $(app) -g 0x4000
+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/msp430f1612.o lib/command.o apps/jtag/jtag430asm.o
+app=goodfet
+
+all: $(app).hex
+
+goodfet.hex: goodfet
+
+run:
+	../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
+m4s: $(app).hex
+	msp430-objdump -D -m msp430 $(app).hex | m4s init
 erase:
 	$(BSL) -e 
+clean:
+	rm -f $(app) $(app).hex $(libs) $(apps)