Removed SBW from defaults. Added NRF to NHB12 and NHB12B boards.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1067 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/firmware/config.mk b/firmware/config.mk
index 29a33ce..2cf09bd 100644 (file)
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -27,11 +27,13 @@ endif
 
 ifneq (,$(findstring $(board),nhb12b))
 mcu := msp430x2618
 
 ifneq (,$(findstring $(board),nhb12b))
 mcu := msp430x2618

+CONFIG_nrf = y

 platform := nhb12b
 endif
 
 ifneq (,$(findstring $(board),nhb12))
 mcu := msp430x2618
 platform := nhb12b
 endif
 
 ifneq (,$(findstring $(board),nhb12))
 mcu := msp430x2618

+CONFIG_nrf = y

 platform := nhb12
 endif
 
 platform := nhb12
 endif
 


@@ -85,8 +87,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 
 
 
 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
 # defaults
 CONFIG_monitor    ?= y
 CONFIG_spi        ?= y