maxusb is now default.

[goodfet] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 51e8ba6..2a0ad6f 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,37 +1,34 @@
+-include config.mk
+
+
+platform?=goodfet
+mcu?=RUNCONFIG
 
 #include `uname`.mak
-GOODFET?=/dev/ttyUSB0
+GOODFET?=/dev/tty.usbser*
 
 #For tos-bsl, use --invert-reset --invert-test
-BSL?=goodfet.bsl --speed=38400
+MSP430BSL?=goodfet.bsl --speed=38400
+JTAG=msp430-jtag
 
-#One of these should be defined explicitly.
-#Default removed because of confusion.
 
-#mcu=msp430x2274
-mcu=msp430x2618
-#mcu?=msp430x1612
-#mcu?=RUNCONFIG
+GCCINC?=
 
-#platform=goodfet
-#platform=telosb
-#platform=z1
-#platform=nhbadge
-#platform=nhbadgeb
-platform?=goodfet
+#GCC?=avr-gcc
+# 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
 
-#N.B., gcc WILL NOT BITCH if this file doesn't exist.
-#GCCINC=-T ldscripts/161x.x
-GCCINC=-T ldscripts/$(mcu).x
-
-CCEXTRA?=
-CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms $(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:
@@ -91,17 +88,29 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 # config = monitor jtagxscale
 
 # OpenOCD bit-bang device
-config = monitor openocd
+#config = monitor openocd
 
 # Old Default Config
 # config = monitor sbw  chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
 
 # New default.
-config ?= monitor chipcon ccspi nrf spi jtagarm7 jtag430 jtag430x2 avr
+ifeq ($(platform),tilaunchpad)
+config ?= monitor chipcon i2c
+else
+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= 
-libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o
+apps=
+
+ifeq ($(platform),tilaunchpad)
+libs= lib/$(platform).o lib/command.o lib/apps.o lib/msp430_serial.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
+
 hdrs=
 ERR=
 
@@ -117,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)
@@ -125,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
@@ -252,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
@@ -290,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
@@ -314,22 +343,42 @@ goodfet.hex: goodfet
 run:
        ../client/goodfet.msp430 test
 
+avrinstall: $(app).hex
+       #to be merged
+       avrdude -V -F -c stk500v1 -p m328p -b 57600 -P $(GOODFET) -U flash:w:$(app).hex
+
+ifeq ($(platform),tilaunchpad)
+install: $(app).hex
+       $(JTAG) -e -p $(app).hex
+verify:
+       $(JTAG) -v $(app).hex
+erase:
+       $(JTAG) -e $(app).hex
+else
 install: $(app).hex
-       $(BSL) -e -p $(app).hex 
+       $(MSP430BSL) -e -p $(app).hex
 installinfo:
-       $(BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
+       $(MSP430BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
 verify:
-       $(BSL) -P $(app).hex -v $(app).hex
+       $(MSP430BSL) -P $(app).hex -v $(app).hex
+erase:
+       $(MSP430BSL) -e
+
+endif
 dumpinfo:
-       $(BSL) --dumpinfo
+       $(MSP430BSL) --dumpinfo
 $(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
-erase:
-       $(BSL) -e 
 clean:
        rm -f $(app) $(app).hex $(libs) $(apps) lib/apps.c include/config.h include/builddate.h include/apps.h
 docs: