X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=124e36fa7b7d9883bf0761aa1e3fa91a6dbc5841;hp=11eaddbf34fb656135b1e8d4b0dd6eba61e87d56;hb=f357e70c634e9b5221659c3b4e48d728ecbbc04f;hpb=21ff17d2af1e50542d9343d7177269a8910ebbe3

diff --git a/firmware/Makefile b/firmware/Makefile
index 11eaddb..124e36f 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,31 +1,52 @@
+-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
 
 #include `uname`.mak
-GOODFET?=/dev/ttyUSB0
+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
-BSL?=goodfet.bsl --speed=38400
+MSP430BSL?=goodfet.bsl --speed=38400
+JTAG=msp430-jtag
 
 #One of these should be defined explicitly.
 #Default removed because of confusion.
 
-#mcu?=msp430x2274
 #mcu?=msp430x2618
 #mcu?=msp430x1612
+#mcu?=atmega168
 mcu?=RUNCONFIG
 
-#platform=goodfet
-#platform=telosb
-#platform=z1
-#platform=nhbadge
-#platform=nhbadgeb
-platform?=goodfet
 
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.
-#GCCINC=-T ldscripts/161x.x
-GCCINC=-T ldscripts/$(mcu).x
+GCCINC?=
+
+#GCC?=avr-gcc
+GCC?=msp430-gcc -T ldscripts/$(mcu).x
 
-CCEXTRA?=  -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms
-GCC?=msp430-gcc
+CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms
 CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 
 # Available Applications
@@ -98,11 +119,27 @@ CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 # config = monitor sbw  chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
 
 # New default.
+ifeq ($(platform),tilaunchpad)
+config ?= monitor chipcon i2c
+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= 
-libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o
+
+ifeq ($(platform),tilaunchpad)
+libs= lib/$(platform).o lib/command.o lib/apps.o lib/msp430_serial.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
+
 hdrs=
 ERR=
 
@@ -118,6 +155,12 @@ ifeq ($(filter spi, $(config)), spi)
 	hdrs+= spi.h
 endif
 
+# include twe app
+ifeq ($(filter twe, $(config)), twe)
+        apps+= apps/twe/twe.o
+        hdrs+= twe.h
+endif
+
 # include base jtag if they specified it explicitly
 ifeq ($(filter jtag, $(config)), jtag)
 	ifneq ($(filter apps/jtag/jtag.o, $(apps)), apps/jtag/jtag.o)
@@ -291,6 +334,12 @@ ifeq ($(filter ps2, $(config)), ps2)
 	hdrs+= ps2.h
 endif
 
+# include jscan app
+ifeq ($(filter jscan, $(config)), jscan)
+	apps+= apps/jscan/jscan.o
+	hdrs+= jscan.h
+endif
+
 # Rules
 
 app= goodfet
@@ -315,22 +364,41 @@ goodfet.hex: goodfet
 run:
 	../client/goodfet.msp430 test
 
+avrinstall: $(app).hex
+	#to be merged
+	avrdude -V -F -c stk500v1 -p m328p -b 57600 -P $(GOODFET) -U flash:w:$(app).hex
+
+ifeq ($(platform),tilaunchpad)
+install: $(app).hex
+	$(JTAG) -e -p $(app).hex
+verify:
+	$(JTAG) -v $(app).hex
+erase:
+	$(JTAG) -e $(app).hex
+else
 install: $(app).hex
-	$(BSL) -e -p $(app).hex 
+	$(MSP430BSL) -e -p $(app).hex 
 installinfo:
-	$(BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
+	$(MSP430BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
 verify:
-	$(BSL) -P $(app).hex -v $(app).hex
+	$(MSP430BSL) -P $(app).hex -v $(app).hex
+endif
 dumpinfo:
-	$(BSL) --dumpinfo
+	$(MSP430BSL) --dumpinfo
+erase:
+	$(MSP430BSL) -e 
 $(app).c: config builddate appsfiles err
 $(app): $(libs) $(apps)
+
+ifeq ($(platform),donbfet)
+$(app).hex: $(app)
+	avr-objcopy -j .text -j .data -O ihex goodfet goodfet.hex
+else
 $(app).hex: $(app)
 	msp430-objcopy goodfet -O ihex goodfet.hex
+endif
 m4s: $(app).hex
 	msp430-objdump -D -m msp430 $(app).hex | m4s init
-erase:
-	$(BSL) -e 
 clean:
 	rm -f $(app) $(app).hex $(libs) $(apps) lib/apps.c include/config.h include/builddate.h include/apps.h
 docs: