X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=firmware%2FMakefile;h=11eaddbf34fb656135b1e8d4b0dd6eba61e87d56;hb=21ff17d2af1e50542d9343d7177269a8910ebbe3;hp=51e8ba6e88497ce237bc6201b7a05ab60e4bd533;hpb=b606e1a567586b0498a0632142904ad1a79d6e44;p=goodfet

diff --git a/firmware/Makefile b/firmware/Makefile
index 51e8ba6..11eaddb 100644
--- 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
@@ -24,8 +24,9 @@ platform?=goodfet
 #GCCINC=-T ldscripts/161x.x
 GCCINC=-T ldscripts/$(mcu).x
 
-CCEXTRA?=
-CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms $(CCEXTRA)
+CCEXTRA?=  -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms
+GCC?=msp430-gcc
+CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 
 # Available Applications
 # ======================
@@ -91,13 +92,13 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 # config = monitor jtagxscale
 
 # OpenOCD bit-bang device
-config = monitor openocd
+#config = monitor openocd
 
 # Old Default Config
 # config = monitor sbw  chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
 
 # New default.
-config ?= monitor chipcon ccspi nrf spi jtagarm7 jtag430 jtag430x2 avr
+config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi
 
 # Build the needed list of app and lib object files from the config
 apps=