X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=firmware%2FMakefile;h=4df40288d1b74c5e9a5e6068f482d195bbc8b488;hb=9134ed351ad68ee6c10875f02571b4c46d2072fa;hp=849c5feb397172159138ca0d4f60bf2c35e5c191;hpb=350c674c6bcd97ec2f883b07e0cf49eb8a480183;p=goodfet

diff --git a/firmware/Makefile b/firmware/Makefile
index 849c5fe..4df4028 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,44 +1,16 @@
 -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.
 GCCINC?=
@@ -48,10 +20,10 @@ 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?=-mmcu=$(mcu) #-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)
+CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -Dboard=$(board) $(GCCINC) -I include -I platforms
+CC=$(GCC) -Wall -O1 -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 
 # Available Applications
 # ======================
@@ -129,10 +101,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=
@@ -300,7 +268,7 @@ endif
 
 # include adc app
 ifeq ($(filter adc, $(config)), adc)
-	ifeq ($(mcu), msp430x2274)
+	ifeq ($(mcu), msp430f2274)
 		apps+= apps/adc/adc.o
 		hdrs+= adc.h
 	else
@@ -386,11 +354,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)