X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=5e2c5a305864bd533d5a68dca8b6da8d05ff1e2a;hp=fbf5a33ef01cf103151dad4f96b0802b55a509d7;hb=f4a366d95f96109559f0903611d7103c50cde3f7;hpb=41777a0dda559dc2b2738720a39f3b5d57b5cee0 diff --git a/firmware/Makefile b/firmware/Makefile index fbf5a33..5e2c5a3 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -1,59 +1,31 @@ +-include config.mk -#platform?=goodfet -#platform?=telosb -#platform?=z1 -#platform?=nhbadge -#platform?=nhbadgeb -#platofrm?=arduino -#platform?=tilaunchpad 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 - -ifeq ($(platform),tilaunchpad) -mcu?=msp430x1612 -CFLAGS+=-DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG -#CFLAGS+= -Werror -endif +mcu?=RUNCONFIG #include `uname`.mak 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 MSP430BSL?=goodfet.bsl --speed=38400 JTAG=msp430-jtag -#One of these should be defined explicitly. -#Default removed because of confusion. - -#mcu?=msp430x2618 -#mcu?=msp430x1612 -#mcu?=atmega168 -mcu?=RUNCONFIG - -#N.B., gcc WILL NOT BITCH if this file doesn't exist. GCCINC?= -#GCC?=avr-gcc -GCC?=msp430-gcc -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?= $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms -CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) $(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: @@ -65,11 +37,11 @@ CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) $(CCEXTRA) # 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 @@ -80,9 +52,11 @@ CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) $(CCEXTRA) # 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 @@ -92,52 +66,22 @@ CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) $(CCEXTRA) # 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 - -# Chipcon hacking -# config = monitor chipcon ccspi +# 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. -# Glitch research -# config = monitor glitch -# 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 - -# New default. -ifeq ($(platform),tilaunchpad) -config ?= monitor chipcon i2c -else -config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi -endif - -# donb -ifeq ($(platform),donbfet) -config=monitor avr spi jscan -endif # Build the needed list of app and lib object files from the config -apps= +apps= ifeq ($(platform),tilaunchpad) libs= lib/$(platform).o lib/command.o lib/apps.o lib/msp430_serial.o -#libs+=lib/setjmp.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 +libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o lib/msp430.o lib/arduino.o $(extralibs) endif hdrs= @@ -169,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 @@ -296,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 @@ -310,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 @@ -328,10 +292,10 @@ 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 @@ -366,7 +330,11 @@ run: 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 @@ -377,19 +345,26 @@ erase: $(JTAG) -e $(app).hex else install: $(app).hex - $(MSP430BSL) -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: $(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: $(MSP430BSL) --dumpinfo -erase: - $(MSP430BSL) -e $(app).c: config builddate appsfiles err -$(app): $(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 @@ -400,7 +375,7 @@ endif m4s: $(app).hex msp430-objdump -D -m msp430 $(app).hex | m4s init 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