X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=b96d358822acd75893872d0306e9ec971b6fc86a;hp=4da1c9b9ecea39cd2eff23dd3d58957f10ceda60;hb=1afd03f424ab5da0a4c172d7c48814db3660a2f0;hpb=4417ec4b3db45c243a32821133418793bd7bfe76

diff --git a/firmware/Makefile b/firmware/Makefile
index 4da1c9b..b96d358 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -16,6 +16,8 @@ mcu?=RUNCONFIG
 #platform=goodfet
 #platform=telosb
 #platform=z1
+#platform=nhbadge
+#platform=nhbadgeb
 platform?=goodfet
 
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.
@@ -88,7 +90,10 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 # config = monitor jtagxscale
 
 # Old Default Config
-config = monitor sbw  chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
+#config = monitor sbw  chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
+
+# New default.
+config = monitor chipcon nrf spi jtagarm7 jtag430 jtag430x2 avr
 
 
 # Build the needed list of app and lib object files from the config
@@ -125,6 +130,7 @@ ifeq ($(filter sbw, $(config)), sbw)
 		hdrs+= jtag.h
 	endif
 	apps+= apps/jtag/sbw.o
+	hdrs+= sbw.h
 endif
 
 # include jtag430 app
@@ -224,6 +230,8 @@ ifeq ($(filter avr, $(config)), avr)
 	hdrs+= avr.h
 endif
 
+
+
 # include pic app
 ifeq ($(filter pic, $(config)), pic)
 	apps+= apps/pic/pic.o