Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-330-g186ed3311
|
From: OpenOCD-Gerrit <ope...@us...> - 2021-08-14 12:38:30
|
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 186ed3311d061ba0237cb8889f9673366717fbf1 (commit)
via ae5c438b001ae8d57055e2c1ff0829eee108cfbc (commit)
via 1549bad5b3de2c64b106475cfc23cfbccba2b8a3 (commit)
via cba3bb6f2a736414f86a0e26d3ac8b91551b1574 (commit)
via e53f1c907a9ab16eba320d295db4d68d4b607cc1 (commit)
from 8399cbc9584985c2b9e4aafb3a6afdb17df89b7f (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 186ed3311d061ba0237cb8889f9673366717fbf1
Author: Marc Schink <de...@za...>
Date: Sun Aug 1 14:20:22 2021 +0200
drivers/ft232r: Group adapter commands
Use a command group 'ft232r' with subcommands instead of individual
commands with 'ft232r_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: I0dbeb4716330c83f8ce89b0d054eb0286b887bdf
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6409
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 40f4ab284..340e6b65b 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2632,47 +2632,47 @@ FT232R
These interfaces have several commands, used to configure the driver
before initializing the JTAG scan chain:
-@deffn {Config Command} {ft232r_vid_pid} @var{vid} @var{pid}
+@deffn {Config Command} {ft232r vid_pid} @var{vid} @var{pid}
The vendor ID and product ID of the adapter. If not specified, default
0x0403:0x6001 is used.
@end deffn
-@deffn {Config Command} {ft232r_serial_desc} @var{serial}
+@deffn {Config Command} {ft232r serial_desc} @var{serial}
Specifies the @var{serial} of the adapter to use, in case the
vendor provides unique IDs and more than one adapter is connected to
the host. If not specified, serial numbers are not considered.
@end deffn
-@deffn {Config Command} {ft232r_jtag_nums} @var{tck} @var{tms} @var{tdi} @var{tdo}
+@deffn {Config Command} {ft232r jtag_nums} @var{tck} @var{tms} @var{tdi} @var{tdo}
Set four JTAG GPIO numbers at once.
If not specified, default 0 3 1 2 or TXD CTS RXD RTS is used.
@end deffn
-@deffn {Config Command} {ft232r_tck_num} @var{tck}
+@deffn {Config Command} {ft232r tck_num} @var{tck}
Set TCK GPIO number. If not specified, default 0 or TXD is used.
@end deffn
-@deffn {Config Command} {ft232r_tms_num} @var{tms}
+@deffn {Config Command} {ft232r tms_num} @var{tms}
Set TMS GPIO number. If not specified, default 3 or CTS is used.
@end deffn
-@deffn {Config Command} {ft232r_tdi_num} @var{tdi}
+@deffn {Config Command} {ft232r tdi_num} @var{tdi}
Set TDI GPIO number. If not specified, default 1 or RXD is used.
@end deffn
-@deffn {Config Command} {ft232r_tdo_num} @var{tdo}
+@deffn {Config Command} {ft232r tdo_num} @var{tdo}
Set TDO GPIO number. If not specified, default 2 or RTS is used.
@end deffn
-@deffn {Config Command} {ft232r_trst_num} @var{trst}
+@deffn {Config Command} {ft232r trst_num} @var{trst}
Set TRST GPIO number. If not specified, default 4 or DTR is used.
@end deffn
-@deffn {Config Command} {ft232r_srst_num} @var{srst}
+@deffn {Config Command} {ft232r srst_num} @var{srst}
Set SRST GPIO number. If not specified, default 6 or DCD is used.
@end deffn
-@deffn {Config Command} {ft232r_restore_serial} @var{word}
+@deffn {Config Command} {ft232r restore_serial} @var{word}
Restore serial port after JTAG. This USB bitmode control word
(16-bit) will be sent before quit. Lower byte should
set GPIO direction register to a "sane" state:
diff --git a/src/jtag/drivers/ft232r.c b/src/jtag/drivers/ft232r.c
index 3c0292561..22c0fe5dd 100644
--- a/src/jtag/drivers/ft232r.c
+++ b/src/jtag/drivers/ft232r.c
@@ -560,72 +560,72 @@ COMMAND_HANDLER(ft232r_handle_restore_serial_command)
return ERROR_OK;
}
-static const struct command_registration ft232r_command_handlers[] = {
+static const struct command_registration ft232r_subcommand_handlers[] = {
{
- .name = "ft232r_serial_desc",
+ .name = "serial_desc",
.handler = ft232r_handle_serial_desc_command,
.mode = COMMAND_CONFIG,
.help = "USB serial descriptor of the adapter",
.usage = "serial string",
},
{
- .name = "ft232r_vid_pid",
+ .name = "vid_pid",
.handler = ft232r_handle_vid_pid_command,
.mode = COMMAND_CONFIG,
.help = "USB VID and PID of the adapter",
.usage = "vid pid",
},
{
- .name = "ft232r_jtag_nums",
+ .name = "jtag_nums",
.handler = ft232r_handle_jtag_nums_command,
.mode = COMMAND_CONFIG,
.help = "gpio numbers for tck, tms, tdi, tdo. (in that order)",
.usage = "<0-7|TXD-RI> <0-7|TXD-RI> <0-7|TXD-RI> <0-7|TXD-RI>",
},
{
- .name = "ft232r_tck_num",
+ .name = "tck_num",
.handler = ft232r_handle_tck_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for tck.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_tms_num",
+ .name = "tms_num",
.handler = ft232r_handle_tms_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for tms.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_tdo_num",
+ .name = "tdo_num",
.handler = ft232r_handle_tdo_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for tdo.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_tdi_num",
+ .name = "tdi_num",
.handler = ft232r_handle_tdi_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for tdi.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_srst_num",
+ .name = "srst_num",
.handler = ft232r_handle_srst_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for srst.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_trst_num",
+ .name = "trst_num",
.handler = ft232r_handle_trst_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for trst.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_restore_serial",
+ .name = "restore_serial",
.handler = ft232r_handle_restore_serial_command,
.mode = COMMAND_CONFIG,
.help = "bitmode control word that restores serial port.",
@@ -634,6 +634,17 @@ static const struct command_registration ft232r_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration ft232r_command_handlers[] = {
+ {
+ .name = "ft232r",
+ .mode = COMMAND_ANY,
+ .help = "perform ft232r management",
+ .chain = ft232r_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
/*
* Synchronous bitbang protocol implementation.
*/
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 5763310f4..d5b2ae221 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -675,4 +675,64 @@ proc usb_blaster_firmware args {
eval usb_blaster firmware $args
}
+lappend _telnet_autocomplete_skip ft232r_serial_desc
+proc ft232r_serial_desc args {
+ echo "DEPRECATED! use 'ft232r serial_desc' not 'ft232r_serial_desc'"
+ eval ft232r serial_desc $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_vid_pid
+proc ft232r_vid_pid args {
+ echo "DEPRECATED! use 'ft232r vid_pid' not 'ft232r_vid_pid'"
+ eval ft232r vid_pid $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_jtag_nums
+proc ft232r_jtag_nums args {
+ echo "DEPRECATED! use 'ft232r jtag_nums' not 'ft232r_jtag_nums'"
+ eval ft232r jtag_nums $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_tck_num
+proc ft232r_tck_num args {
+ echo "DEPRECATED! use 'ft232r tck_num' not 'ft232r_tck_num'"
+ eval ft232r tck_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_tms_num
+proc ft232r_tms_num args {
+ echo "DEPRECATED! use 'ft232r tms_num' not 'ft232r_tms_num'"
+ eval ft232r tms_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_tdo_num
+proc ft232r_tdo_num args {
+ echo "DEPRECATED! use 'ft232r tdo_num' not 'ft232r_tdo_num'"
+ eval ft232r tdo_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_tdi_num
+proc ft232r_tdi_num args {
+ echo "DEPRECATED! use 'ft232r tdi_num' not 'ft232r_tdi_num'"
+ eval ft232r tdi_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_srst_num
+proc ft232r_srst_num args {
+ echo "DEPRECATED! use 'ft232r srst_num' not 'ft232r_srst_num'"
+ eval ft232r srst_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_trst_num
+proc ft232r_trst_num args {
+ echo "DEPRECATED! use 'ft232r trst_num' not 'ft232r_trst_num'"
+ eval ft232r trst_num $args
+}
+
+lappend _telnet_autocomplete_skip ft232r_restore_serial
+proc ft232r_restore_serial args {
+ echo "DEPRECATED! use 'ft232r restore_serial' not 'ft232r_restore_serial'"
+ eval ft232r restore_serial $args
+}
+
# END MIGRATION AIDS
commit ae5c438b001ae8d57055e2c1ff0829eee108cfbc
Author: Marc Schink <de...@za...>
Date: Sun Aug 1 14:15:06 2021 +0200
tcl: Adapt config files to new usb_blaster command syntax
Change-Id: I4eb645f74ef31fc0b5882299b3487020aa142dd8
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6408
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/tcl/board/altera_sockit.cfg b/tcl/board/altera_sockit.cfg
index b7c7993fe..4d10aef7b 100644
--- a/tcl/board/altera_sockit.cfg
+++ b/tcl/board/altera_sockit.cfg
@@ -12,7 +12,7 @@ adapter driver usb_blaster
source [find target/altera_fpgasoc.cfg]
# If the USB Blaster II were supported, these settings would be needed
-#usb_blaster_vid_pid 0x09fb 0x6810
-#usb_blaster_device_desc "USB-Blaster II"
+#usb_blaster vid_pid 0x09fb 0x6810
+#usb_blaster device_desc "USB-Blaster II"
adapter speed 100
diff --git a/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg b/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg
index a6e80650e..c9f8d3695 100644
--- a/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg
+++ b/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg
@@ -6,7 +6,7 @@ if { [info exists USE_EXTERNAL_DEBUGGER] } {
echo "Using external debugger"
} else {
source [find interface/altera-usb-blaster2.cfg]
- usb_blaster_device_desc "Arria10 IDK"
+ usb_blaster device_desc "Arria10 IDK"
}
source [find fpga/altera-10m50.cfg]
diff --git a/tcl/interface/altera-usb-blaster.cfg b/tcl/interface/altera-usb-blaster.cfg
index 84e77b13c..cb4ca9a78 100644
--- a/tcl/interface/altera-usb-blaster.cfg
+++ b/tcl/interface/altera-usb-blaster.cfg
@@ -5,7 +5,7 @@
#
adapter driver usb_blaster
-usb_blaster_lowlevel_driver ftdi
+usb_blaster lowlevel_driver ftdi
# These are already the defaults.
-# usb_blaster_vid_pid 0x09FB 0x6001
-# usb_blaster_device_desc "USB-Blaster"
+# usb_blaster vid_pid 0x09FB 0x6001
+# usb_blaster device_desc "USB-Blaster"
diff --git a/tcl/interface/altera-usb-blaster2.cfg b/tcl/interface/altera-usb-blaster2.cfg
index 4642b1dcf..05b0519b8 100644
--- a/tcl/interface/altera-usb-blaster2.cfg
+++ b/tcl/interface/altera-usb-blaster2.cfg
@@ -3,6 +3,6 @@
#
adapter driver usb_blaster
-usb_blaster_vid_pid 0x09fb 0x6010 0x09fb 0x6810
-usb_blaster_lowlevel_driver ublast2
-usb_blaster_firmware /path/to/quartus/blaster_6810.hex
+usb_blaster vid_pid 0x09fb 0x6010 0x09fb 0x6810
+usb_blaster lowlevel_driver ublast2
+usb_blaster firmware /path/to/quartus/blaster_6810.hex
diff --git a/tcl/interface/usb-jtag.cfg b/tcl/interface/usb-jtag.cfg
index 8617c78c3..bbfb076d1 100644
--- a/tcl/interface/usb-jtag.cfg
+++ b/tcl/interface/usb-jtag.cfg
@@ -30,8 +30,8 @@
# driver but ixo-usb-jtag requires the ftdi driver.
adapter driver usb_blaster
-usb_blaster_vid_pid 0x16C0 0x06AD
-usb_blaster_device_desc "Van Ooijen Technische Informatica"
+usb_blaster vid_pid 0x16C0 0x06AD
+usb_blaster device_desc "Van Ooijen Technische Informatica"
# ixo-usb-jtag is only compatible with the ublast1 protocol implemented via the
# ftdi modes, using ublast2 will cause openocd to hang.
-usb_blaster_lowlevel_driver ftdi
+usb_blaster lowlevel_driver ftdi
commit 1549bad5b3de2c64b106475cfc23cfbccba2b8a3
Author: Marc Schink <de...@za...>
Date: Sun Aug 1 14:12:23 2021 +0200
drivers/usb_blaster: Group adapter commands
Use a command group 'usb_blaster' with subcommands instead of individual
commands with 'usb_blaster_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: I2ae3d96ba864c20d7db67c74677781a62bfc4eb5
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6407
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 3e5e4cba7..40f4ab284 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2728,28 +2728,28 @@ USB JTAG/USB-Blaster compatibles over one of the userspace libraries
for FTDI chips. These interfaces have several commands, used to
configure the driver before initializing the JTAG scan chain:
-@deffn {Config Command} {usb_blaster_device_desc} description
+@deffn {Config Command} {usb_blaster device_desc} description
Provides the USB device description (the @emph{iProduct string})
of the FTDI FT245 device. If not
specified, the FTDI default value is used. This setting is only valid
if compiled with FTD2XX support.
@end deffn
-@deffn {Config Command} {usb_blaster_vid_pid} vid pid
+@deffn {Config Command} {usb_blaster vid_pid} vid pid
The vendor ID and product ID of the FTDI FT245 device. If not specified,
default values are used.
Currently, only one @var{vid}, @var{pid} pair may be given, e.g. for
Altera USB-Blaster (default):
@example
-usb_blaster_vid_pid 0x09FB 0x6001
+usb_blaster vid_pid 0x09FB 0x6001
@end example
The following VID/PID is for Kolja Waschk's USB JTAG:
@example
-usb_blaster_vid_pid 0x16C0 0x06AD
+usb_blaster vid_pid 0x16C0 0x06AD
@end example
@end deffn
-@deffn {Command} {usb_blaster_pin} (@option{pin6}|@option{pin8}) (@option{0}|@option{1}|@option{s}|@option{t})
+@deffn {Command} {usb_blaster pin} (@option{pin6}|@option{pin8}) (@option{0}|@option{1}|@option{s}|@option{t})
Sets the state or function of the unused GPIO pins on USB-Blasters
(pins 6 and 8 on the female JTAG header). These pins can be used as
SRST and/or TRST provided the appropriate connections are made on the
@@ -2757,18 +2757,18 @@ target board.
For example, to use pin 6 as SRST:
@example
-usb_blaster_pin pin6 s
+usb_blaster pin pin6 s
reset_config srst_only
@end example
@end deffn
-@deffn {Config Command} {usb_blaster_lowlevel_driver} (@option{ftdi}|@option{ublast2})
+@deffn {Config Command} {usb_blaster lowlevel_driver} (@option{ftdi}|@option{ublast2})
Chooses the low level access method for the adapter. If not specified,
@option{ftdi} is selected unless it wasn't enabled during the
configure stage. USB-Blaster II needs @option{ublast2}.
@end deffn
-@deffn {Config Command} {usb_blaster_firmware} @var{path}
+@deffn {Config Command} {usb_blaster firmware} @var{path}
This command specifies @var{path} to access USB-Blaster II firmware
image. To be used with USB-Blaster II only.
@end deffn
diff --git a/src/jtag/drivers/usb_blaster/usb_blaster.c b/src/jtag/drivers/usb_blaster/usb_blaster.c
index 8519d197a..cc1d4758f 100644
--- a/src/jtag/drivers/usb_blaster/usb_blaster.c
+++ b/src/jtag/drivers/usb_blaster/usb_blaster.c
@@ -1030,16 +1030,16 @@ COMMAND_HANDLER(ublast_firmware_command)
}
-static const struct command_registration ublast_command_handlers[] = {
+static const struct command_registration ublast_subcommand_handlers[] = {
{
- .name = "usb_blaster_device_desc",
+ .name = "device_desc",
.handler = ublast_handle_device_desc_command,
.mode = COMMAND_CONFIG,
.help = "set the USB device description of the USB-Blaster",
.usage = "description-string",
},
{
- .name = "usb_blaster_vid_pid",
+ .name = "vid_pid",
.handler = ublast_handle_vid_pid_command,
.mode = COMMAND_CONFIG,
.help = "the vendor ID and product ID of the USB-Blaster and "
@@ -1048,21 +1048,21 @@ static const struct command_registration ublast_command_handlers[] = {
.usage = "vid pid vid_uninit pid_uninit",
},
{
- .name = "usb_blaster_lowlevel_driver",
+ .name = "lowlevel_driver",
.handler = ublast_handle_lowlevel_drv_command,
.mode = COMMAND_CONFIG,
.help = "set the lowlevel access for the USB Blaster (ftdi, ublast2)",
.usage = "(ftdi|ublast2)",
},
{
- .name = "usb_blaster_pin",
+ .name = "pin",
.handler = ublast_handle_pin_command,
.mode = COMMAND_ANY,
.help = "show or set pin state for the unused GPIO pins",
.usage = "(pin6|pin8) (0|1|s|t)",
},
{
- .name = "usb_blaster_firmware",
+ .name = "firmware",
.handler = &ublast_firmware_command,
.mode = COMMAND_CONFIG,
.help = "configure the USB-Blaster II firmware location",
@@ -1071,6 +1071,17 @@ static const struct command_registration ublast_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration ublast_command_handlers[] = {
+ {
+ .name = "usb_blaster",
+ .mode = COMMAND_ANY,
+ .help = "perform usb_blaster management",
+ .chain = ublast_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static struct jtag_interface usb_blaster_interface = {
.supported = DEBUG_CAP_TMS_SEQ,
.execute_queue = ublast_execute_queue,
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 80d21e7bd..5763310f4 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -645,4 +645,34 @@ proc buspirate_port args {
eval buspirate port $args
}
+lappend _telnet_autocomplete_skip usb_blaster_device_desc
+proc usb_blaster_device_desc args {
+ echo "DEPRECATED! use 'usb_blaster device_desc' not 'usb_blaster_device_desc'"
+ eval usb_blaster device_desc $args
+}
+
+lappend _telnet_autocomplete_skip usb_blaster_vid_pid
+proc usb_blaster_vid_pid args {
+ echo "DEPRECATED! use 'usb_blaster vid_pid' not 'usb_blaster_vid_pid'"
+ eval usb_blaster vid_pid $args
+}
+
+lappend _telnet_autocomplete_skip usb_blaster_lowlevel_driver
+proc usb_blaster_lowlevel_driver args {
+ echo "DEPRECATED! use 'usb_blaster lowlevel_driver' not 'usb_blaster_lowlevel_driver'"
+ eval usb_blaster lowlevel_driver $args
+}
+
+lappend _telnet_autocomplete_skip usb_blaster_pin
+proc usb_blaster_pin args {
+ echo "DEPRECATED! use 'usb_blaster pin' not 'usb_blaster_pin'"
+ eval usb_blaster pin $args
+}
+
+lappend _telnet_autocomplete_skip usb_blaster_firmware
+proc usb_blaster_firmware args {
+ echo "DEPRECATED! use 'usb_blaster firmware' not 'usb_blaster_firmware'"
+ eval usb_blaster firmware $args
+}
+
# END MIGRATION AIDS
commit cba3bb6f2a736414f86a0e26d3ac8b91551b1574
Author: Marc Schink <de...@za...>
Date: Sun Aug 1 14:06:59 2021 +0200
doc/openocd: Fix buspirate example
Change-Id: Idcbe73220d7630953cb49e643a58a7ab05c395fa
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6406
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 65252d69e..3e5e4cba7 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -3349,7 +3349,7 @@ buspirate port /dev/ttyUSB0
@deffn {Config Command} {buspirate speed} (normal|fast)
Set the communication speed to 115k (normal) or 1M (fast). For example:
@example
-buspirate mode normal
+buspirate speed normal
@end example
@end deffn
commit e53f1c907a9ab16eba320d295db4d68d4b607cc1
Author: Marc Schink <de...@za...>
Date: Sun Aug 1 14:05:19 2021 +0200
tcl/interface/buspirate: Adapt to new buspirate command syntax
Change-Id: I1a82608532f043054abd22eb5b50ab5c5f58cee4
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6405
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/tcl/interface/buspirate.cfg b/tcl/interface/buspirate.cfg
index 265e37e06..20761d152 100644
--- a/tcl/interface/buspirate.cfg
+++ b/tcl/interface/buspirate.cfg
@@ -7,19 +7,19 @@
adapter driver buspirate
# you need to specify port on which BP lives
-#buspirate_port /dev/ttyUSB0
+#buspirate port /dev/ttyUSB0
# communication speed setting
-buspirate_speed normal ;# or fast
+buspirate speed normal ;# or fast
# voltage regulator Enabled = 1 Disabled = 0
-#buspirate_vreg 0
+#buspirate vreg 0
# pin mode normal or open-drain (jtag only)
-#buspirate_mode normal
+#buspirate mode normal
# pullup state Enabled = 1 Disabled = 0
-#buspirate_pullup 0
+#buspirate pullup 0
# this depends on the cable, you are safe with this option
reset_config srst_only
-----------------------------------------------------------------------
Summary of changes:
doc/openocd.texi | 38 ++++-----
src/jtag/drivers/ft232r.c | 33 +++++---
src/jtag/drivers/usb_blaster/usb_blaster.c | 23 ++++--
src/jtag/startup.tcl | 90 ++++++++++++++++++++++
tcl/board/altera_sockit.cfg | 4 +-
tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg | 2 +-
tcl/interface/altera-usb-blaster.cfg | 6 +-
tcl/interface/altera-usb-blaster2.cfg | 6 +-
tcl/interface/buspirate.cfg | 10 +--
tcl/interface/usb-jtag.cfg | 6 +-
10 files changed, 165 insertions(+), 53 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
