X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2FMakefile;h=cb27fde60f606e89547fd31b9b04ccfa3b52bc8d;hb=363ca47c79cf3a39dca93a54fe48e0253c946c8b;hp=643163dcedc6392e76fa90e322fec745b4346300;hpb=0fdf6e0b883ba3f7661e555145a3601609729e89;p=goodfet

diff --git a/firmware/Makefile b/firmware/Makefile
index 643163d..cb27fde 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -25,10 +25,10 @@ mcu?=RUNCONFIG
 platform?=goodfet
 
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.
-GCCINC?=-T ldscripts/$(mcu).x
+GCCINC?=
 
 #GCC?=avr-gcc
-GCC?=msp430-gcc
+GCC?=msp430-gcc -T ldscripts/$(mcu).x
 
 CCEXTRA?=  -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms
 CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
@@ -103,11 +103,11 @@ CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 # config = monitor sbw  chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
 
 # New default.
-config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi
+config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd 
 
 # Build the needed list of app and lib object files from the config
 apps= 
-libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o lib/msp430.o
+libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o lib/msp430.o lib/arduino.o
 hdrs=
 ERR=