Fixed the board=telosb target.

[goodfet] / firmware / config.mk

diff --git a/firmware/config.mk b/firmware/config.mk
index 802c9e6..0392839 100644 (file)
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -25,6 +25,18 @@ mcu := msp430x2618
 platform := goodfet
 endif
 
+ifneq (,$(findstring $(board),nhb12b))
+mcu := msp430x2618
+CONFIG_nrf = y
+platform := nhb12b
+endif
+
+ifneq (,$(findstring $(board),nhb12))
+mcu := msp430x2618
+CONFIG_nrf = y
+platform := nhb12
+endif
+
 ifneq (,$(findstring $(board),goodfet50 goodfet51))
 mcu := msp430x5510
 platform := goodfet
@@ -33,12 +45,21 @@ endif
 ifneq (,$(findstring $(board),telosb))
 mcu :=msp430x1612
 platform := goodfet
-CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
+CFLAGS := -Dtelosb
+#CFLAGS+= -Werror
+config := monitor spi ccspi
+endif
+
+ifneq (,$(findstring $(board),telosbbt))
+mcu :=msp430x1612
+platform := goodfet
 #CFLAGS+= -Werror
 config := monitor spi ccspi
 endif
 
 
+
+
 ##################################
 ## These are experimental boards.
 ##################################
@@ -75,8 +96,6 @@ endif
 
 AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2 
 
-CONFIG_sbw         = y
-
 # defaults
 CONFIG_monitor    ?= y
 CONFIG_spi        ?= y
@@ -102,5 +121,5 @@ CONFIG_slc2       ?= n
 
 #The CONFIG_foo vars are only interpreted if $(config) is unset.
 ifeq ($(config),undef)
-config := $(foreach app,$(AVAILABLE_APPS),$(if $(findstring $(CONFIG_$(app)),y yes t true Y YES T TRUE),$(app)))
+config += $(foreach app,$(AVAILABLE_APPS),$(if $(findstring $(CONFIG_$(app)),y yes t true Y YES T TRUE),$(app)))
 endif