projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unnecessary definition.
[goodfet]
/
firmware
/
Makefile
diff --git
a/firmware/Makefile
b/firmware/Makefile
index
f9f6f7d
..
8e3b1ea
100644
(file)
--- a/
firmware/Makefile
+++ b/
firmware/Makefile
@@
-4,12
+4,16
@@
GOODFET?=/dev/ttyUSB0
#For tos-bsl, use --invert-reset --invert-test
#For tos-bsl, use --invert-reset --invert-test
-BSL=goodfet.bsl -c $(GOODFET) --speed=38400
+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
#N.B., gcc WILL NOT BITCH if this file doesn't exist.
#GCCINC=-T ldscripts/161x.x
@@
-19,23
+23,27
@@
CCEXTRA?=
CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)
#Define extra modules here.
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
+moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o
apps/glitch/glitch.o apps/jtag/sbw.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
+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
apps/jtag/ejtag.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: