## These are production boards.
##################################
-#Unset by default, but can be explicitly set later.
-config=undef
+#Unset by default, but can be explicitly overwritten.
+config ?= undef
-ifneq (,$(findstring $(board),apimote1))
+ifneq (,$(findstring $(board),apimote1 apimote))
mcu ?= msp430f2618
-platform := apimote1
+platform := apimote
config := monitor spi ccspi
MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
CFLAGS += -Duseuart1 -Dapimote
endif
+ifneq (,$(findstring $(board),goodthopter01 goodthopter10 goodthopter11))
+mcu ?= msp430f2274
+platform := goodfet
+config := monitor spi
+endif
+
ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
-mcu ?= msp430f1612
+mcu ?= msp430f1611
platform := goodfet
endif
-ifneq (,$(findstring $(board),goodfet21))
+ifneq (,$(findstring $(board),goodfet21,goodfet22))
mcu ?= msp430f2618
platform := goodfet
endif
CONFIG_nrf = y
endif
-ifneq (,$(findstring $(board),goodfet40 goodfet41))
+ifneq (,$(findstring $(board),goodfet40 goodfet41 goodfet42))
mcu ?= msp430f2618
platform := goodfet
CONFIG_nrf = y
ifneq (,$(findstring $(board),tilaunchpad))
mcu ?=msp430f1612
CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
-CFLAGS+= -Werror -Wall
+CFLAGS+= -Wall
config := monitor chipcon i2c
endif
CONFIG_jtag430 ?= y
CONFIG_jtag430x2 ?= y
CONFIG_i2c ?= n
-CONFIG_jtagarm7 ?= n
+CONFIG_jtagarm7 ?= y
CONFIG_ejtag ?= n
CONFIG_jtagxscale ?= n
CONFIG_openocd ?= y