More code cleanup. Broke support for the Launchpad.

[goodfet] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 124e36f..07f1765 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,26 +1,15 @@
 -include config.mk
 
-#platform?=goodfet
-#platform?=telosb
-#platform?=z1
-#platform?=nhbadge
-#platform?=nhbadgeb
-#platofrm?=arduino
-#platform?=tilaunchpad
+
 platform?=goodfet
 
-# donb 
+# donb
 ifeq ($(platform),donbfet)
 GCC?=avr-gcc
 mcu?=atmega644p
 CFLAGS=$(DEBUG) -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields
 endif
 
-ifeq ($(platform),tilaunchpad)
-mcu?=msp430x1612
-CFLAGS+=-DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
-#CFLAGS+= -Werror
-endif
 
 #include `uname`.mak
 GOODFET?=/dev/tty.usbser*
@@ -44,16 +33,20 @@ mcu?=RUNCONFIG
 GCCINC?=
 
 #GCC?=avr-gcc
-GCC?=msp430-gcc -T ldscripts/$(mcu).x
+# We use -Wl,-dT because gcc adds the msp430mcu definitions at the
+# very end of the command line, so they only have an effect for a
+# default linker script
+GCC?=msp430-gcc
+LDFLAGS?=-Wl,-dT ldscripts/$(mcu).x
 
-CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms
+CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) $(GCCINC) -I include -I platforms
 CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 
 # Available Applications
 # ======================
 # Below is a list of available applications and their descriptions.
 
-# PRODUCTION: 
+# PRODUCTION:
 # None have made it to production grade quality
 
 # BETA:
@@ -125,17 +118,13 @@ else
 config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi
 endif
 
-# donb 
-ifeq ($(platform),donbfet)
-config=monitor avr spi jscan
-endif
 
 # Build the needed list of app and lib object files from the config
-apps= 
+apps=
 
 ifeq ($(platform),tilaunchpad)
 libs= lib/$(platform).o lib/command.o lib/apps.o lib/msp430_serial.o
-#libs+=lib/setjmp.o 
+#libs+=lib/setjmp.o
 else
 libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o lib/msp430.o lib/arduino.o
 endif
@@ -377,16 +366,17 @@ erase:
        $(JTAG) -e $(app).hex
 else
 install: $(app).hex
-       $(MSP430BSL) -e -p $(app).hex 
+       $(MSP430BSL) -e -p $(app).hex
 installinfo:
        $(MSP430BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
 verify:
        $(MSP430BSL) -P $(app).hex -v $(app).hex
+erase:
+       $(MSP430BSL) -e
+
 endif
 dumpinfo:
        $(MSP430BSL) --dumpinfo
-erase:
-       $(MSP430BSL) -e 
 $(app).c: config builddate appsfiles err
 $(app): $(libs) $(apps)