Cut JTAGARM7 from default for ccspi.

[goodfet] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 030bc02..36c0cdf 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -8,10 +8,10 @@ BSL?=goodfet.bsl --speed=38400
 #One of these should be defined explicitly.
 #Default removed because of confusion.
 
-#mcu=msp430x2274
-mcu=msp430x2618
+#mcu?=msp430x2274
+#mcu?=msp430x2618
 #mcu?=msp430x1612
-#mcu?=RUNCONFIG
+mcu?=RUNCONFIG
 
 #platform=goodfet
 #platform=telosb
@@ -97,7 +97,7 @@ CC=msp430-gcc -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) -D$(mcu) -D$(platfo
 # config = monitor sbw  chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
 
 # New default.
-config ?= monitor chipcon ccspi nrf spi jtagarm7 jtag430 jtag430x2 avr openocd
+config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi
 
 # Build the needed list of app and lib object files from the config
 apps=