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

diff --git a/firmware/config.mk b/firmware/config.mk
index f2a681f..d9c077c 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -13,7 +13,7 @@ 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
@@ -24,7 +24,7 @@ mcu ?= msp430f1611
 platform := goodfet
 endif
 
-ifneq (,$(findstring $(board),goodfet21))
+ifneq (,$(findstring $(board),goodfet21,goodfet22))
 mcu ?= msp430f2618
 platform := goodfet
 endif
@@ -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