tcl/interface/ftdi: fix TRST for Olimex TINY adapters

According to the research by Eldar, TINY-H adapter has nTRST connected
to ACBUS0 directly via a 100 Ohms series resistor. I think it's safe
to assume the older TINY adapter does the same.

See high-res photos at [1].

This patch should fix issues with JTAG for the case when nTRST is
actually connected but is missing from the config.

[1] https://wikidevi.com/wiki/Olimex_ARM-USB-TINY-H

Change-Id: Iaaee7be30536ebb502802d38b82cd9573408f854
Reported-by: Хайруллин Эльдар <eldar.khayrullin@mail.ru>
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2247
Tested-by: jenkins
Reviewed-by: demokmail <demokmail@gmail.com>
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>

diff --git a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
index 90278a78981e57227f1ab20316c447218ed854e0..f77c24b2c0f07a228c5253802fe7caf0c63dc32e 100644 (file)
--- a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
@@ -8,7 +8,7 @@ interface ftdi
 ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
 ftdi_vid_pid 0x15ba 0x002a
 
-ftdi_layout_init 0x0c08 0x0f1b
+ftdi_layout_init 0x0808 0x0a1b
 ftdi_layout_signal nSRST -oe 0x0200
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
 ftdi_layout_signal LED -data 0x0800

diff --git a/tcl/interface/ftdi/olimex-jtag-tiny.cfg b/tcl/interface/ftdi/olimex-jtag-tiny.cfg
index 4303fa13c239d019b41809a3c18ceeeee90e8c5b..b3c6a716eab886c88f9377c24164d3fcb5fd0005 100644 (file)
--- a/tcl/interface/ftdi/olimex-jtag-tiny.cfg
+++ b/tcl/interface/ftdi/olimex-jtag-tiny.cfg
@@ -8,7 +8,7 @@ interface ftdi
 ftdi_device_desc "Olimex OpenOCD JTAG TINY"
 ftdi_vid_pid 0x15ba 0x0004
 
-ftdi_layout_init 0x0c08 0x0f1b
+ftdi_layout_init 0x0808 0x0a1b
 ftdi_layout_signal nSRST -oe 0x0200
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
 ftdi_layout_signal LED -data 0x0800