Platform changes.

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

diff --git a/firmware/config.mk b/firmware/config.mk
index a9f6289..e1e9d1c 100644 (file)
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -2,6 +2,8 @@
 ## These are production boards.
 ##################################
 
 ## These are production boards.
 ##################################
 

+#Unset by default, but can be explicitly set later.
+config=undef

 
 ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
 mcu ?= msp430f1612
 
 ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
 mcu ?= msp430f1612


@@ -118,13 +120,13 @@ CONFIG_avr        ?= y
 CONFIG_pic        ?= n
 CONFIG_adc        ?= n
 CONFIG_nrf        ?= n
 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
 
 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
 ifeq ($(config),undef)
 config += $(foreach app,$(AVAILABLE_APPS),$(if $(findstring $(CONFIG_$(app)),y yes t true Y YES T TRUE),$(app)))
 endif

diff --git a/firmware/platforms/telosb.h b/firmware/platforms/telosb.h
index 213aa4b..8fb2857 100644 (file)
--- a/firmware/platforms/telosb.h
+++ b/firmware/platforms/telosb.h
@@ -8,7 +8,7 @@
 
 */
 
 
 */
 

-#ifdef MSP430
+#ifndef _GNU_ASSEMBLER_

 #include <msp430.h>
 #endif
 
 #include <msp430.h>
 #endif