tcl/interface/ftdi/openrd: Fix FTDI channel + device description

Similar to the Sheevaplug fix inf95f8b70fbd0f7e9c91a2d9006b1abb2dd07ebf2
the OpenRD device has its JTAG interface on the first channel of the
ft2232, which is 0 for the new driver but was 1 for the old one. Correct
the config file appropriately. Also the device description was missing
the trailing " B" and thus not picking up the device correctly. Finally
add an adapter_khz setting in the OpenRD board configuration file - set
to 2MHz to match the Sheeva variant.

Confirmed as working thanks to Phil Hands providing me access to his
hardware to test on.

See also Debian Bug#793214; https://bugs.debian.org/793214

Change-Id: Ifacf53124eaa330bbbdf36dfa79e3256bf2a5201
Signed-off-by: Jonathan McDowell <noodles@earth.li>
Reviewed-on: http://openocd.zylin.com/4254
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

diff --git a/tcl/board/openrd.cfg b/tcl/board/openrd.cfg
index 1051c25d95e66f31620149f5925a2652b3ce6195..db3cb0326e7055c23c0ce5759b2cb29731d8b0ec 100644 (file)
--- 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]
 
 source [find interface/ftdi/openrd.cfg]
 source [find target/feroceon.cfg]
 

+adapter_khz 2000
+

 $_TARGETNAME configure \
        -work-area-phys 0x10000000 \
        -work-area-size 65536 \
 $_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 8c1a80596b766d4c28396160641965cfbe420749..9ec5b5f650f679b060873027c01b36a8278e82c9 100644 (file)
--- 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
 #
 
 # 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
 interface ftdi

-ftdi_device_desc "OpenRD JTAGKey FT2232D"
+ftdi_device_desc "OpenRD JTAGKey FT2232D B"

 ftdi_vid_pid 0x0403 0x9e90
 ftdi_vid_pid 0x0403 0x9e90

-ftdi_channel 1
+ftdi_channel 0

 
 ftdi_layout_init 0x0608 0x0f1b
 ftdi_layout_signal nTRST -data 0x0200
 
 ftdi_layout_init 0x0608 0x0f1b
 ftdi_layout_signal nTRST -data 0x0200