## 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 apimote))
+mcu ?= msp430f2618
+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
periph ?= /opt/STM32F4xx_StdPeriph_Driver
discovery ?= /opt/STM32F4-Discovery_FW_V1.1.0
-pincs ?= -I$(periph)/inc -I$(discovery)/Libraries/CMSIS/ST/STM32F4xx/Include -I$(discovery)/Libraries/CMSIS/Include -Dassert_param\(x\)=
+
+usbcore ?= $(discovery)/Libraries/STM32_USB_Device_Library/Core
+usbsrc ?= $(usbcore)/src
+otginc ?= /opt/STM32F4-Discovery_FW_V1.1.0/Libraries/STM32_USB_OTG_Driver/inc
+otgsrc ?= /opt/STM32F4-Discovery_FW_V1.1.0/Libraries/STM32_USB_OTG_Driver/src
+
+pincs ?= -I$(periph)/inc -I$(usbcore)/inc -I$(otginc) -I$(discovery)/Libraries/CMSIS/ST/STM32F4xx/Include -I$(discovery)/Libraries/CMSIS/Include -Dassert_param\(x\)= -DUSE_USB_OTG_FS -I/opt/STM32F4-Discovery_FW_V1.1.0/Utilities/STM32F4-Discovery
psrc ?= /opt/STM32F4xx_StdPeriph_Driver/src
mcu ?= stm32f407
platform := stm32f4discovery
config = monitor
-extralibs = lib/cortexm3.o lib/system_stm32f4xx.o $(psrc)/stm32f4xx_rcc.o $(psrc)/stm32f4xx_gpio.o
+
+# This is a pain.
+#usblibs = $(usbsrc)/usbd_core.o $(usbsrc)/usbd_req.o $(usbsrc)/usbd_ioreq.o $(usbsrc)/usbd_core.o $(otgsrc)/usb_dcd.o $(otgsrc)/usb_dcd_int.o $(otgsrc)/usb_hcd.o $(otgsrc)/usb_hcd_int.o $(otgsrc)/usb_otg.o
+extralibs = lib/cortexm3.o lib/system_stm32f4xx.o lib/stm32f4xx_rcc.o $(psrc)/stm32f4xx_gpio.o $(psrc)/stm32f4xx_usart.o $(usblibs)
endif
-ifneq (,$(findstring $(board),facedancer10))
+ifneq (,$(findstring $(board),facedancer10 facedancer11))
mcu ?= msp430f2618
platform := goodfet
config = monitor spi maxusb
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