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

diff --git a/firmware/config.mk b/firmware/config.mk
index 9df48c3..8ed0785 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -2,29 +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),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
 
-ifneq (,$(findstring $(board),goodfet21))
+ifneq (,$(findstring $(board),goodfet21,goodfet22))
 mcu ?= msp430f2618
 platform := goodfet
 endif
@@ -37,7 +37,7 @@ CONFIG_ccspi = n
 CONFIG_nrf = y
 endif
 
-ifneq (,$(findstring $(board),goodfet40 goodfet41))
+ifneq (,$(findstring $(board),goodfet40 goodfet41 goodfet42))
 mcu ?= msp430f2618
 platform := goodfet
 CONFIG_nrf = y
@@ -181,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