X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=1cf9b6c5ea54aef16d4d041149189c4ee941c5e5;hp=42adfc22cbf7b57b1151623c6b94d2fcaa5fe85f;hb=092aa3fd5225a9daa84bc1359b8b9d772d795784;hpb=5fb0341d348e101b30794945a6c91546e25e8e7b

diff --git a/firmware/Makefile b/firmware/Makefile
index 42adfc2..1cf9b6c 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,29 +1,37 @@
 
 #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
 
 #One of these should be defined explicitly.
 #Default removed because of confusion.
 
-#mcu=msp430x2274
-#mcu=msp430x2618
+#mcu?=msp430x2274
+#mcu?=msp430x2618
 #mcu?=msp430x1612
+#mcu?=atmega168
 mcu?=RUNCONFIG
 
-#platform=goodfet
-#platform=telosb
-#platform=z1
+#platform?=goodfet
+#platform?=telosb
+#platform?=z1
+#platform?=nhbadge
+#platform?=nhbadgeb
+#platofrm?=arduino
 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?=-T ldscripts/$(mcu).x
 
-CCEXTRA?=
-CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include $(CCEXTRA)
+#GCC?=avr-gcc
+GCC?=msp430-gcc
+
+CCEXTRA?=  -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
 # ======================
@@ -48,6 +56,7 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 # jtagarm7 -- ARM7TDMI JTAG
 # ejtag -- MIPS JTAG
 # jtagxscale -- XScale JTAG
+# openocd -- OpenOCD bitbang device
 
 #  Microcontrollers:
 # chipcon -- Chipcon radio 8051 debugging
@@ -85,15 +94,20 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 # config = monitor glitch
 
 # XScale PXA255 JTAG
-config = monitor jtagxscale
+# config = monitor jtagxscale
+
+# OpenOCD bit-bang device
+#config = monitor openocd
 
 # Old Default Config
-#config = monitor sbw glitch chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
+# config = monitor sbw  chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
 
+# New default.
+config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi
 
 # 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
+libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o lib/msp430.o lib/arduino.o
 hdrs=
 ERR=
 
@@ -153,6 +167,10 @@ ifeq ($(filter jtag430x2, $(config)), jtag430x2)
 	# add in the jtag430asm code if needed
 	ifneq ($(filter jtag430asm.o, $(libs)), jtag430asm.o)
 		libs+= apps/jtag/jtag430asm.o
+	endif
+	#add in the jtag430 app if not already
+	ifneq ($(filter apps/jtag/jtag430.o, $(apps)), apps/jtag/jtag430.0)
+		apps+= apps/jtag/jtag430.o
 		hdrs+= jtag430.h
 	endif
 	apps+= apps/jtag/jtag430x2.o
@@ -209,6 +227,17 @@ ifeq ($(filter jtagxscale, $(config)), jtagxscale)
 	hdrs+= jtagxscale.h
 endif
 
+# include openocd app
+ifeq ($(filter openocd, $(config)), openocd)
+	# add in base jtag code if not already
+	ifneq ($(filter apps/jtag/jtag.o, $(apps)), apps/jtag/jtag.o)
+		apps+= apps/jtag/jtag.o
+		hdrs+= jtag.h
+	endif
+	apps+= apps/jtag/openocd.o
+	hdrs+= openocd.h
+endif
+
 # include chipcon app
 ifeq ($(filter chipcon, $(config)), chipcon)
 	apps+= apps/chipcon/chipcon.o
@@ -291,23 +320,27 @@ 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
 install: $(app).hex
-	$(BSL) -e -p $(app).hex 
-	#ls info.txt && $(BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
+	$(MSP430BSL) -e -p $(app).hex 
+installinfo:
+	$(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
 dumpinfo:
-	$(BSL) --dumpinfo
+	$(MSP430BSL) --dumpinfo
 $(app).c: config builddate appsfiles err
-$(app): $(app).c $(libs) $(apps)
+$(app): $(libs) $(apps)
 $(app).hex: $(app)
 	msp430-objcopy goodfet -O ihex goodfet.hex
 m4s: $(app).hex
 	msp430-objdump -D -m msp430 $(app).hex | m4s init
 erase:
-	$(BSL) -e 
+	$(MSP430BSL) -e 
 clean:
-	rm -f $(app) $(app).hex $(libs) $(apps) include/config.h include/builddate.h include/apps.h
+	rm -f $(app) $(app).hex $(libs) $(apps) lib/apps.c include/config.h include/builddate.h include/apps.h
 docs:
 	doxygen
 pushdocs: docs