From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Fri, 2 Mar 2012 19:04:26 +0000 (+0000)
Subject: maxusb is now default.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=e905c90c50293dd607f00ef2395f50a653585808;hp=33a28c982640df5ea281600912b4e13ec8959e29

maxusb is now default.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1102 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---

diff --git a/firmware/Makefile b/firmware/Makefile
index 30695a5..2a0ad6f 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -12,7 +12,6 @@ MSP430BSL?=goodfet.bsl --speed=38400
 JTAG=msp430-jtag
 
 
-#N.B., gcc WILL NOT BITCH if this file doesn't exist.
 GCCINC?=
 
 #GCC?=avr-gcc
@@ -98,7 +97,7 @@ CC=$(GCC) -Wall -O1 -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
 
 
diff --git a/firmware/config.mk b/firmware/config.mk
index 5305ca3..4bb7af5 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -97,12 +97,12 @@ $(error Please define board, as explained in the README)
 endif
 #platform := $(board)
 
-AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2 
+AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2  maxusb
 
 # defaults
 CONFIG_monitor    ?= y
 CONFIG_spi        ?= y
-CONFIG_maxusb     ?= n
+CONFIG_maxusb     ?= y
 CONFIG_jtag       ?= n
 CONFIG_sbw        ?= n
 CONFIG_jtag430    ?= y