X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=2a0ad6f52feb11753307bd13e541b4417150d3d9;hp=3dcd605dd8736a95da4402743a1f2821a4fb5ddc;hb=5a403079bcbe888638417dbe7aa77723b265f94e;hpb=69539bb167246135b1bde3c55dca7d19bc3c7aee

diff --git a/firmware/Makefile b/firmware/Makefile
index 3dcd605..2a0ad6f 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,53 +1,34 @@
+-include config.mk
 
 
-#platform?=goodfet
-#platform?=telosb
-#platform?=z1
-#platform?=nhbadge
-#platform?=nhbadgeb
-#platofrm?=arduino
-#platform?=tilaunchpad
 platform?=goodfet
-
-
-ifeq ($(platform),tilaunchpad)
-mcu?=msp430x1612
-CFLAGS+=-DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
-#CFLAGS+= -Werror
-endif
+mcu?=RUNCONFIG
 
 #include `uname`.mak
 GOODFET?=/dev/tty.usbser*
 
-#For Arduino,
-#BSL?=avrdude -V -F -c stk500v1 -p m328p -b 57600 -P /dev/tty.usbserial-* -U flash:w:blink.hex
 #For tos-bsl, use --invert-reset --invert-test
 MSP430BSL?=goodfet.bsl --speed=38400
 JTAG=msp430-jtag
 
-#One of these should be defined explicitly.
-#Default removed because of confusion.
-
-#mcu?=msp430x2618
-#mcu?=msp430x1612
-#mcu?=atmega168
-mcu?=RUNCONFIG
-
 
-#N.B., gcc WILL NOT BITCH if this file doesn't exist.
 GCCINC?=
 
 #GCC?=avr-gcc
-GCC?=msp430-gcc -T ldscripts/$(mcu).x
+# We use -Wl,-dT because gcc adds the msp430mcu definitions at the
+# very end of the command line, so they only have an effect for a
+# default linker script
+GCC?=msp430-gcc
+LDFLAGS?=-mmcu=$(mcu) #-Wl,-dT ldscripts/$(mcu).x
 
-CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms
-CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
+CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -Dboard=$(board) $(GCCINC) -I include -I platforms
+CC=$(GCC) -Wall -O1 -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 
 # Available Applications
 # ======================
 # Below is a list of available applications and their descriptions.
 
-# PRODUCTION: 
+# PRODUCTION:
 # None have made it to production grade quality
 
 # BETA:
@@ -116,15 +97,16 @@ CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 ifeq ($(platform),tilaunchpad)
 config ?= monitor chipcon i2c
 else
-config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi
+config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi maxusb
 endif
 
+
 # Build the needed list of app and lib object files from the config
-apps= 
+apps=
 
 ifeq ($(platform),tilaunchpad)
 libs= lib/$(platform).o lib/command.o lib/apps.o lib/msp430_serial.o
-#libs+=lib/setjmp.o 
+#libs+=lib/setjmp.o
 else
 libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o lib/msp430.o lib/arduino.o
 endif
@@ -144,6 +126,12 @@ ifeq ($(filter spi, $(config)), spi)
 	hdrs+= spi.h
 endif
 
+# include twe app
+ifeq ($(filter twe, $(config)), twe)
+        apps+= apps/twe/twe.o
+        hdrs+= twe.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)
@@ -152,6 +140,14 @@ ifeq ($(filter jtag, $(config)), jtag)
 	endif
 endif
 
+# include MAX342x USB drivers.
+ifeq ($(filter maxusb, $(config)), maxusb)
+	ifneq ($(filter apps/usb/maxusb.o, $(apps)), apps/usb/maxusb.o)
+		apps+= apps/usb/maxusb.o
+		hdrs+= maxusb.h
+	endif
+endif
+
 # include the sbw defs if they specified it
 ifeq ($(filter sbw, $(config)), sbw)
 	# if they only specify sbw, include jtag
@@ -279,7 +275,7 @@ endif
 
 # include adc app
 ifeq ($(filter adc, $(config)), adc)
-	ifeq ($(mcu), msp430x2274)
+	ifeq ($(mcu), msp430f2274)
 		apps+= apps/adc/adc.o
 		hdrs+= adc.h
 	else
@@ -317,6 +313,12 @@ ifeq ($(filter ps2, $(config)), ps2)
 	hdrs+= ps2.h
 endif
 
+# include jscan app
+ifeq ($(filter jscan, $(config)), jscan)
+	apps+= apps/jscan/jscan.o
+	hdrs+= jscan.h
+endif
+
 # Rules
 
 app= goodfet
@@ -354,20 +356,27 @@ erase:
 	$(JTAG) -e $(app).hex
 else
 install: $(app).hex
-	$(MSP430BSL) -e -p $(app).hex 
+	$(MSP430BSL) -e -p $(app).hex
 installinfo:
 	$(MSP430BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
 verify:
 	$(MSP430BSL) -P $(app).hex -v $(app).hex
+erase:
+	$(MSP430BSL) -e
+
 endif
 dumpinfo:
 	$(MSP430BSL) --dumpinfo
-erase:
-	$(MSP430BSL) -e 
 $(app).c: config builddate appsfiles err
 $(app): $(libs) $(apps)
+
+ifeq ($(platform),donbfet)
+$(app).hex: $(app)
+	avr-objcopy -j .text -j .data -O ihex goodfet goodfet.hex
+else
 $(app).hex: $(app)
 	msp430-objcopy goodfet -O ihex goodfet.hex
+endif
 m4s: $(app).hex
 	msp430-objdump -D -m msp430 $(app).hex | m4s init
 clean: