Cleared compiler warning messages for port redefinitions, now that this is cleanly...

[goodfet] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 7912810..9b73883 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,13 +1,64 @@
 
-PORT=/dev/ttyUSB0
-BSL=tos-bsl --invert-reset --invert-test -c $(PORT)
+#include `uname`.mak
+GOODFET?=/dev/ttyUSB0
 
-CC=msp430-gcc -g -mmcu=msp430x1611 -DGCC
 
-app=blink
+#For tos-bsl, use --invert-reset --invert-test
+BSL=goodfet.bsl -c $(GOODFET) --speed=38400
 
-install: $(app)
-       $(BSL) -e -p $(app)
-       $(BSL) -P $(app) -g 0x4000
+
+#One of these should be defined explicitly.
+#Default removed because of confusion.
+
+#mcu=msp430x2274
+#mcu=msp430x2618
+#mcu?=msp430x1612
+mcu?=RUNCONFIG
+
+#N.B., gcc WILL NOT BITCH if this file doesn't exist.
+#GCCINC=-T ldscripts/161x.x
+GCCINC=-T ldscripts/$(mcu).x
+
+CCEXTRA?=
+CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)
+
+#Define extra modules here.
+moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o
+
+apps= $(moreapps) apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o
+libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
+app= goodfet
+
+all: $(app).hex
+
+lib/RUNCONFIG.o:
+       ./configure
+       false
+
+goodfet.hex: goodfet
+
+run:
+       ../client/goodfet.msp430 test
+
+install: $(app).hex
+       #$(BSL) -e
+       #ls info.txt && $(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
+       $(BSL) -e -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
+m4s: $(app).hex
+       msp430-objdump -D -m msp430 $(app).hex | m4s init
 erase:
        $(BSL) -e 
+clean:
+       rm -f $(app) $(app).hex $(libs) $(apps)
+docs:
+       doxygen
+pushdocs: docs
+       rsync --exclude .svn -ave ssh doc/html/* travisutk,goodfet@web.sourceforge.net:htdocs/docs/
+.FAKE: docs