projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maxusb is now default.
[goodfet]
/
firmware
/
Makefile
diff --git
a/firmware/Makefile
b/firmware/Makefile
index
319ffd5
..
2a0ad6f
100644
(file)
--- a/
firmware/Makefile
+++ b/
firmware/Makefile
@@
-12,9
+12,6
@@
MSP430BSL?=goodfet.bsl --speed=38400
JTAG=msp430-jtag
JTAG=msp430-jtag
-
-
-#N.B., gcc WILL NOT BITCH if this file doesn't exist.
GCCINC?=
#GCC?=avr-gcc
GCCINC?=
#GCC?=avr-gcc
@@
-25,7
+22,7
@@
GCC?=msp430-gcc
LDFLAGS?=-mmcu=$(mcu) #-Wl,-dT ldscripts/$(mcu).x
CCEXTRA?= $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -Dboard=$(board) $(GCCINC) -I include -I platforms
LDFLAGS?=-mmcu=$(mcu) #-Wl,-dT ldscripts/$(mcu).x
CCEXTRA?= $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -Dboard=$(board) $(GCCINC) -I include -I platforms
-CC=$(GCC) -Wall -O
s
-fno-strict-aliasing -g -mmcu=$(mcu) $(CCEXTRA)
+CC=$(GCC) -Wall -O
1
-fno-strict-aliasing -g -mmcu=$(mcu) $(CCEXTRA)
# Available Applications
# ======================
# Available Applications
# ======================
@@
-100,7
+97,7
@@
CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu) $(CCEXTRA)
ifeq ($(platform),tilaunchpad)
config ?= monitor chipcon i2c
else
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
endif
@@
-143,6
+140,14
@@
ifeq ($(filter jtag, $(config)), jtag)
endif
endif
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
# include the sbw defs if they specified it
ifeq ($(filter sbw, $(config)), sbw)
# if they only specify sbw, include jtag
@@
-270,7
+275,7
@@
endif
# include adc app
ifeq ($(filter adc, $(config)), adc)
# include adc app
ifeq ($(filter adc, $(config)), adc)
- ifeq ($(mcu), msp430
x
2274)
+ ifeq ($(mcu), msp430
f
2274)
apps+= apps/adc/adc.o
hdrs+= adc.h
else
apps+= apps/adc/adc.o
hdrs+= adc.h
else