More code cleanup. Broke support for the Launchpad.

[goodfet] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 849c5fe..07f1765 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,12 +1,6 @@
 -include config.mk
 
-#platform?=goodfet
-#platform?=telosb
-#platform?=z1
-#platform?=nhbadge
-#platform?=nhbadgeb
-#platofrm?=arduino
-#platform?=tilaunchpad
+
 platform?=goodfet
 
 # donb
@@ -16,11 +10,6 @@ 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*
@@ -48,7 +37,7 @@ GCCINC?=
 # very end of the command line, so they only have an effect for a
 # default linker script
 GCC?=msp430-gcc
-LDFLAGS?=-Wl,-dT ldscripts/msp430.x
+LDFLAGS?=-Wl,-dT ldscripts/$(mcu).x
 
 CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) $(GCCINC) -I include -I platforms
 CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
@@ -129,10 +118,6 @@ 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=
@@ -386,11 +371,12 @@ 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)