Fixed config.mk to accept a limited list of apps when defined.

[goodfet] / firmware / config.mk

diff --git a/firmware/config.mk b/firmware/config.mk
index 0660f25..4df6c11 100644 (file)
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -2,26 +2,49 @@
 ## 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
+platform := goodfet
 CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
 #CFLAGS+= -Werror
 config := monitor spi ccspi
@@ -60,11 +83,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 +108,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