Removed Werror, so launchpad code compiles again.

[goodfet] / firmware / config.mk

diff --git a/firmware/config.mk b/firmware/config.mk
index 76c118f..9df48c3 100644 (file)
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -5,12 +5,18 @@
 #Unset by default, but can be explicitly set later.
 config=undef
 
-ifneq (,$(findstring $(board),apimote))
+ifneq (,$(findstring $(board),apimote1))
 mcu ?= msp430f2618
-platform := apimote
+platform := apimote1
 config := monitor spi ccspi
 MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
-CFLAGS += -Duseuart1
+CFLAGS += -Duseuart1 -Dapimote
+endif
+
+ifneq (,$(findstring $(board),goodthopter01 goodthopter10))
+mcu ?= msp430f2274
+platform := goodfet
+config := monitor spi
 endif
 
 ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
@@ -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