[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.8.0-138-g28b0019

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  28b0019803d33c25daebffe647c293093704f665 (commit)
      from  5774894a64ebc3419c3868f6faaab035cd867c3b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 28b0019803d33c25daebffe647c293093704f665
Author: Paul Fertser <fer...@gm...>
Date:   Thu Aug 14 19:57:47 2014 +0400

    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: Хайруллин Эльдар <eld...@ma...>
    Signed-off-by: Paul Fertser <fer...@gm...>
    Reviewed-on: http://openocd.zylin.com/2247
    Tested-by: jenkins
    Reviewed-by: demokmail <dem...@gm...>
    Reviewed-by: Andreas Fritiofson <and...@gm...>

diff --git a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
index 90278a7..f77c24b 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 4303fa1..b3c6a71 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

-----------------------------------------------------------------------

Summary of changes:
 tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg |    4 ++--
 tcl/interface/ftdi/olimex-jtag-tiny.cfg      |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository