X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=313e2a62c5a0ae189573bd34553a860dbb9ec66c;hp=76c118fa1db202cca23ceecc0f03530eb517e0c5;hb=c6d09f2d0dda59d5da9eb9ed3cb4c97c2898e57c;hpb=a1306ffe48d2020061f2f678f5554659673de425

diff --git a/firmware/config.mk b/firmware/config.mk
index 76c118f..313e2a6 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -2,28 +2,34 @@
 ## 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),apimote))
+ifneq (,$(findstring $(board),apimote1 apimote))
 mcu ?= msp430f2618
 platform := apimote
 config := monitor spi ccspi
 MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
-CFLAGS += -Duseuart1
+CFLAGS += -Duseuart1 -Dapimote
+endif
+
+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
 
-ifneq (,$(findstring $(board),goodfet30 goodfet31))
+ifneq (,$(findstring $(board),goodfet30 goodfet31 goodfet32))
 mcu ?= msp430f2274
 platform := goodfet
 # This will link to fit in a '2254, so unneeded packages should be omited.
@@ -31,10 +37,11 @@ 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
+CONFIG_ccspi = y
 endif
 
 ifneq (,$(findstring $(board),stm32f4discovery))
@@ -76,7 +83,7 @@ extralibs = lib/cortexm3.o lib/system_stm32f4xx.o lib/stm32f4xx_rcc.o $(psrc)/st
 
 endif
 
-ifneq (,$(findstring $(board),facedancer10 facedancer11))
+ifneq (,$(findstring $(board),facedancer10 facedancer11 facedancer20 facedancer21))
 mcu ?= msp430f2618
 platform := goodfet
 config = monitor spi maxusb
@@ -93,6 +100,7 @@ ifneq (,$(findstring $(board),goodfet24))
 mcu ?= msp430f2618
 platform := goodfet
 CONFIG_glitch = y
+CONFIG_nrf = y
 endif
 
 ifneq (,$(findstring $(board),nhb12b))
@@ -141,6 +149,17 @@ 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 atmel_radio #avr spi
+AVR_PLATFORM := m128rfa1
+endif
+
+
 ifneq (,$(findstring $(board),arduino))
 GCC := avr-gcc
 mcu ?= atmega168
@@ -152,7 +171,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
 
@@ -164,7 +183,7 @@ $(error Please define board, as explained in the README)
 endif
 #platform := $(board)
 
-AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2  maxusb
+AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2  maxusb atmel_radio cc2500
 
 # defaults
 CONFIG_monitor    ?= y
@@ -175,7 +194,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
@@ -185,10 +204,12 @@ CONFIG_pic        ?= n
 CONFIG_adc        ?= n
 CONFIG_nrf        ?= n
 CONFIG_ccspi      ?= n
+CONFIG_cc2500     ?= y
 CONFIG_glitch     ?= n
 CONFIG_smartcard  ?= n
 CONFIG_ps2        ?= n
 CONFIG_slc2       ?= n
+CONFIG_atmel_radio ?=n
 
 #The CONFIG_foo vars are only interpreted if $(config) is "unset".
 ifeq ($(config),undef)