X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=34f007992cfe2da1473aaaee9c17e1d9794701e1;hp=2f45036e583c0014da7a6ced9be12d361ac28108;hb=ebd308ba418fec3765e7b55ebcddd923111ba57b;hpb=b91e76cd49b5b4da24685a5fcc622abdb32ac373

diff --git a/firmware/config.mk b/firmware/config.mk
index 2f45036..34f0079 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -20,6 +20,7 @@ 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))
@@ -28,11 +29,11 @@ platform := goodfet
 CONFIG_nrf = y
 endif
 
-ifneq (,$(findstring $(board),zolertiaz1))
-mcu ?= msp430f2618
-platform := goodfet
-CONFIG_ccspi = y
-MSP430BSL?=z1-bsl --z1  --speed=38400
+ifeq ($(board),z1)
+mcu ?= msp430f2617
+platform := z1
+config = monitor spi ccspi
+MSP430BSL?=goodfet.bsl --z1  --speed=38400
 endif
 
 ifneq (,$(findstring $(board),goodfet24))