Merge pull request #1324 from jkent/avrftdi

add JTAG support to avrftdi
avrdudes · Aug 4, 2023 · 0c2f2e6 · 0c2f2e6
2 parents 330030e + c1d7f91
commit 0c2f2e6
Show file tree

Hide file tree

Showing 10 changed files with 813 additions and 51 deletions.
diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
@@ -32,6 +32,10 @@
 #       sck      = <pin> ;                        # pin number
 #       sdo      = <pin> ;                        # pin number
 #       sdi      = <pin> ;                        # pin number
+#       tck      = <pin> ;                        # pin number
+#       tdi      = <pin> ;                        # pin number
+#       tdo      = <pin> ;                        # pin number
+#       tms      = <pin> ;                        # pin number
 #       errled   = <pin> ;                        # pin number
 #       rdyled   = <pin> ;                        # pin number
 #       pgmled   = <pin> ;                        # pin number
@@ -994,6 +998,26 @@ programmer parent "ft2232h"
     pgmled                 = ~10;
 ;
 
+#------------------------------------------------------------
+# ft2232h_jtag
+#------------------------------------------------------------
+
+programmer
+    id                     = "ft2232h_jtag";
+    desc                   = "FT2232H based generic programmer";
+    type                   = "avrftdi_jtag";
+    prog_modes             = PM_JTAG;
+    connection_type        = usb;
+    usbvid                 = 0x0403;
+    usbpid                 = 0x6010;
+    usbdev                 = "A";
+# JTAG-signals - lower ADBUS-Nibble (default)
+    tck                    = 0; # AD0 (TCK)
+    tdi                    = 1; # AD1 (TDI)
+    tdo                    = 2; # AD2 (TDO)
+    tms                    = 3; # AD3 (TMS)
+;
+
 #------------------------------------------------------------
 # ft4232h
 #------------------------------------------------------------
@@ -1052,6 +1076,26 @@ programmer
     sdi                    = 2; # AD2 (TDO)
 ;
 
+#------------------------------------------------------------
+# ft232h_jtag
+#------------------------------------------------------------
+
+programmer
+    id                     = "ft232h_jtag";
+    desc                   = "FT232H based generic JTAG programmer";
+    type                   = "avrftdi_jtag";
+    prog_modes             = PM_JTAG;
+    connection_type        = usb;
+    usbvid                 = 0x0403;
+    usbpid                 = 0x6014;
+    usbdev                 = "A";
+# JTAG-signals
+    tck                    = 0; # AD0 (TCK)
+    tdi                    = 1; # AD1 (TDI)
+    tdo                    = 2; # AD2 (TDO)
+    tms                    = 3; # AD3 (TMS)
+;
+
 #------------------------------------------------------------
 # um232h
 #------------------------------------------------------------
@@ -1156,22 +1200,38 @@ programmer
 # tumpa
 #------------------------------------------------------------
 
-# submitted as bug #46020
+# First SPI connector
+# User manual: https://www.tiaowiki.com/w/TIAO_USB_Multi_Protocol_Adapter_User%27s_Manual
 
-programmer
+programmer parent "ft2232h"
     id                     = "tumpa";
     desc                   = "TIAO USB Multi-Protocol Adapter";
-    type                   = "avrftdi";
-    prog_modes             = PM_TPI | PM_ISP;
-    connection_type        = usb;
-    usbvid                 = 0x0403;
     usbpid                 = 0x8a98;
-    usbdev                 = "A";
     usbvendor              = "TIAO";
-    reset                  = 3; # TMS 7
-    sck                    = 0; # TCK 9
-    sdo                    = 1; # TDI 5
-    sdi                    = 2; # TDO 13
+;
+
+#------------------------------------------------------------
+# tumpa-b
+#------------------------------------------------------------
+
+# Second SPI connector
+
+programmer parent "tumpa"
+    id                     = "tumpa-b";
+    usbdev                 = "B";
+;
+
+#------------------------------------------------------------
+# tumpa_jtag
+#------------------------------------------------------------
+
+programmer parent "ft2232h_jtag"
+    id                     = "tumpa_jtag";
+    desc                   = "TIAO USB Multi-Protocol Adapter (JTAG)";
+    usbpid                 = 0x8a98;
+    usbvendor              = "TIAO";
+    buff                   = ~11;
+    reset                  = 4; # RST AD4 (Pin 15)
 ;
 
 #------------------------------------------------------------