From: Paul Fertser Date: Thu, 14 Aug 2014 15:57:47 +0000 (+0400) Subject: tcl/interface/ftdi: fix TRST for Olimex TINY adapters X-Git-Tag: v0.9.0-rc1~287 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=28b0019803d33c25daebffe647c293093704f665 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: Хайруллин Эльдар Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/2247 Tested-by: jenkins Reviewed-by: demokmail Reviewed-by: Andreas Fritiofson --- diff --git a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg index 90278a7898..f77c24b2c0 100644 --- 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 4303fa13c2..b3c6a716ea 100644 --- 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