X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=41c9edf522641e4f9f58efab89ed77fb7694a1c6;hp=75ada153f0604c921ffa474d1897c85c51ce2c81;hb=32f20cd81c67f9cfb9bd11b9b62942ff60d9b2f4;hpb=4ad169e89a063394cbc38963eba6fdd0b52ceba4

diff --git a/firmware/Makefile b/firmware/Makefile
index 75ada15..41c9edf 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,20 +1,27 @@
 
-PORT=/dev/ttyUSB0
-BSL=../../contrib/tos-bsl --invert-reset --invert-test -c $(PORT) --speed=38400
+#include `uname`.mak
 
+GOODFET?=/dev/ttyUSB0
+BSL=../../contrib/tos-bsl --invert-reset --invert-test -c $(GOODFET) --speed=38400
+
+#mcu=msp430x2274
 #mcu=msp430x2618
-mcu=msp430x1612
+mcu?=msp430x1612
 
 
 #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
+CCEXTRA?=
+CC=msp430-gcc -Wall -g -mmcu=$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)
+
+#Define extra modules here.
+moreapps?=
 
-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
+apps= $(moreapps) apps/monitor/monitor.o apps/spi/spi.o apps/i2c/i2c.o apps/chipcon/chipcon.o apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o
 libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
-app=goodfet
+app= goodfet
 
 all: $(app).hex
 
@@ -30,7 +37,7 @@ install: $(app).hex
 verify:
 	$(BSL) -P $(app).hex -v $(app).hex
 dumpinfo:
-	$(BSL) --dumpinfo -c /dev/ttyUSB0
+	$(BSL) --dumpinfo
 $(app): $(app).c $(libs) $(apps)
 $(app).hex: $(app)
 	msp430-objcopy goodfet -O ihex goodfet.hex