Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 5774894)
tcl/interface/ftdi: fix TRST for Olimex TINY adapters 47/2247/2
authorPaul Fertser <fercerpav@gmail.com>
Thu, 14 Aug 2014 15:57:47 +0000 (19:57 +0400)
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>
Mon, 8 Sep 2014 21:15:33 +0000 (21:15 +0000)
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>
tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg patch | blob | history
tcl/interface/ftdi/olimex-jtag-tiny.cfg patch | blob | history

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_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 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
 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_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 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
 ftdi_layout_signal LED -data 0x0800
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)