X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=d9c077c7aea1ae1c235faa12425f469d11dd4379;hp=76c118fa1db202cca23ceecc0f03530eb517e0c5;hb=f7fdc48f01ada713d5034763a2f3395fe2a7c51b;hpb=a1306ffe48d2020061f2f678f5554659673de425

diff --git a/firmware/config.mk b/firmware/config.mk
index 76c118f..d9c077c 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -2,23 +2,29 @@
 ## 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),apimote))
+ifneq (,$(findstring $(board),apimote1 apimote))
 mcu ?= msp430f2618
 platform := apimote
 config := monitor spi ccspi
 MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
-CFLAGS += -Duseuart1
+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
@@ -152,7 +158,7 @@ endif
 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
 
@@ -175,7 +181,7 @@ CONFIG_sbw        ?= n
 CONFIG_jtag430    ?= y
 CONFIG_jtag430x2  ?= y
 CONFIG_i2c        ?= n
-CONFIG_jtagarm7   ?= n
+CONFIG_jtagarm7   ?= y
 CONFIG_ejtag      ?= n
 CONFIG_jtagxscale ?= n
 CONFIG_openocd    ?= y