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

diff --git a/firmware/Makefile b/firmware/Makefile
index 4da1c9b..fd0fdbf 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -88,7 +88,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 +128,7 @@ ifeq ($(filter sbw, $(config)), sbw)
 		hdrs+= jtag.h
 	endif
 	apps+= apps/jtag/sbw.o
+	hdrs+= sbw.h
 endif
 
 # include jtag430 app
@@ -224,6 +228,8 @@ ifeq ($(filter avr, $(config)), avr)
 	hdrs+= avr.h
 endif
 
+
+
 # include pic app
 ifeq ($(filter pic, $(config)), pic)
 	apps+= apps/pic/pic.o