X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=e08a757f8b1dee7a6c2e52234519f449de7b46b8;hp=5305ca377037a6e1ba273bf09e6d57314f4443b5;hb=dc4bd8e19d524bc2f057f78f6a0654b28ab216f9;hpb=f3480afd0970eb232b17070d8596e5d09aef2c7e

diff --git a/firmware/config.mk b/firmware/config.mk
index 5305ca3..e08a757 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -2,6 +2,8 @@
 ## These are production boards.
 ##################################
 
+#Unset by default, but can be explicitly set later.
+config=undef
 
 ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
 mcu ?= msp430f1612
@@ -18,16 +20,32 @@ mcu ?= msp430f2274
 platform := goodfet
 # This will link to fit in a '2254, so unneeded packages should be omited.
 CONFIG_ccspi = n
+CONFIG_nrf = y
 endif
 
 ifneq (,$(findstring $(board),goodfet40 goodfet41))
 mcu ?= msp430f2618
 platform := goodfet
+CONFIG_nrf = y
+endif
+
+ifneq (,$(findstring $(board),facedancer10))
+mcu ?= msp430f2618
+platform := goodfet
+config = monitor spi maxusb
+endif
+
+ifeq ($(board),z1)
+mcu ?= msp430f2617
+platform := z1
+config = monitor spi ccspi
+MSP430BSL?=goodfet.bsl --z1  --speed=38400
 endif
 
 ifneq (,$(findstring $(board),goodfet24))
 mcu ?= msp430f2618
 platform := goodfet
+CONFIG_glitch = y
 endif
 
 ifneq (,$(findstring $(board),nhb12b))
@@ -97,12 +115,12 @@ $(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 
+AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2  maxusb
 
 # defaults
 CONFIG_monitor    ?= y
 CONFIG_spi        ?= y
-CONFIG_maxusb     ?= n
+CONFIG_maxusb     ?= y
 CONFIG_jtag       ?= n
 CONFIG_sbw        ?= n
 CONFIG_jtag430    ?= y
@@ -117,13 +135,13 @@ CONFIG_avr        ?= y
 CONFIG_pic        ?= n
 CONFIG_adc        ?= n
 CONFIG_nrf        ?= n
-CONFIG_ccspi      ?= y
+CONFIG_ccspi      ?= n
 CONFIG_glitch     ?= n
 CONFIG_smartcard  ?= n
 CONFIG_ps2        ?= n
 CONFIG_slc2       ?= n
 
-#The CONFIG_foo vars are only interpreted if $(config) is unset.
+#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)))
 endif