From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Wed, 16 Nov 2011 19:47:13 +0000 (+0000)
Subject: Repaired support for the GF30 in TQ's new config system.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=d03d57090931d83f8954485765a441f4fd197513;ds=sidebyside

Repaired support for the GF30 in TQ's new config system.
Repaired support for msp430-gcc-4.4.5, perhaps breaking MSP430x5xx support.

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

diff --git a/firmware/Makefile b/firmware/Makefile
index 849c5fe..09208f0 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -48,7 +48,7 @@ GCCINC?=
 # very end of the command line, so they only have an effect for a
 # default linker script
 GCC?=msp430-gcc
-LDFLAGS?=-Wl,-dT ldscripts/msp430.x
+LDFLAGS?=-Wl,-dT ldscripts/$(mcu).x
 
 CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) $(GCCINC) -I include -I platforms
 CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
diff --git a/firmware/README.txt b/firmware/README.txt
index ea75e38..d912a36 100644
--- a/firmware/README.txt
+++ b/firmware/README.txt
@@ -1,18 +1,14 @@
 GoodFET Firmware
-by Travis Goodspeed
-<travis at radiantmachines.com>
+by Travis Goodspeed <travis at radiantmachines.com>
+and some good neighbors.
 
-Requires MSPGCC and msp430-bsl.
+Set \$GOODFET to be the port of your GoodFET, such as
+export GOODFET=/dev/cu.usbserial-*      #Darwin
+export GOODFET=/dev/ttyUSB*             #Linux (Default)
 
-Assumes MSP430F161x by default.  Call for others by the following method,
-recognizing that 2618 support is a rather recent addition and only works
-in MSPGCC from CVS.
+The target board must be specified.  Export one of the following:
+board=goodfet31 make clean install
+board=goodfet41 make clean install
 
-export mcu=msp430x2618
-make -e
-
-
-
-Some weird switches,
-1) Build for a static DCO configuration.  Useful for standalone firmware.
-CFLAGS="-DSTATICDCO=0x8F9E" make clean all
+We require at least msp430-gcc-4.4.5, but older versions should work
+if you're lucky.
diff --git a/firmware/config.mk b/firmware/config.mk
index 3897ab3..d2a72aa 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -3,6 +3,10 @@ ifneq (,$(findstring $(board),goodfet20))
 mcu := msp430x1612
 endif
 
+ifneq (,$(findstring $(board),goodfet30 goodfet31))
+mcu := msp430x2274
+endif
+
 ifneq (,$(findstring $(board),goodfet40 goodfet41))
 mcu := msp430x2618
 endif
@@ -12,7 +16,7 @@ mcu := msp430x5510
 endif
 
 ifeq ($(mcu),undef)
-$(error Please define board)
+$(error Please define board, as explained in the README)
 endif
 
 AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 
diff --git a/firmware/configure b/firmware/configure
index dcc609c..bc67448 100755
--- a/firmware/configure
+++ b/firmware/configure
@@ -1,14 +1,4 @@
 #!/bin/sh
 
-cat <<EOF
-Set \$GOODFET to be the port of your GoodFET, such as
-GOODFET=/dev/cu.usbserial-*      #Darwin
-GOODFET=/dev/ttyUSB*             #Linux (Default)
+cat README.txt
 
-The MSP430F161x is targetted by default.  Build for others
-by setting one of the following.
-mcu=msp430x2618                  #BadFET20
-mcu=msp430x1612                  #GoodFET10, GoodFET20
-mcu=msp430x2274                  #GoodFET30
-
-EOF