[Pkg-electronics-commits] [openocd] 01/03: Fix SheevaPlug configuration (Closes: #837989)

[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 9a94335daa332a37a51920f87afbad4d36fad2d5
Author: Jonathan McDowell <noodles at earth.li>
Date:   Fri Oct 13 10:19:48 2017 +0100

    Fix SheevaPlug configuration (Closes: #837989)
    
    The upstream changes around FTDI2232 support broke support for the
    SheevaPlug due to use of wrong channel. A fix has been pushed upstream
    correcting the channel (f95f8b70fbd0f7e9c91a2d9006b1abb2dd07ebf2), so
    pick it up for Debian pending a new upstream release.
---
 debian/changelog                |  1 +
 debian/patches/fix-sheeva.patch | 18 ++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3c9e58f..5f39215 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openocd (0.10.0-2) UNRELEASED; urgency=medium
   * Re-enable jlink and add libjaylink-dev dependency.
   * Drop use of CDBS
     + Remove needless dep on autotools / dh-autoreconf.
+  * Fix SheevaPlug configuration (Closes: #837989)
 
  -- Jonathan McDowell <noodles at earth.li>  Fri, 22 Sep 2017 10:52:20 +0100
 
diff --git a/debian/patches/fix-sheeva.patch b/debian/patches/fix-sheeva.patch
new file mode 100644
index 0000000..6077723
--- /dev/null
+++ b/debian/patches/fix-sheeva.patch
@@ -0,0 +1,18 @@
+Subject: Fix FTDI channel configuration for SheevaPlug
+Author: Jonathan McDowell <noodles at earth.li>
+Origin: upstream, https://sourceforge.net/p/openocd/code/ci/f95f8b70fbd0f7e9c91a2d9006b1abb2dd07ebf2/
+Bug-Debian: https://bugs.debian.org/837989
+Last-Update: 2017-10-13
+diff --git a/tcl/interface/ftdi/sheevaplug.cfg b/tcl/interface/ftdi/sheevaplug.cfg
+index f299f27a..625aad39 100644
+--- a/tcl/interface/ftdi/sheevaplug.cfg
++++ b/tcl/interface/ftdi/sheevaplug.cfg
+@@ -7,7 +7,7 @@
+ interface ftdi
+ ftdi_device_desc "SheevaPlug JTAGKey FT2232D B"
+ ftdi_vid_pid 0x9e88 0x9e8f
+-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 9e153dd..0419c74 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 #Patch-file list
 buspirate-swd.patch
 no-duplicate-udev.patch
+fix-sheeva.patch

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