From 92ea7762796ae5588a43d41f32515238ade44d79 Mon Sep 17 00:00:00 2001
From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Fri, 16 Mar 2012 23:45:40 +0000
Subject: [PATCH] Platform changes.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1105 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---
 firmware/config.mk          | 6 ++++--
 firmware/platforms/telosb.h | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/firmware/config.mk b/firmware/config.mk
index a9f6289..e1e9d1c 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
@@ -118,13 +120,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
diff --git a/firmware/platforms/telosb.h b/firmware/platforms/telosb.h
index 213aa4b..8fb2857 100644
--- a/firmware/platforms/telosb.h
+++ b/firmware/platforms/telosb.h
@@ -8,7 +8,7 @@
 
 */
 
-#ifdef MSP430
+#ifndef _GNU_ASSEMBLER_
 #include <msp430.h>
 #endif
 
-- 
2.20.1