X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=2a0ad6f52feb11753307bd13e541b4417150d3d9;hp=93ee93c836a06597944cd4f674e0b0cde171ec6a;hb=e905c90c50293dd607f00ef2395f50a653585808;hpb=88da22de367f4d959d31f1b5363e2a8e22109451 diff --git a/firmware/Makefile b/firmware/Makefile index 93ee93c..2a0ad6f 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -1,35 +1,34 @@ +-include config.mk + + +platform?=goodfet +mcu?=RUNCONFIG #include `uname`.mak -#GOODFET?=/dev/ttyUSB0 +GOODFET?=/dev/tty.usbser* #For tos-bsl, use --invert-reset --invert-test -BSL?=goodfet.bsl --speed=38400 - -#One of these should be defined explicitly. -#Default removed because of confusion. +MSP430BSL?=goodfet.bsl --speed=38400 +JTAG=msp430-jtag -#mcu=msp430x2274 -#mcu=msp430x2618 -#mcu?=msp430x1612 -mcu?=RUNCONFIG -#platform=goodfet -#platform=telosb -#platform=z1 -platform?=goodfet +GCCINC?= -#N.B., gcc WILL NOT BITCH if this file doesn't exist. -#GCCINC=-T ldscripts/161x.x -GCCINC=-T ldscripts/$(mcu).x +#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?=-mmcu=$(mcu) #-Wl,-dT ldscripts/$(mcu).x -CCEXTRA?= -CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include $(CCEXTRA) +CCEXTRA?= $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -Dboard=$(board) $(GCCINC) -I include -I platforms +CC=$(GCC) -Wall -O1 -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: @@ -48,6 +47,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 @@ -87,13 +87,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. +ifeq ($(platform),tilaunchpad) +config ?= monitor chipcon i2c +else +config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi maxusb +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= @@ -109,6 +126,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) @@ -117,6 +140,14 @@ ifeq ($(filter jtag, $(config)), jtag) 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 @@ -125,6 +156,7 @@ ifeq ($(filter sbw, $(config)), sbw) hdrs+= jtag.h endif apps+= apps/jtag/sbw.o + hdrs+= sbw.h endif # include jtag430 app @@ -212,6 +244,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 @@ -232,7 +275,7 @@ endif # include adc app ifeq ($(filter adc, $(config)), adc) - ifeq ($(mcu), msp430x2274) + ifeq ($(mcu), msp430f2274) apps+= apps/adc/adc.o hdrs+= adc.h else @@ -270,6 +313,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 @@ -294,21 +343,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 - $(BSL) -e -p $(app).hex - #ls info.txt && $(BSL) -P $(app).hex -p info.txt || true #MSP430F2xx targets only, inelegant. + $(JTAG) -e -p $(app).hex verify: - $(BSL) -P $(app).hex -v $(app).hex + $(JTAG) -v $(app).hex +erase: + $(JTAG) -e $(app).hex +else +install: $(app).hex + $(MSP430BSL) -e -p $(app).hex +installinfo: + $(MSP430BSL) -P $(app).hex -p info.txt || true #MSP430F2xx targets only, inelegant. +verify: + $(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: