X-Git-Url: http://git.rot13.org//?a=blobdiff_plain;f=firmware%2FMakefile;h=c984d111fc49d32b40ba7c9d5b9c3638fd5b30a5;hb=e199893f6b2a5c503abac8ebc074483246999a5e;hp=a3b7cfc6327185ba3d0c0ddb637c8c85570354cc;hpb=c267c64141b4cafb1cd1b4d7e897f3fdca27d7c6;p=goodfet

diff --git a/firmware/Makefile b/firmware/Makefile
index a3b7cfc..c984d11 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
@@ -25,7 +25,7 @@ platform?=goodfet
 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)
+CC=msp430-gcc -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms $(CCEXTRA)
 
 # Available Applications
 # ======================
@@ -97,7 +97,7 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 # 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 jtagarm7 jtag430 jtag430x2 avr openocd
 
 # Build the needed list of app and lib object files from the config
 apps=