X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=5e2c5a305864bd533d5a68dca8b6da8d05ff1e2a;hp=4da1c9b9ecea39cd2eff23dd3d58957f10ceda60;hb=f4a366d95f96109559f0903611d7103c50cde3f7;hpb=4417ec4b3db45c243a32821133418793bd7bfe76 diff --git a/firmware/Makefile b/firmware/Makefile index 4da1c9b..5e2c5a3 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -1,35 +1,31 @@ +-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 +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?=goodfet +#All of these are ?= in order ot allow overriding. +GCC?=msp430-gcc -mmcu=$(mcu) +LDFLAGS?=-mmcu=$(mcu) #-Wl,-dT ldscripts/$(mcu).x -#N.B., gcc WILL NOT BITCH if this file doesn't exist. -#GCCINC=-T ldscripts/161x.x -GCCINC=-T 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) -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. -# PRODUCTION: +# PRODUCTION: # None have made it to production grade quality # BETA: @@ -41,13 +37,14 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat # ALPHA: # jtag430 -- 16-bit MSP430 JTAG # jtag430x2 -- 20-bit MSP430 JTAG +# jtagarm7 -- ARM7TDMI JTAG # PRE-ALPHA: # Bus protocols: # i2c -- Turns GF into USB-to-i2c adapter -# jtagarm7 -- ARM7TDMI JTAG # ejtag -- MIPS JTAG # jtagxscale -- XScale JTAG +# openocd -- OpenOCD bitbang device # Microcontrollers: # chipcon -- Chipcon radio 8051 debugging @@ -55,9 +52,11 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat # pic -- PIC24H/dsPIC33F debugger # adc -- ADC10 (still specific to x2274, GoodFET32) -# Radios: +# Radions: # nrf -- Nordic RF SPI # ccspi -- Chipcon SPI +# cc2500 -- Chipcon SPI CC2500 +# atmel_radio -- Atmel radio # Miscelaneous: # glitch -- Glitch research tool @@ -67,33 +66,24 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat # 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. $(config) is generated by config.mk. -# Chipcon hacking -# config = monitor chipcon ccspi -# Glitch research -# config = monitor glitch -# XScale PXA255 JTAG -# config = monitor jtagxscale - -# Old Default Config -config = monitor sbw chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr +# Build the needed list of app and lib object files from the config +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 $(extralibs) +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= @@ -109,6 +99,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 +113,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 +129,7 @@ ifeq ($(filter sbw, $(config)), sbw) hdrs+= jtag.h endif apps+= apps/jtag/sbw.o + hdrs+= sbw.h endif # include jtag430 app @@ -212,6 +217,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 +248,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 @@ -246,12 +262,24 @@ ifeq ($(filter ccspi, $(config)), ccspi) hdrs+= ccspi.h endif +# include chipcon CC2500 radio spi app +ifeq ($(filter cc2500, $(config)), cc2500) + apps+= apps/radios/cc2500.o + hdrs+= cc2500.h +endif + # include nrf app ifeq ($(filter nrf, $(config)), nrf) apps+= apps/radios/nrf.o hdrs+= nrf.h endif +# include atmel_radio app +ifeq ($(filter atmel_radio, $(config)), atmel_radio) + apps+= apps/radios/atmel_radio.o + hdrs+= atmel_radio.h +endif + # include glitch app ifeq ($(filter glitch, $(config)), glitch) apps+= apps/glitch/glitch.o @@ -264,10 +292,16 @@ ifeq ($(filter smartcard, $(config)), smartcard) hdrs+= smartcard.h endif -# include ps2 app -ifeq ($(filter ps2, $(config)), ps2) - apps+= apps/plugins/ps2.o - hdrs+= ps2.h +# include plugin app +ifeq ($(filter plugin, $(config)), plugin) + apps+= apps/plugin.o + hdrs+= plugin.h +endif + +# include jscan app +ifeq ($(filter jscan, $(config)), jscan) + apps+= apps/jscan/jscan.o + hdrs+= jscan.h endif # Rules @@ -294,24 +328,54 @@ goodfet.hex: goodfet run: ../client/goodfet.msp430 test +avrinstall: $(app).hex + #to be merged +ifdef AVR_PLATFORM + avrdude -V -F -c stk500v1 -p $(AVR_PLATFORM) -b 57600 -P $(GOODFET) -U flash:w:$(app).hex +else + avrdude -V -F -c stk500v1 -p m328p -b 57600 -P $(GOODFET) -U flash:w:$(app).hex +endif + +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 + #Note that 'make install' no longer erases the chip. + #Use 'make reinstall' if you want that. + $(MSP430BSL) -p $(app).hex +reinstall: $(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): $(app).o $(libs) $(apps) +armlink: $(app).o $(libs) $(apps) $(platformlibs) + arm-none-eabi-ld -v -Tlinkers/stm32f407.cmd -nostartfiles -o goodfet.elf $(app).o $(libs) $(apps) + arm-none-eabi-objcopy -Obinary goodfet.elf goodfet.bin +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 + rm -f *.o $(app) $(app).hex $(libs) $(apps) lib/apps.c include/config.h include/builddate.h include/apps.h docs: doxygen pushdocs: docs