projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaning old code.
[goodfet]
/
firmware
/
Makefile
diff --git
a/firmware/Makefile
b/firmware/Makefile
index
36c0cdf
..
a3ffacd
100644
(file)
--- a/
firmware/Makefile
+++ b/
firmware/Makefile
@@
-1,37
+1,31
@@
+-include config.mk
+
+
+platform?=goodfet
+mcu?=RUNCONFIG
#include `uname`.mak
#include `uname`.mak
-GOODFET?=/dev/tty
USB0
+GOODFET?=/dev/tty
.usbser*
#For tos-bsl, use --invert-reset --invert-test
#For tos-bsl, use --invert-reset --invert-test
-BSL?=goodfet.bsl --speed=38400
+MSP430BSL?=goodfet.bsl --speed=38400
+JTAG=msp430-jtag
-#One of these should be defined explicitly.
-#Default removed because of confusion.
-#mcu?=msp430x2274
-#mcu?=msp430x2618
-#mcu?=msp430x1612
-mcu?=RUNCONFIG
+GCCINC?=
-#platform=goodfet
-#platform=telosb
-#platform=z1
-#platform=nhbadge
-#platform=nhbadgeb
-platform?=goodfet
-
-#N.B., gcc WILL NOT BITCH if this file doesn't exist.
-#GCCINC=-T ldscripts/161x.x
-GCCINC=-T ldscripts/$(mcu).x
+#All of these are ?= in order ot allow overriding.
+GCC?=msp430-gcc -mmcu=$(mcu)
+LDFLAGS?=-mmcu=$(mcu) #-Wl,-dT ldscripts/$(mcu).x
-CCEXTRA
?=
-CC
=msp430-gcc -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms
$(CCEXTRA)
+CCEXTRA
?= $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -Dboard=$(board) $(GCCINC) -I include -I platforms
+CC
=$(GCC) -Wall -O1 -fno-strict-aliasing -g
$(CCEXTRA)
# Available Applications
# ======================
# Below is a list of available applications and their descriptions.
# Available Applications
# ======================
# Below is a list of available applications and their descriptions.
-# PRODUCTION:
+# PRODUCTION:
# None have made it to production grade quality
# BETA:
# None have made it to production grade quality
# BETA:
@@
-70,38
+64,30
@@
CC=msp430-gcc -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) -D$(mcu) -D$(platfo
# Configurations
# ==============
# Configurations
# ==============
-# This is what you need to customize to specify which apps you want in your
-# firmware. The "config" variable is just a space-delimited list of apps you
-# want included. The makefile will take the list of apps and include all of
-# the proper code needed to build your desired firmware.
-
-# bare minimum
-# config = monitor
-
-# basic JTAG adapter
-# config = monitor jtag
+# This is what you need to customize to specify which apps you want in
+# your firmware. The "config" variable is just a space-delimited list
+# of apps you want included. The makefile will take the list of apps
+# and include all of the proper code needed to build your desired
+# firmware. This is generated by config.mk.
-# Chipcon hacking
-# config = monitor chipcon ccspi
-
-# Glitch research
-# config = monitor glitch
-
-# XScale PXA255 JTAG
-# config = monitor jtagxscale
+# New default.
+# ifeq ($(platform),tilaunchpad)
+# config ?= monitor chipcon i2c
+# else
+# config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi maxusb
+# endif
-# OpenOCD bit-bang device
-#config = monitor openocd
-#
Old Default C
onfig
-# config = monitor sbw chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
+#
Build the needed list of app and lib object files from the c
onfig
+apps=
-# New default.
-config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi
+ifeq ($(platform),tilaunchpad)
+libs= lib/$(platform).o lib/command.o lib/apps.o lib/msp430_serial.o
+#libs+=lib/setjmp.o
+else
+libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o lib/msp430.o lib/arduino.o
+endif
-# Build the needed list of app and lib object files from the config
-apps=
-libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o
hdrs=
ERR=
hdrs=
ERR=
@@
-117,6
+103,12
@@
ifeq ($(filter spi, $(config)), spi)
hdrs+= spi.h
endif
hdrs+= spi.h
endif
+# include twe app
+ifeq ($(filter twe, $(config)), twe)
+ apps+= apps/twe/twe.o
+ hdrs+= twe.h
+endif
+
# include base jtag if they specified it explicitly
ifeq ($(filter jtag, $(config)), jtag)
ifneq ($(filter apps/jtag/jtag.o, $(apps)), apps/jtag/jtag.o)
# include base jtag if they specified it explicitly
ifeq ($(filter jtag, $(config)), jtag)
ifneq ($(filter apps/jtag/jtag.o, $(apps)), apps/jtag/jtag.o)
@@
-125,6
+117,14
@@
ifeq ($(filter jtag, $(config)), jtag)
endif
endif
endif
endif
+# include MAX342x USB drivers.
+ifeq ($(filter maxusb, $(config)), maxusb)
+ ifneq ($(filter apps/usb/maxusb.o, $(apps)), apps/usb/maxusb.o)
+ apps+= apps/usb/maxusb.o
+ hdrs+= maxusb.h
+ endif
+endif
+
# include the sbw defs if they specified it
ifeq ($(filter sbw, $(config)), sbw)
# if they only specify sbw, include jtag
# include the sbw defs if they specified it
ifeq ($(filter sbw, $(config)), sbw)
# if they only specify sbw, include jtag
@@
-252,7
+252,7
@@
endif
# include adc app
ifeq ($(filter adc, $(config)), adc)
# include adc app
ifeq ($(filter adc, $(config)), adc)
- ifeq ($(mcu), msp430
x
2274)
+ ifeq ($(mcu), msp430
f
2274)
apps+= apps/adc/adc.o
hdrs+= adc.h
else
apps+= apps/adc/adc.o
hdrs+= adc.h
else
@@
-290,6
+290,12
@@
ifeq ($(filter ps2, $(config)), ps2)
hdrs+= ps2.h
endif
hdrs+= ps2.h
endif
+# include jscan app
+ifeq ($(filter jscan, $(config)), jscan)
+ apps+= apps/jscan/jscan.o
+ hdrs+= jscan.h
+endif
+
# Rules
app= goodfet
# Rules
app= goodfet
@@
-314,22
+320,42
@@
goodfet.hex: goodfet
run:
../client/goodfet.msp430 test
run:
../client/goodfet.msp430 test
+avrinstall: $(app).hex
+ #to be merged
+ avrdude -V -F -c stk500v1 -p m328p -b 57600 -P $(GOODFET) -U flash:w:$(app).hex
+
+ifeq ($(platform),tilaunchpad)
install: $(app).hex
install: $(app).hex
- $(BSL) -e -p $(app).hex
+ $(JTAG) -e -p $(app).hex
+verify:
+ $(JTAG) -v $(app).hex
+erase:
+ $(JTAG) -e $(app).hex
+else
+install: $(app).hex
+ $(MSP430BSL) -e -p $(app).hex
installinfo:
installinfo:
- $(BSL) -P $(app).hex -p info.txt || true #MSP430F2xx targets only, inelegant.
+ $(
MSP430
BSL) -P $(app).hex -p info.txt || true #MSP430F2xx targets only, inelegant.
verify:
verify:
- $(BSL) -P $(app).hex -v $(app).hex
+ $(MSP430BSL) -P $(app).hex -v $(app).hex
+erase:
+ $(MSP430BSL) -e
+
+endif
dumpinfo:
dumpinfo:
- $(BSL) --dumpinfo
+ $(
MSP430
BSL) --dumpinfo
$(app).c: config builddate appsfiles err
$(app).c: config builddate appsfiles err
-$(app): $(libs) $(apps)
+$(app): $(app).c $(libs) $(apps)
+
+ifeq ($(platform),donbfet)
+$(app).hex: $(app)
+ avr-objcopy -j .text -j .data -O ihex goodfet goodfet.hex
+else
$(app).hex: $(app)
msp430-objcopy goodfet -O ihex goodfet.hex
$(app).hex: $(app)
msp430-objcopy goodfet -O ihex goodfet.hex
+endif
m4s: $(app).hex
msp430-objdump -D -m msp430 $(app).hex | m4s init
m4s: $(app).hex
msp430-objdump -D -m msp430 $(app).hex | m4s init
-erase:
- $(BSL) -e
clean:
rm -f $(app) $(app).hex $(libs) $(apps) lib/apps.c include/config.h include/builddate.h include/apps.h
docs:
clean:
rm -f $(app) $(app).hex $(libs) $(apps) lib/apps.c include/config.h include/builddate.h include/apps.h
docs: