X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=07f1765a839e3c0cf4f9d33759f961477d266a67;hp=b96d358822acd75893872d0306e9ec971b6fc86a;hb=6f072793cc4dc84f2b2e6084b0440035b56e0f54;hpb=1afd03f424ab5da0a4c172d7c48814db3660a2f0 diff --git a/firmware/Makefile b/firmware/Makefile index b96d358..07f1765 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -1,37 +1,52 @@ +-include config.mk + + +platform?=goodfet + +# donb +ifeq ($(platform),donbfet) +GCC?=avr-gcc +mcu?=atmega644p +CFLAGS=$(DEBUG) -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields +endif + #include `uname`.mak -#GOODFET?=/dev/ttyUSB0 +GOODFET?=/dev/tty.usbser* +#For Arduino, +#BSL?=avrdude -V -F -c stk500v1 -p m328p -b 57600 -P /dev/tty.usbserial-* -U flash:w:blink.hex #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?=msp430x2618 #mcu?=msp430x1612 +#mcu?=atmega168 mcu?=RUNCONFIG -#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 +GCCINC?= + +#GCC?=avr-gcc +# We use -Wl,-dT because gcc adds the msp430mcu definitions at the +# very end of the command line, so they only have an effect for a +# default linker script +GCC?=msp430-gcc +LDFLAGS?=-Wl,-dT ldscripts/$(mcu).x -CCEXTRA?= -CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms $(CCEXTRA) +CCEXTRA?= $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) $(GCCINC) -I include -I platforms +CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) $(CCEXTRA) # Available Applications # ====================== # Below is a list of available applications and their descriptions. -# PRODUCTION: +# PRODUCTION: # None have made it to production grade quality # BETA: @@ -50,6 +65,7 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat # jtagarm7 -- ARM7TDMI JTAG # ejtag -- MIPS JTAG # jtagxscale -- XScale JTAG +# openocd -- OpenOCD bitbang device # Microcontrollers: # chipcon -- Chipcon radio 8051 debugging @@ -89,16 +105,30 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat # XScale PXA255 JTAG # config = monitor jtagxscale +# OpenOCD bit-bang device +#config = monitor openocd + # Old Default Config -#config = monitor sbw chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr +# config = monitor sbw chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr # New default. -config = monitor chipcon nrf spi jtagarm7 jtag430 jtag430x2 avr +ifeq ($(platform),tilaunchpad) +config ?= monitor chipcon i2c +else +config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi +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 +apps= + +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 + hdrs= ERR= @@ -114,6 +144,12 @@ ifeq ($(filter spi, $(config)), spi) 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) @@ -218,6 +254,17 @@ ifeq ($(filter jtagxscale, $(config)), jtagxscale) hdrs+= jtagxscale.h endif +# include openocd app +ifeq ($(filter openocd, $(config)), openocd) + # add in base jtag code if not already + ifneq ($(filter apps/jtag/jtag.o, $(apps)), apps/jtag/jtag.o) + apps+= apps/jtag/jtag.o + hdrs+= jtag.h + endif + apps+= apps/jtag/openocd.o + hdrs+= openocd.h +endif + # include chipcon app ifeq ($(filter chipcon, $(config)), chipcon) apps+= apps/chipcon/chipcon.o @@ -230,8 +277,6 @@ ifeq ($(filter avr, $(config)), avr) hdrs+= avr.h endif - - # include pic app ifeq ($(filter pic, $(config)), pic) apps+= apps/pic/pic.o @@ -278,6 +323,12 @@ ifeq ($(filter ps2, $(config)), ps2) hdrs+= ps2.h endif +# include jscan app +ifeq ($(filter jscan, $(config)), jscan) + apps+= apps/jscan/jscan.o + hdrs+= jscan.h +endif + # Rules app= goodfet @@ -302,22 +353,42 @@ goodfet.hex: goodfet 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 + $(JTAG) -e -p $(app).hex +verify: + $(JTAG) -v $(app).hex +erase: + $(JTAG) -e $(app).hex +else install: $(app).hex - $(BSL) -e -p $(app).hex + $(MSP430BSL) -e -p $(app).hex installinfo: - $(BSL) -P $(app).hex -p info.txt || true #MSP430F2xx targets only, inelegant. + $(MSP430BSL) -P $(app).hex -p info.txt || true #MSP430F2xx targets only, inelegant. verify: - $(BSL) -P $(app).hex -v $(app).hex + $(MSP430BSL) -P $(app).hex -v $(app).hex +erase: + $(MSP430BSL) -e + +endif dumpinfo: - $(BSL) --dumpinfo + $(MSP430BSL) --dumpinfo $(app).c: config builddate appsfiles err -$(app): $(app).c $(libs) $(apps) +$(app): $(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 +endif 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: