projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPI stuff, cleaned whitespace.
[goodfet]
/
firmware
/
Makefile
diff --git
a/firmware/Makefile
b/firmware/Makefile
index
f0c2345
..
9b73883
100644
(file)
--- a/
firmware/Makefile
+++ b/
firmware/Makefile
@@
-1,39
+1,49
@@
#include `uname`.mak
#include `uname`.mak
-
GOODFET?=/dev/ttyUSB0
GOODFET?=/dev/ttyUSB0
-BSL=../../contrib/tos-bsl --invert-reset --invert-test -c $(GOODFET) --speed=38400
+
+
+#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=msp430x2274
#mcu=msp430x2618
-mcu?=msp430x1612
-
+
#
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?=
#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 -
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.
#Define extra modules here.
-moreapps?=
+moreapps?=
apps/i2c/i2c.o apps/chipcon/chipcon.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
+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
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
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) -p $(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:
verify:
$(BSL) -P $(app).hex -v $(app).hex
dumpinfo:
@@
-47,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