projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitespace stuff.
[goodfet]
/
firmware
/
Makefile
diff --git
a/firmware/Makefile
b/firmware/Makefile
index
86e794b
..
d0bffc7
100644
(file)
--- a/
firmware/Makefile
+++ b/
firmware/Makefile
@@
-16,6
+16,8
@@
mcu?=RUNCONFIG
#platform=goodfet
#platform=telosb
#platform=z1
#platform=goodfet
#platform=telosb
#platform=z1
+#platform=nhbadge
+#platform=nhbadgeb
platform?=goodfet
#N.B., gcc WILL NOT BITCH if this file doesn't exist.
platform?=goodfet
#N.B., gcc WILL NOT BITCH if this file doesn't exist.
@@
-91,7
+93,7
@@
CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
#config = monitor sbw chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
# New default.
#config = monitor sbw chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
# New default.
-config
= monitor chipcon
nrf spi jtagarm7 jtag430 jtag430x2 avr
+config
?= monitor chipcon ccspi
nrf spi jtagarm7 jtag430 jtag430x2 avr
# Build the needed list of app and lib object files from the config
# Build the needed list of app and lib object files from the config
@@
-128,6
+130,7
@@
ifeq ($(filter sbw, $(config)), sbw)
hdrs+= jtag.h
endif
apps+= apps/jtag/sbw.o
hdrs+= jtag.h
endif
apps+= apps/jtag/sbw.o
+ hdrs+= sbw.h
endif
# include jtag430 app
endif
# include jtag430 app
@@
-227,6
+230,8
@@
ifeq ($(filter avr, $(config)), avr)
hdrs+= avr.h
endif
hdrs+= avr.h
endif
+
+
# include pic app
ifeq ($(filter pic, $(config)), pic)
apps+= apps/pic/pic.o
# include pic app
ifeq ($(filter pic, $(config)), pic)
apps+= apps/pic/pic.o
@@
-306,7
+311,7
@@
verify:
dumpinfo:
$(BSL) --dumpinfo
$(app).c: config builddate appsfiles err
dumpinfo:
$(BSL) --dumpinfo
$(app).c: config builddate appsfiles err
-$(app):
$(app).c
$(libs) $(apps)
+$(app): $(libs) $(apps)
$(app).hex: $(app)
msp430-objcopy goodfet -O ihex goodfet.hex
m4s: $(app).hex
$(app).hex: $(app)
msp430-objcopy goodfet -O ihex goodfet.hex
m4s: $(app).hex