X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=897e4ec07d36a1259a3650faf47fb5710009fd02;hp=09208f095e4d5af8ef095115295cc584662299f2;hb=c5823f8b7ca8d31440a6a708b89a9c7354aa173e;hpb=d03d57090931d83f8954485765a441f4fd197513

diff --git a/firmware/Makefile b/firmware/Makefile
index 09208f0..897e4ec 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,43 +1,17 @@
 -include config.mk
 
-#platform?=goodfet
-#platform?=telosb
-#platform?=z1
-#platform?=nhbadge
-#platform?=nhbadgeb
-#platofrm?=arduino
-#platform?=tilaunchpad
-platform?=goodfet
-
-# 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
+platform?=goodfet
+mcu?=RUNCONFIG
 
 #include `uname`.mak
 GOODFET?=/dev/tty.usbser*
 
-#For Arduino,
-#BSL?=avrdude -V -F -c stk500v1 -p m328p -b 57600 -P /dev/tty.usbserial-* -U flash:w:blink.hex
 #For tos-bsl, use --invert-reset --invert-test
 MSP430BSL?=goodfet.bsl --speed=38400
 JTAG=msp430-jtag
 
-#One of these should be defined explicitly.
-#Default removed because of confusion.
 
-#mcu?=msp430x2618
-#mcu?=msp430x1612
-#mcu?=atmega168
-mcu?=RUNCONFIG
 
 
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.
@@ -50,7 +24,7 @@ GCCINC?=
 GCC?=msp430-gcc
 LDFLAGS?=-Wl,-dT ldscripts/$(mcu).x
 
-CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) $(GCCINC) -I include -I platforms
+CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -Dboard=$(board) $(GCCINC) -I include -I platforms
 CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 
 # Available Applications
@@ -129,10 +103,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 +356,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)