X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=554e79a459786dae022e0656bf59cc3ffe44aff5;hp=0660f25bfc8e01e8374573d2b82148e1f82ed531;hb=8c97f896b9cf1b9b6ddf25420c9d9f04516ddd11;hpb=18cee49968e2982cccb0e1c4a579244fd5d51fb1

diff --git a/firmware/config.mk b/firmware/config.mk
index 0660f25..554e79a 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -1,74 +1,148 @@
 ##################################
 ## These are production boards.
 ##################################
-mcu = undef
-ifneq (,$(findstring $(board),goodfet20))
-mcu := msp430x1612
+
+#Unset by default, but can be explicitly set later.
+config=undef
+
+ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
+mcu ?= msp430f1612
+platform := goodfet
+endif
+
+ifneq (,$(findstring $(board),goodfet21))
+mcu ?= msp430f2618
+platform := goodfet
 endif
 
 ifneq (,$(findstring $(board),goodfet30 goodfet31))
-mcu := msp430x2274
+mcu ?= msp430f2274
+platform := goodfet
 # This will link to fit in a '2254, so unneeded packages should be omited.
 CONFIG_ccspi = n
+CONFIG_nrf = y
 endif
 
 ifneq (,$(findstring $(board),goodfet40 goodfet41))
-mcu := msp430x2618
+mcu ?= msp430f2618
+platform := goodfet
+CONFIG_nrf = y
+endif
+
+ifneq (,$(findstring $(board),stm32f4discovery))
+GCC     = arm-none-eabi-gcc
+CC      = arm-none-eabi-gcc
+LD      = arm-none-eabi-ld -v
+AR      = arm-none-eabi-ar
+AS      = arm-none-eabi-as
+CP      = arm-none-eabi-objcopy
+OD	= arm-none-eabi-objdump
+CFLAGS  =  -I./ -Iinclude/ -c -fno-common -O1 -g -mcpu=cortex-m3 -mthumb 
+AFLAGS  = -ahls -mapcs-32
+LFLAGS  = -Ttmplink.cmd -nostartfiles
+CPFLAGS = -Obinary
+ODFLAGS	= -S
+LDFLAGS = 
+
+mcu ?= stm32f407
+platform := stm32f4discovery
+config = monitor
+endif
+
+ifneq (,$(findstring $(board),facedancer10))
+mcu ?= msp430f2618
+platform := goodfet
+config = monitor spi maxusb
+endif
+
+ifeq ($(board),z1)
+mcu ?= msp430f2617
+platform := z1
+config = monitor spi ccspi
+MSP430BSL?=goodfet.bsl --z1  --speed=38400
+endif
+
+ifneq (,$(findstring $(board),goodfet24))
+mcu ?= msp430f2618
+platform := goodfet
+CONFIG_glitch = y
+endif
+
+ifneq (,$(findstring $(board),nhb12b))
+mcu ?= msp430f2618
+CONFIG_nrf = y
+platform := nhb12b
+endif
+
+ifneq (,$(findstring $(board),nhb12))
+mcu ?= msp430f2618
+CONFIG_nrf = y
+platform := nhb12
 endif
 
 ifneq (,$(findstring $(board),goodfet50 goodfet51))
-mcu := msp430x5510
+mcu ?= msp430f5510
+platform := goodfet
 endif
 
-ifneq (,$(findstring $(board),telosb))
-mcu :=msp430x1612
-CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
-#CFLAGS+= -Werror
+ifeq ($(board),telosb)
+mcu ?= msp430f1611
+platform := telosb
+config := monitor spi ccspi
+CFLAGS += -Duseuart1
+endif
+
+ifeq ($(board),telosbbt)
+mcu ?=msp430f1612
+platform := telosb
 config := monitor spi ccspi
 endif
 
 
+
+
 ##################################
 ## These are experimental boards.
 ##################################
 
 ifneq (,$(findstring $(board),donbfet))
 GCC := avr-gcc
-mcu := atmega644p
-CFLAGS=$(DEBUG) -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields
+CC := avr-gcc
+mcu ?= atmega644p
+platform = donbfet
+CFLAGS=$(DEBUG) -Iinclude -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields
 config := monitor avr spi jscan
 endif
 
 ifneq (,$(findstring $(board),arduino))
 GCC := avr-gcc
-mcu := atmega168
+mcu ?= atmega168
 #BSL := avrdude -V -F -c stk500v1 -p m328p -b 57600 -P /dev/tty.usbserial-* -U flash:w:blink.hex
 LDFLAGS := 
 config := monitor
 endif
 
 ifneq (,$(findstring $(board),tilaunchpad))
-mcu :=msp430x1612
+mcu ?=msp430f1612
 CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
-#CFLAGS+= -Werror
+CFLAGS+= -Werror -Wall
 config := monitor chipcon i2c
 endif
 
 
 
-
+mcu ?= undef
 ifeq ($(mcu),undef)
 $(error Please define board, as explained in the README)
 endif
-platform := $(board)
-
-AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 
+#platform := $(board)
 
-CONFIG_sbw         = y
+AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2  maxusb
 
 # defaults
 CONFIG_monitor    ?= y
 CONFIG_spi        ?= y
+CONFIG_maxusb     ?= y
 CONFIG_jtag       ?= n
 CONFIG_sbw        ?= n
 CONFIG_jtag430    ?= y
@@ -83,12 +157,13 @@ CONFIG_avr        ?= y
 CONFIG_pic        ?= n
 CONFIG_adc        ?= n
 CONFIG_nrf        ?= n
-CONFIG_ccspi      ?= y
+CONFIG_ccspi      ?= n
 CONFIG_glitch     ?= n
 CONFIG_smartcard  ?= n
 CONFIG_ps2        ?= n
+CONFIG_slc2       ?= n
 
-#The CONFIG_foo vars are only interpreted if $(config) is unset.
+#The CONFIG_foo vars are only interpreted if $(config) is "unset".
 ifeq ($(config),undef)
-config := $(foreach app,$(AVAILABLE_APPS),$(if $(findstring $(CONFIG_$(app)),y yes t true Y YES T TRUE),$(app)))
+config += $(foreach app,$(AVAILABLE_APPS),$(if $(findstring $(CONFIG_$(app)),y yes t true Y YES T TRUE),$(app)))
 endif