X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=71cac4b0f4d441dbfbbbe66911fce3a809a0a5da;hp=14f93af2a4e3d3a2176b3f43a15fe5ae0666d302;hb=361753a7a4a281f1b1bc7123beae0ded6ddf2289;hpb=3f484ecf26ada8e36e1901f33e1a7c8eee4a112a

diff --git a/firmware/config.mk b/firmware/config.mk
index 14f93af..71cac4b 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -2,18 +2,18 @@
 ## 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))
+ifneq (,$(findstring $(board),goodthopter01 goodthopter10))
 mcu ?= msp430f2274
 platform := goodfet
 config := monitor spi
@@ -158,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