Additional targets.

[goodfet] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index f799d6b..b96d358 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
 # ======================
@@ -52,7 +54,7 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 #  Microcontrollers:
 # chipcon -- Chipcon radio 8051 debugging
 # avr -- AVR debugger
-# dspic -- PIC24H/dsPIC33F debugger
+# pic -- PIC24H/dsPIC33F debugger
 # adc -- ADC10 (still specific to x2274, GoodFET32)
 
 #  Radios:
@@ -62,6 +64,7 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 # Miscelaneous:
 # glitch -- Glitch research tool
 # smartcard -- Smartcard IO
+# ps2 -- PS2 spy
 
 
 # Configurations
@@ -87,27 +90,35 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 # 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 jtag430x2 avr
 
 
 # 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
+apps= 
+libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o
+hdrs=
+ERR=
 
 # include monitor app
 ifeq ($(filter monitor, $(config)), monitor)
        apps+= apps/monitor/monitor.o
+       hdrs+= monitor.h
 endif
 
 # include spi app
 ifeq ($(filter spi, $(config)), spi)
        apps+= apps/spi/spi.o
+       hdrs+= spi.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)
                apps+= apps/jtag/jtag.o
+               hdrs+= jtag.h
        endif
 endif
 
@@ -116,8 +127,10 @@ ifeq ($(filter sbw, $(config)), sbw)
        # if they only specify sbw, include jtag
        ifneq ($(filter apps/jtag/jtag.o, $(apps)), apps/jtag/jtag.o)
                apps+= apps/jtag/jtag.o
+               hdrs+= jtag.h
        endif
        apps+= apps/jtag/sbw.o
+       hdrs+= sbw.h
 endif
 
 # include jtag430 app
@@ -125,12 +138,14 @@ ifeq ($(filter jtag430, $(config)), jtag430)
        # 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
        # add in the jtag430asm code if needed
        ifneq ($(filter apps/jtag/jtag430asm.o, $(libs)), apps/jtag/jtag430asm.o)
                apps+= apps/jtag/jtag430asm.o
        endif
        apps+= apps/jtag/jtag430.o
+       hdrs+= jtag430.h
 endif
 
 # include jtag430x2 app
@@ -138,17 +153,25 @@ ifeq ($(filter jtag430x2, $(config)), jtag430x2)
        # 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
        # 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
+       hdrs+= jtag430x2.h
 endif
 
 # include i2c app
 ifeq ($(filter i2c, $(config)), i2c)
        apps+= apps/i2c/i2c.o
+       hdrs+= i2c.h
 endif
 
 # include jtagarm7 app
@@ -156,26 +179,32 @@ ifeq ($(filter jtagarm7, $(config)), jtagarm7)
        # 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/jtagarm7.o
+       hdrs+= jtagarm7.h
 endif
 
 # include jtagarm7tdmi app
-ifeq ($(filter jtagarm7tdmi, $(config)), jtagarm7tdmi)
+#ifeq ($(filter jtagarm7tdmi, $(config)), jtagarm7tdmi)
        # add in base jtag code if not already
-       ifneq ($(filter apps/jtag/jtag.o, $(apps)), apps/jtag/jtag.o)
-               apps+= apps/jtag/jtag.o
-       endif
-       apps+= apps/jtag/jtagarm7tdmi.o
-endif
+       #ifneq ($(filter apps/jtag/jtag.o, $(apps)), apps/jtag/jtag.o)
+               #apps+= apps/jtag/jtag.o
+               #hdrs+= jtag.h
+       #endif
+       #apps+= apps/jtag/jtagarm7tdmi.o
+       #hdrs+= jtagarm7tdmi.h
+#endif
 
 # include ejtag app
 ifeq ($(filter ejtag, $(config)), ejtag)
        # 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/ejtag.o
+       hdrs+= ejtag.h
 endif
 
 # include jtagxscale app
@@ -183,57 +212,71 @@ ifeq ($(filter jtagxscale, $(config)), jtagxscale)
        # 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/jtagxscale.o
+       hdrs+= jtagxscale.h
 endif
 
 # include chipcon app
 ifeq ($(filter chipcon, $(config)), chipcon)
        apps+= apps/chipcon/chipcon.o
+       hdrs+= chipcon.h
 endif
 
 # include avr app
 ifeq ($(filter avr, $(config)), avr)
        apps+= apps/avr/avr.o
+       hdrs+= avr.h
 endif
 
+
+
 # include pic app
 ifeq ($(filter pic, $(config)), pic)
-       apps+= apps/pic/dspic33f.o
+       apps+= apps/pic/pic.o
+       hdrs+= pic.h
 endif
 
-# include adc10 app
+# include adc app
 ifeq ($(filter adc, $(config)), adc)
        ifeq ($(mcu), msp430x2274)
-               apps+= apps/pic/dspic33f.o
+               apps+= apps/adc/adc.o
+               hdrs+= adc.h
        else
                ERR= $(error The ADC app only works on GoodFET boards with the msp430x2274 processor)
-.PHONY: err
-err:;$(ERR)
-
        endif
 endif
 
 # include chipcon radio spi app
 ifeq ($(filter ccspi, $(config)), ccspi)
        apps+= apps/radios/ccspi.o
+       hdrs+= ccspi.h
 endif
 
 # include nrf app
 ifeq ($(filter nrf, $(config)), nrf)
        apps+= apps/radios/nrf.o
+       hdrs+= nrf.h
 endif
 
 # include glitch app
 ifeq ($(filter glitch, $(config)), glitch)
        apps+= apps/glitch/glitch.o
+       hdrs+= glitch.h
 endif
 
 # include smartcard app
 ifeq ($(filter smartcard, $(config)), smartcard)
        apps+= apps/smartcard/smartcard.o
+       hdrs+= smartcard.h
 endif
 
+# include ps2 app
+ifeq ($(filter ps2, $(config)), ps2)
+       apps+= apps/plugins/ps2.o
+       hdrs+= ps2.h
+endif
 
 # Rules
 
@@ -249,6 +292,11 @@ lib/RUNCONFIG.o:
        false
 config:
        cp platforms/$(platform).h include/config.h
+appsfiles:
+       ./gen_apps $(hdrs)
+err:;$(ERR)
+builddate:
+       ./gen_builddate_h
 goodfet.hex: goodfet
 
 run:
@@ -256,12 +304,13 @@ 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
+$(app).c: config builddate appsfiles err
 $(app): $(app).c $(libs) $(apps)
 $(app).hex: $(app)
        msp430-objcopy goodfet -O ihex goodfet.hex
@@ -270,7 +319,7 @@ m4s: $(app).hex
 erase:
        $(BSL) -e 
 clean:
-       rm -f $(app) $(app).hex $(libs) $(apps) include/config.h
+       rm -f $(app) $(app).hex $(libs) $(apps) lib/apps.c include/config.h include/builddate.h include/apps.h
 docs:
        doxygen
 pushdocs: docs