imported changes by fischl from http://savannah.nongnu.org/patch/?4330

sigmike · Dec 29, 2010 · 1808ac2 · 1808ac2
1 parent 4b6b29d
commit 1808ac2
Show file tree

Hide file tree

Showing 9 changed files with 690 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -56,7 +56,7 @@ avrdude_CFLAGS   = @ENABLE_WARNINGS@
 
 libavrdude_a_CFLAGS   = @ENABLE_WARNINGS@
 
-avrdude_LDADD  = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB@ @LIBUSB_1_0@ @LIBHID@ -lm
+avrdude_LDADD  = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB@ @LIBUSB_1_0@ @LIBHID@  $(FTDILIB) -lm
 
 bin_PROGRAMS = avrdude
 
@@ -104,6 +104,8 @@ libavrdude_a_SOURCES = \
 	fileio.c \
 	fileio.h \
 	freebsd_ppi.h \
+	ftbb.c \
+	ftbb.h \
 	jtagmkI.c \
 	jtagmkI.h \
 	jtagmkI_private.h \

diff --git a/avrdude.conf.in b/avrdude.conf.in
@@ -426,6 +426,17 @@ programmer
   type  = usbtiny;
 ;
 
+programmer
+  id    = "ezdop";
+  desc  = "AE6HO EZ-Doppler";
+  type  = ftbb;
+  baudrate = 230400;
+  reset = 5;
+  sck   = 3;
+  mosi  = 2;
+  miso  = 1;
+}
+
 programmer
   id    = "butterfly";
   desc  = "Atmel Butterfly Development Board";

diff --git a/bootstrap b/bootstrap
@@ -38,7 +38,7 @@ set -x
 
 rm -rf autom4te.cache
 
-${ACLOCAL}
+${ACLOCAL} -I .
 ${AUTOHEADER}
 ${AUTOCONF}
 ${AUTOMAKE} -a -c
diff --git a/config_gram.y b/config_gram.y
@@ -48,6 +48,7 @@
 #include "avr.h"
 #include "jtagmkI.h"
 #include "jtagmkII.h"
+#include "ftbb.h"
 
 #if defined(WIN32NATIVE)
 #define strtok_r( _s, _sep, _lasts ) \
@@ -151,6 +152,7 @@ static int parse_cmdbits(OPCODE * op);
 %token K_USBASP
 %token K_USBTINY
 %token K_BUTTERFLY
+%token K_FTBB
 %token K_TYPE
 %token K_VCC
 %token K_VFYLED
@@ -480,6 +482,12 @@ prog_parm :
     }
   } |
 
+  K_TYPE TKN_EQUAL K_FTBB {
+    {
+      ftbb_initpgm(current_prog);
+    }
+  } |
+
   K_TYPE TKN_EQUAL K_JTAG_MKI {
     {
       jtagmkI_initpgm(current_prog);

diff --git a/configure.ac b/configure.ac
@@ -199,6 +199,8 @@ else
 	SUBDIRS_AC=''
 fi
 
+FTBB_FTDI
+
 AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR)
 AC_SUBST(SUBDIRS_AC, $SUBDIRS_AC)
 AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_AC)