interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle changed `ftdi` syntax. (#670) 

Also rename ftdi_oscan1_mode command which only exists in our branch.

Change-Id: Ie9b28f228b1fd984244edb8162d552104d28e462
Signed-off-by: Tim Newsome <tim@sifive.com>
This commit is contained in:
Tim Newsome 2021-12-14 10:03:24 -08:00 committed by GitHub
parent 37683df05e
commit 54c951d7f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jtag/drivers/ftdi.c
View File

@ -1337,7 +1337,7 @@ static const struct command_registration ftdi_subcommand_handlers[] = {
}, },
#if BUILD_FTDI_OSCAN1 == 1 #if BUILD_FTDI_OSCAN1 == 1
{ {
.name = "ftdi_oscan1_mode", .name = "oscan1_mode",
.handler = &ftdi_handle_oscan1_mode_command, .handler = &ftdi_handle_oscan1_mode_command,
.mode = COMMAND_ANY, .mode = COMMAND_ANY,
.help = "set to 'on' to use OSCAN1 mode for signaling, otherwise 'off' (default is 'off')", .help = "set to 'on' to use OSCAN1 mode for signaling, otherwise 'off' (default is 'off')",

6
tcl/interface/ftdi/arty-onboard-ftdi.cfg
View File

@ -1,7 +1,7 @@
interface ftdi interface ftdi
# ftdi_device_desc "Arty On-board FTDI interface" # ftdi_device_desc "Arty On-board FTDI interface"
ftdi_vid_pid 0x0403 0x6010 ftdi vid_pid 0x0403 0x6010
ftdi_channel 0 ftdi channel 0
ftdi_layout_init 0x0088 0x008b ftdi layout_init 0x0088 0x008b
reset_config none reset_config none

6
tcl/interface/ftdi/lambdaconcept_ecpix-5.cfg
View File

@ -7,8 +7,8 @@
adapter driver ftdi adapter driver ftdi
adapter speed 10000 adapter speed 10000
ftdi_device_desc "Dual RS232-HS" ftdi device_desc "Dual RS232-HS"
ftdi_vid_pid 0x0403 0x6010 ftdi vid_pid 0x0403 0x6010
ftdi_layout_init 0xfff8 0xfffb ftdi layout_init 0xfff8 0xfffb
transport select jtag transport select jtag

22
tcl/interface/ftdi/olimex-arm-jtag-cjtag.cfg
View File

@ -10,18 +10,18 @@
# #
interface ftdi interface ftdi
ftdi_oscan1_mode on ftdi oscan1_mode on
ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H" ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
ftdi_vid_pid 0x15ba 0x002a ftdi vid_pid 0x15ba 0x002a
ftdi_layout_init 0x0808 0x0a1b ftdi layout_init 0x0808 0x0a1b
ftdi_layout_signal nSRST -oe 0x0200 ftdi layout_signal nSRST -oe 0x0200
# oscan1_ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100 # oscan1_ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
ftdi_layout_signal LED -data 0x0800 ftdi layout_signal LED -data 0x0800
# These signals are used for cJTAG escape sequence on initialization only # These signals are used for cJTAG escape sequence on initialization only
ftdi_layout_signal TCK -data 0x0001 ftdi layout_signal TCK -data 0x0001
ftdi_layout_signal TDI -data 0x0002 ftdi layout_signal TDI -data 0x0002
ftdi_layout_signal TDO -input 0x0004 ftdi layout_signal TDO -input 0x0004
ftdi_layout_signal TMS -data 0x0008 ftdi layout_signal TMS -data 0x0008
ftdi_layout_signal JTAG_SEL -data 0x0100 -oe 0x0100 ftdi layout_signal JTAG_SEL -data 0x0100 -oe 0x0100

22
tcl/interface/ftdi/olimex-arm-usb-ocd-h-cjtag.cfg
View File

@ -5,18 +5,18 @@
# #
interface ftdi interface ftdi
ftdi_oscan1_mode on ftdi oscan1_mode on
ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-OCD-H" ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-OCD-H"
ftdi_vid_pid 0x15ba 0x002b ftdi vid_pid 0x15ba 0x002b
ftdi_layout_init 0x0808 0x0a1b ftdi layout_init 0x0808 0x0a1b
ftdi_layout_signal nSRST -oe 0x0200 ftdi layout_signal nSRST -oe 0x0200
# oscan1_ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100 # oscan1_ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
ftdi_layout_signal LED -data 0x0800 ftdi layout_signal LED -data 0x0800
# These signals are used for cJTAG escape sequence on initialization only # These signals are used for cJTAG escape sequence on initialization only
ftdi_layout_signal TCK -data 0x0001 ftdi layout_signal TCK -data 0x0001
ftdi_layout_signal TDI -data 0x0002 ftdi layout_signal TDI -data 0x0002
ftdi_layout_signal TDO -input 0x0004 ftdi layout_signal TDO -input 0x0004
ftdi_layout_signal TMS -data 0x0008 ftdi layout_signal TMS -data 0x0008
ftdi_layout_signal JTAG_SEL -data 0x0100 -oe 0x0100 ftdi layout_signal JTAG_SEL -data 0x0100 -oe 0x0100

22
tcl/interface/ftdi/olimex-arm-usb-tiny-h-cjtag.cfg
View File

@ -10,18 +10,18 @@
# #
interface ftdi interface ftdi
ftdi_oscan1_mode on ftdi oscan1_mode on
ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H" ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
ftdi_vid_pid 0x15ba 0x002a ftdi vid_pid 0x15ba 0x002a
ftdi_layout_init 0x0808 0x0a1b ftdi layout_init 0x0808 0x0a1b
ftdi_layout_signal nSRST -oe 0x0200 ftdi layout_signal nSRST -oe 0x0200
# oscan1_ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100 # oscan1_ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
ftdi_layout_signal LED -data 0x0800 ftdi layout_signal LED -data 0x0800
# These signals are used for cJTAG escape sequence on initialization only # These signals are used for cJTAG escape sequence on initialization only
ftdi_layout_signal TCK -data 0x0001 ftdi layout_signal TCK -data 0x0001
ftdi_layout_signal TDI -data 0x0002 ftdi layout_signal TDI -data 0x0002
ftdi_layout_signal TDO -input 0x0004 ftdi layout_signal TDO -input 0x0004
ftdi_layout_signal TMS -data 0x0008 ftdi layout_signal TMS -data 0x0008
ftdi_layout_signal JTAG_SEL -data 0x0100 -oe 0x0100 ftdi layout_signal JTAG_SEL -data 0x0100 -oe 0x0100