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

diff --git a/firmware/Makefile b/firmware/Makefile
index 42adfc2..41f8dab 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -23,7 +23,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 -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms $(CCEXTRA)
 
 # Available Applications
 # ======================
@@ -85,10 +85,13 @@ 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
 
 # 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 nrf spi jtagarm7 jtag430 avr
 
 
 # Build the needed list of app and lib object files from the config
@@ -125,7 +128,6 @@ ifeq ($(filter sbw, $(config)), sbw)
 		hdrs+= jtag.h
 	endif
 	apps+= apps/jtag/sbw.o
-	hdrs+= sbw.h
 endif
 
 # include jtag430 app
@@ -153,6 +155,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
@@ -293,7 +299,8 @@ 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:
@@ -307,7 +314,7 @@ m4s: $(app).hex
 erase:
 	$(BSL) -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