[Pkg-electronics-commits] [openocd] 02/03: Fix OpenRD configuration (Closes: #793214)

[Jonathan McDowell]

This is an automated email from the git hooks/post-receive script.

noodles pushed a commit to branch master
in repository openocd.

commit 84e52de56a71152bc77fd6af1bb77b881eb5db6e
Author: Jonathan McDowell <noodles at earth.li>
Date:   Fri Oct 13 10:55:29 2017 +0100

    Fix OpenRD configuration (Closes: #793214)
    
    In a similar fashion to the SheevaPlug the upstream FTDI2232 support
    changes broke OpenRD support. The fix requires a change to the channel
    used, the USB device description updated so the adaptor is found and
    the addition of the JTAG speed in the board configuration. Patch has
    been forwarded upstream.
---
 debian/changelog                |  1 +
 debian/patches/fix-openrd.patch | 44 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5f39215..f313ad6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openocd (0.10.0-2) UNRELEASED; urgency=medium
   * Drop use of CDBS
     + Remove needless dep on autotools / dh-autoreconf.
   * Fix SheevaPlug configuration (Closes: #837989)
+  * Fix OpenRD configuration (Closes: #793214)
 
  -- Jonathan McDowell <noodles at earth.li>  Fri, 22 Sep 2017 10:52:20 +0100
 
diff --git a/debian/patches/fix-openrd.patch b/debian/patches/fix-openrd.patch
new file mode 100644
index 0000000..e53acb8
--- /dev/null
+++ b/debian/patches/fix-openrd.patch
@@ -0,0 +1,44 @@
+Description: Fix FTDI configuration for OpenRD
+ The old ft2232 driver was dropped for 0.9.0 and the conversion for
+ the OpenRD for the new driver was incorrect, using the incorrect
+ FTDI channel and device description. This fixes those up and adds
+ the appropriate JTAG speed configuration to get things working again.
+Author: Jonathan McDowell <noodles at earth.li>
+Forwarded: http://openocd.zylin.com/#/c/4254/
+Bug-Debian: https://bugs.debian.org/793214
+Last-Update: 2017-10-13
+diff --git a/tcl/board/openrd.cfg b/tcl/board/openrd.cfg
+index 1051c25..db3cb03 100644
+--- a/tcl/board/openrd.cfg
++++ b/tcl/board/openrd.cfg
+@@ -3,6 +3,8 @@
+ source [find interface/ftdi/openrd.cfg]
+ source [find target/feroceon.cfg]
+ 
++adapter_khz 2000
++
+ $_TARGETNAME configure \
+ 	-work-area-phys 0x10000000 \
+ 	-work-area-size 65536 \
+diff --git a/tcl/interface/ftdi/openrd.cfg b/tcl/interface/ftdi/openrd.cfg
+index 8c1a805..9ec5b5f 100644
+--- a/tcl/interface/ftdi/openrd.cfg
++++ b/tcl/interface/ftdi/openrd.cfg
+@@ -4,15 +4,10 @@
+ # http://www.marvell.com/products/embedded_processors/developer/kirkwood/openrd.jsp
+ #
+ 
+-echo "WARNING!"
+-echo "This file was not tested with real interface, it is based on code in ft2232.c."
+-echo "Please report your experience with this file to openocd-devel mailing list,"
+-echo "so it could be marked as working or fixed."
+-
+ interface ftdi
+-ftdi_device_desc "OpenRD JTAGKey FT2232D"
++ftdi_device_desc "OpenRD JTAGKey FT2232D B"
+ ftdi_vid_pid 0x0403 0x9e90
+-ftdi_channel 1
++ftdi_channel 0
+ 
+ ftdi_layout_init 0x0608 0x0f1b
+ ftdi_layout_signal nTRST -data 0x0200
diff --git a/debian/patches/series b/debian/patches/series
index 0419c74..f50d9ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 buspirate-swd.patch
 no-duplicate-udev.patch
 fix-sheeva.patch
+fix-openrd.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/openocd.git