X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=dbe7f999c73cacf771118a6625f8b02ceb6252ab;hp=9df48c325978e3bce3effe8a76069a204a033234;hb=717f47e2e1a087fb915e2b8774a2b72d93aec2ae;hpb=49b9987ddfeb963942601bf9f2f7b2b176973975

diff --git a/firmware/config.mk b/firmware/config.mk
index 9df48c3..dbe7f99 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -2,25 +2,25 @@
 ## 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))
+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