Fixed support for GCC4.

[goodfet] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 42adfc2..d0bffc7 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -16,6 +16,8 @@ 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 -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms $(CCEXTRA)
 
 # Available Applications
 # ======================
@@ -85,10 +87,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 ccspi nrf spi jtagarm7 jtag430 jtag430x2 avr
 
 
 # Build the needed list of app and lib object files from the config
@@ -153,6 +158,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
@@ -221,6 +230,8 @@ ifeq ($(filter avr, $(config)), avr)
        hdrs+= avr.h
 endif
 
+
+
 # include pic app
 ifeq ($(filter pic, $(config)), pic)
        apps+= apps/pic/pic.o
@@ -293,13 +304,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
@@ -307,7 +319,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