X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=0392839ed1c5fe296c1f4e5f67f7f04198f312f7;hp=0660f25bfc8e01e8374573d2b82148e1f82ed531;hb=cd93d96fd4bcc66ffaeed376702e3e3d414409e7;hpb=18cee49968e2982cccb0e1c4a579244fd5d51fb1

diff --git a/firmware/config.mk b/firmware/config.mk
index 0660f25..0392839 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -2,31 +2,63 @@
 ## These are production boards.
 ##################################
 mcu = undef
-ifneq (,$(findstring $(board),goodfet20))
+
+ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
 mcu := msp430x1612
+platform := goodfet
+endif
+
+ifneq (,$(findstring $(board),goodfet21))
+mcu := msp430x2618
+platform := goodfet
 endif
 
 ifneq (,$(findstring $(board),goodfet30 goodfet31))
 mcu := msp430x2274
+platform := goodfet
 # This will link to fit in a '2254, so unneeded packages should be omited.
 CONFIG_ccspi = n
 endif
 
 ifneq (,$(findstring $(board),goodfet40 goodfet41))
 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
 endif
 
 ifneq (,$(findstring $(board),telosb))
 mcu :=msp430x1612
-CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
+platform := goodfet
+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.
@@ -60,11 +92,9 @@ endif
 ifeq ($(mcu),undef)
 $(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 
+#platform := $(board)
 
-CONFIG_sbw         = y
+AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2 
 
 # defaults
 CONFIG_monitor    ?= y
@@ -87,8 +117,9 @@ CONFIG_ccspi      ?= y
 CONFIG_glitch     ?= n
 CONFIG_smartcard  ?= n
 CONFIG_ps2        ?= n
+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