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

diff --git a/firmware/Makefile b/firmware/Makefile
index f96968f..42adfc2 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -2,12 +2,9 @@
 #include `uname`.mak
 #GOODFET?=/dev/ttyUSB0
 
-
-
 #For tos-bsl, use --invert-reset --invert-test
 BSL?=goodfet.bsl --speed=38400
 
-
 #One of these should be defined explicitly.
 #Default removed because of confusion.
 
@@ -28,16 +25,249 @@ 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)
 
-#Define extra modules here.
-#moreapps?=apps/i2c/i2c.o  apps/glitch/glitch.o apps/jtag/sbw.o apps/smartcard/smartcard.o apps/jtag/ejtag.o apps/jtag/jtagxscale.o
-moreapps?=apps/jtag/sbw.o apps/glitch/glitch.o
-# should include apps/jtag/jtagarm7tdmi.o to build jtag for ARM7
-# should include apps/pic/dspic33f.o to build support for PIC24H/dsPIC33F
+# Available Applications
+# ======================
+# Below is a list of available applications and their descriptions.
+
+# PRODUCTION: 
+# None have made it to production grade quality
+
+# BETA:
+# monitor -- Basic monitor
+# spi -- Turns GF into USB-to-SPI adapter
+# jtag -- Low level JTAG (needed by all other JTAG code)
+# sbw -- Makes JTAG Spy-by-wire multiplexable
+
+# ALPHA:
+# jtag430 -- 16-bit MSP430 JTAG
+# jtag430x2 -- 20-bit MSP430 JTAG
+
+# PRE-ALPHA:
+#  Bus protocols:
+# i2c -- Turns GF into USB-to-i2c adapter
+# jtagarm7 -- ARM7TDMI JTAG
+# ejtag -- MIPS JTAG
+# jtagxscale -- XScale JTAG
+
+#  Microcontrollers:
+# chipcon -- Chipcon radio 8051 debugging
+# avr -- AVR debugger
+# pic -- PIC24H/dsPIC33F debugger
+# adc -- ADC10 (still specific to x2274, GoodFET32)
+
+#  Radios:
+# nrf -- Nordic RF SPI
+# ccspi -- Chipcon SPI
+
+# Miscelaneous:
+# glitch -- Glitch research tool
+# smartcard -- Smartcard IO
+# ps2 -- PS2 spy
+
+
+# Configurations
+# ==============
+# This is what you need to customize to specify which apps you want in your
+# firmware.  The "config" variable is just a space-delimited list of apps you
+# want included.  The makefile will take the list of apps and include all of
+# the proper code needed to build your desired firmware.
+
+# bare minimum
+# config = monitor
+
+# basic JTAG adapter
+# config = monitor jtag
+
+# Chipcon hacking
+# config = monitor chipcon ccspi
+
+# Glitch research
+# config = monitor glitch
+
+# XScale PXA255 JTAG
+config = monitor jtagxscale
+
+# Old Default Config
+#config = monitor sbw glitch chipcon nrf ccspi 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 lib/apps.o
+hdrs=
+ERR=
 
-apps= $(moreapps) apps/chipcon/chipcon.o apps/radios/nrf.o apps/radios/ccspi.o apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o 
+# include monitor app
+ifeq ($(filter monitor, $(config)), monitor)
+	apps+= apps/monitor/monitor.o
+	hdrs+= monitor.h
+endif
 
-#apps/chipcon/chipconasm.o removed
-libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o  lib/dco_calib.o
+# 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
+
+# include the sbw defs if they specified it
+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
+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
+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
+		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
+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)
+	# 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/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
+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/pic.o
+	hdrs+= pic.h
+endif
+
+# include adc app
+ifeq ($(filter adc, $(config)), adc)
+	ifeq ($(mcu), msp430x2274)
+		apps+= apps/adc/adc.o
+		hdrs+= adc.h
+	else
+		ERR= $(error The ADC app only works on GoodFET boards with the msp430x2274 processor)
+	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
 
 app= goodfet
 
@@ -51,6 +281,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:
@@ -58,12 +293,12 @@ run:
 
 install: $(app).hex
 	$(BSL) -e -p $(app).hex 
-	ls info.txt && $(BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
+	#ls info.txt && $(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
@@ -72,9 +307,10 @@ m4s: $(app).hex
 erase:
 	$(BSL) -e 
 clean:
-	rm -f $(app) $(app).hex $(libs) $(apps) include/config.h
+	rm -f $(app) $(app).hex $(libs) $(apps) include/config.h include/builddate.h include/apps.h
 docs:
 	doxygen
 pushdocs: docs
 	rsync --exclude .svn -ave ssh doc/html/* travisutk,goodfet@web.sourceforge.net:htdocs/docs/
 .FAKE: docs
+