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

diff --git a/firmware/config.mk b/firmware/config.mk
index 29a587a..827f7e1 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -13,6 +13,14 @@ MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
 CFLAGS += -Duseuart1 -Dapimote
 endif
 
+ifneq (,$(findstring $(board),apimote2))
+mcu ?= msp430f2618
+platform := apimote2
+config := monitor spi ccspi
+MSP430BSL?=goodfet.bsl --speed=38400
+CFLAGS += -Duseuart1 -Dapimote
+endif
+
 ifneq (,$(findstring $(board),goodthopter01 goodthopter10 goodthopter11))
 mcu ?= msp430f2274
 platform := goodfet
@@ -29,7 +37,7 @@ 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.
@@ -41,6 +49,7 @@ ifneq (,$(findstring $(board),goodfet40 goodfet41 goodfet42))
 mcu ?= msp430f2618
 platform := goodfet
 CONFIG_nrf = y
+CONFIG_ccspi = y
 endif
 
 ifneq (,$(findstring $(board),stm32f4discovery))
@@ -82,7 +91,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
@@ -99,6 +108,7 @@ ifneq (,$(findstring $(board),goodfet24))
 mcu ?= msp430f2618
 platform := goodfet
 CONFIG_glitch = y
+CONFIG_nrf = y
 endif
 
 ifneq (,$(findstring $(board),nhb12b))
@@ -153,7 +163,8 @@ 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
+config := monitor atmel_radio #avr spi
+AVR_PLATFORM := m128rfa1
 endif
 
 
@@ -180,7 +191,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
@@ -201,10 +212,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)