projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Executable property on scripts.
[goodfet]
/
firmware
/
Makefile
diff --git
a/firmware/Makefile
b/firmware/Makefile
index
44b60da
..
9b73883
100644
(file)
--- a/
firmware/Makefile
+++ b/
firmware/Makefile
@@
-1,30
+1,53
@@
-PORT=/dev/ttyUSB0
-
BSL=msp430-bsl --invert-reset --invert-test -c $(PORT) --speed=3840
0
+#include `uname`.mak
+
GOODFET?=/dev/ttyUSB
0
-#mcu=msp430x2618
-mcu=msp430x1612
+
+#For tos-bsl, use --invert-reset --invert-test
+BSL=goodfet.bsl -c $(GOODFET) --speed=38400
+#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
#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 -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=
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/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
libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
-app=goodfet
+app=
goodfet
all: $(app).hex
all: $(app).hex
+lib/RUNCONFIG.o:
+ ./configure
+ false
+
goodfet.hex: goodfet
run:
../client/goodfet.msp430 test
install: $(app).hex
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
$(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
$(app): $(app).c $(libs) $(apps)
$(app).hex: $(app)
msp430-objcopy goodfet -O ihex goodfet.hex
@@
-34,3
+57,8
@@
erase:
$(BSL) -e
clean:
rm -f $(app) $(app).hex $(libs) $(apps)
$(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