X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=030bc020ab4e27dad9e0a6ce0ac6ec3ca183d152;hp=86924b2682e89b58217b1d86a5bc325733fb8d9e;hb=c00829e3bbc2d574d2fc35059696018f90d87d96;hpb=29c88436fcb77cc01088694e54731ac950956afd

diff --git a/firmware/Makefile b/firmware/Makefile
index 86924b2..030bc02 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,6 +1,6 @@
 
 #include `uname`.mak
-#GOODFET?=/dev/ttyUSB0
+GOODFET?=/dev/ttyUSB0
 
 #For tos-bsl, use --invert-reset --invert-test
 BSL?=goodfet.bsl --speed=38400
@@ -9,13 +9,15 @@ BSL?=goodfet.bsl --speed=38400
 #Default removed because of confusion.
 
 #mcu=msp430x2274
-#mcu=msp430x2618
+mcu=msp430x2618
 #mcu?=msp430x1612
-mcu?=RUNCONFIG
+#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.
@@ -23,7 +25,7 @@ platform?=goodfet
 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)
+CC=msp430-gcc -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms $(CCEXTRA)
 
 # Available Applications
 # ======================
@@ -48,6 +50,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
@@ -87,9 +90,14 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 # XScale PXA255 JTAG
 # 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 ccspi nrf spi jtagarm7 jtag430 jtag430x2 avr openocd
 
 # Build the needed list of app and lib object files from the config
 apps= 
@@ -125,6 +133,7 @@ ifeq ($(filter sbw, $(config)), sbw)
 		hdrs+= jtag.h
 	endif
 	apps+= apps/jtag/sbw.o
+	hdrs+= sbw.h
 endif
 
 # include jtag430 app
@@ -212,6 +221,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
@@ -296,13 +316,14 @@ run:
 
 install: $(app).hex
 	$(BSL) -e -p $(app).hex 
-	#ls info.txt && $(BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
+installinfo:
+	$(BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
 verify:
 	$(BSL) -P $(app).hex -v $(app).hex
 dumpinfo:
 	$(BSL) --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