X-Git-Url: http://git.rot13.org//?a=blobdiff_plain;f=firmware%2Fconfig.mk;h=29a587a03e65cca481e7a4abd1ad19d3b8473fa9;hb=05e744a159e6c7b808b12e53b5ac231a8045bd8b;hp=363a0d682b58710f743458725538feb17ed8079b;hpb=5b4bc58088d381aaa3403bfb7c0ed6778c94f9fe;p=goodfet

diff --git a/firmware/config.mk b/firmware/config.mk
index 363a0d6..29a587a 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -2,8 +2,8 @@
 ## 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 apimote))
 mcu ?= msp430f2618
@@ -13,18 +13,18 @@ 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
@@ -147,6 +147,16 @@ CFLAGS=$(DEBUG) -Iinclude -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wu
 config := monitor avr spi jscan
 endif
 
+ifneq (,$(findstring $(board),zigduino))
+GCC := avr-gcc
+CC := avr-gcc
+mcu ?= atmega128rfa1
+platform = zigduino
+CFLAGS=$(DEBUG) -Iinclude -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields
+config := monitor #avr spi
+endif
+
+
 ifneq (,$(findstring $(board),arduino))
 GCC := avr-gcc
 mcu ?= atmega168
@@ -181,7 +191,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