Menu
▾
▴
openocd-commit
|
From: OpenOCD-Gerrit <ope...@us...> - 2021-08-14 12:35:06
|
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 6c5618218494263cc52c8b140d047f0d046c5d69 (commit)
via 32b18728491c8a0e1cc7b2ea33836db86b92a882 (commit)
via 48f34382e3aa1c19480a1b004df35018cbadd93f (commit)
via 4a5045b143cad3b0bdba7c5590504bfc19e9a627 (commit)
from dd04079c2c15bbdb0460342284c96812f4c78d87 (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 6c5618218494263cc52c8b140d047f0d046c5d69
Author: Marc Schink <de...@za...>
Date: Fri Jul 30 18:20:39 2021 +0200
drivers/ulink: Group adapter commands
Use a command group 'ulink' with subcommands instead of individual
commands with 'ulink_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: I600d65de2bbd5fb8107445f7fe93b6b24c572e3e
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6392
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c
index b2fedbefd..3ae5cac62 100644
--- a/src/jtag/drivers/ulink.c
+++ b/src/jtag/drivers/ulink.c
@@ -2258,9 +2258,9 @@ COMMAND_HANDLER(ulink_download_firmware_handler)
/*************************** Command Registration **************************/
-static const struct command_registration ulink_command_handlers[] = {
+static const struct command_registration ulink_subcommand_handlers[] = {
{
- .name = "ulink_download_firmware",
+ .name = "download_firmware",
.handler = &ulink_download_firmware_handler,
.mode = COMMAND_EXEC,
.help = "download firmware image to ULINK device",
@@ -2269,6 +2269,17 @@ static const struct command_registration ulink_command_handlers[] = {
COMMAND_REGISTRATION_DONE,
};
+static const struct command_registration ulink_command_handlers[] = {
+ {
+ .name = "ulink",
+ .mode = COMMAND_ANY,
+ .help = "perform ulink management",
+ .chain = ulink_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static struct jtag_interface ulink_interface = {
.execute_queue = ulink_execute_queue,
};
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index d4226c686..19ce510c8 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -321,5 +321,10 @@ proc xlnx_pcie_xvc_config args {
eval xlnx_pcie_xvc config $args
}
+lappend _telnet_autocomplete_skip ulink_download_firmware
+proc ulink_download_firmware args {
+ echo "DEPRECATED! use 'ulink download_firmware' not 'ulink_download_firmware'"
+ eval ulink download_firmware $args
+}
# END MIGRATION AIDS
commit 32b18728491c8a0e1cc7b2ea33836db86b92a882
Author: Marc Schink <de...@za...>
Date: Fri Jul 30 18:19:02 2021 +0200
drivers/xlnx-pcie-xvc: Group adapter commands
Use a command group 'xlnx_pcie_xvc' with subcommands instead of individual
commands with 'xlnx_pcie_xvc_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: I0deaaa14ed14f65bf356f3c248331bfab472f08d
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6391
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index a9fe2906c..eb45acc39 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -3172,7 +3172,7 @@ exposed via extended capability registers in the PCI Express configuration space
For more information see Xilinx PG245 (Section on From_PCIE_to_JTAG mode).
-@deffn {Config Command} {xlnx_pcie_xvc_config} device
+@deffn {Config Command} {xlnx_pcie_xvc config} device
Specifies the PCI Express device via parameter @var{device} to use.
The correct value for @var{device} can be obtained by looking at the output
diff --git a/src/jtag/drivers/xlnx-pcie-xvc.c b/src/jtag/drivers/xlnx-pcie-xvc.c
index 27295f596..c05b9cf4a 100644
--- a/src/jtag/drivers/xlnx-pcie-xvc.c
+++ b/src/jtag/drivers/xlnx-pcie-xvc.c
@@ -460,9 +460,9 @@ COMMAND_HANDLER(xlnx_pcie_xvc_handle_config_command)
return ERROR_OK;
}
-static const struct command_registration xlnx_pcie_xvc_command_handlers[] = {
+static const struct command_registration xlnx_pcie_xvc_subcommand_handlers[] = {
{
- .name = "xlnx_pcie_xvc_config",
+ .name = "config",
.handler = xlnx_pcie_xvc_handle_config_command,
.mode = COMMAND_CONFIG,
.help = "Configure XVC/PCIe JTAG adapter",
@@ -471,6 +471,17 @@ static const struct command_registration xlnx_pcie_xvc_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration xlnx_pcie_xvc_command_handlers[] = {
+ {
+ .name = "xlnx_pcie_xvc",
+ .mode = COMMAND_ANY,
+ .help = "perform xlnx_pcie_xvc management",
+ .chain = xlnx_pcie_xvc_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static struct jtag_interface xlnx_pcie_xvc_jtag_ops = {
.execute_queue = &xlnx_pcie_xvc_execute_queue,
};
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 94dbca263..d4226c686 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -315,4 +315,11 @@ proc presto_serial args {
eval presto serial $args
}
+lappend _telnet_autocomplete_skip xlnx_pcie_xvc_config
+proc xlnx_pcie_xvc_config args {
+ echo "DEPRECATED! use 'xlnx_pcie_xvc config' not 'xlnx_pcie_xvc_config'"
+ eval xlnx_pcie_xvc config $args
+}
+
+
# END MIGRATION AIDS
commit 48f34382e3aa1c19480a1b004df35018cbadd93f
Author: Marc Schink <de...@za...>
Date: Fri Jul 30 18:11:23 2021 +0200
drivers/presto: Group adapter commands
Use a command group 'presto' with subcommands instead of individual
commands with 'presto_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: I883d8d87fd457d29cee8d12cd80f2e6c405e8f42
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6390
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 0d7719def..a9fe2906c 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -3033,7 +3033,7 @@ parport cable wiggler
@deffn {Interface Driver} {presto}
ASIX PRESTO USB JTAG programmer.
-@deffn {Config Command} {presto_serial} serial_string
+@deffn {Config Command} {presto serial} serial_string
Configures the USB serial number of the Presto device to use.
@end deffn
@end deffn
diff --git a/src/jtag/drivers/presto.c b/src/jtag/drivers/presto.c
index b6f110be8..61de42630 100644
--- a/src/jtag/drivers/presto.c
+++ b/src/jtag/drivers/presto.c
@@ -519,9 +519,9 @@ COMMAND_HANDLER(presto_handle_serial_command)
return ERROR_OK;
}
-static const struct command_registration presto_command_handlers[] = {
+static const struct command_registration presto_subcommand_handlers[] = {
{
- .name = "presto_serial",
+ .name = "serial",
.handler = presto_handle_serial_command,
.mode = COMMAND_CONFIG,
.help = "Configure USB serial number of Presto device.",
@@ -530,6 +530,17 @@ static const struct command_registration presto_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration presto_command_handlers[] = {
+ {
+ .name = "presto",
+ .mode = COMMAND_ANY,
+ .help = "perform presto management",
+ .chain = presto_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static int presto_jtag_init(void)
{
if (presto_open(presto_serial) != ERROR_OK) {
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 02a3626f4..94dbca263 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -309,4 +309,10 @@ proc parport_toggling_time args {
eval parport toggling_time $args
}
+lappend _telnet_autocomplete_skip presto_serial
+proc presto_serial args {
+ echo "DEPRECATED! use 'presto serial' not 'presto_serial'"
+ eval presto serial $args
+}
+
# END MIGRATION AIDS
commit 4a5045b143cad3b0bdba7c5590504bfc19e9a627
Author: Marc Schink <de...@za...>
Date: Fri Jul 30 18:01:09 2021 +0200
drivers/remote_bitbang: Group adapter commands
Use a command group 'remote_bitbang' with subcommands instead of individual
commands with 'remote_bitbang_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: I2692320f19c8a357112a365db6ca7e13cd6ad411
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6389
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/contrib/remote_bitbang/remote_bitbang_sysfsgpio.c b/contrib/remote_bitbang/remote_bitbang_sysfsgpio.c
index 5c717ce0e..6cf30c3bc 100644
--- a/contrib/remote_bitbang/remote_bitbang_sysfsgpio.c
+++ b/contrib/remote_bitbang/remote_bitbang_sysfsgpio.c
@@ -30,12 +30,12 @@
socat TCP6-LISTEN:7777,fork EXEC:"sudo ./remote_bitbang_sysfsgpio tck 11 tms 25 tdo 9 tdi 10"
On host run:
- openocd -c "interface remote_bitbang; remote_bitbang_host raspberrypi; remote_bitbang_port 7777" \
+ openocd -c "interface remote_bitbang; remote_bitbang host raspberrypi; remote_bitbang port 7777" \
-f target/stm32f1x.cfg
Or if you want to test UNIX sockets, run both on Raspberry Pi:
socat UNIX-LISTEN:/tmp/remotebitbang-socket,fork EXEC:"sudo ./remote_bitbang_sysfsgpio tck 11 tms 25 tdo 9 tdi 10"
- openocd -c "interface remote_bitbang; remote_bitbang_host /tmp/remotebitbang-socket" -f target/stm32f1x.cfg
+ openocd -c "interface remote_bitbang; remote_bitbang host /tmp/remotebitbang-socket" -f target/stm32f1x.cfg
*/
#include <sys/types.h>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index c3963d6cb..0d7719def 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2694,14 +2694,14 @@ instead of directly driving JTAG.
The remote_bitbang driver is useful for debugging software running on
processors which are being simulated.
-@deffn {Config Command} {remote_bitbang_port} number
+@deffn {Config Command} {remote_bitbang port} number
Specifies the TCP port of the remote process to connect to or 0 to use UNIX
sockets instead of TCP.
@end deffn
-@deffn {Config Command} {remote_bitbang_host} hostname
+@deffn {Config Command} {remote_bitbang host} hostname
Specifies the hostname of the remote process to connect to using TCP, or the
-name of the UNIX socket to use if remote_bitbang_port is 0.
+name of the UNIX socket to use if remote_bitbang port is 0.
@end deffn
For example, to connect remotely via TCP to the host foobar you might have
@@ -2709,8 +2709,8 @@ something like:
@example
adapter driver remote_bitbang
-remote_bitbang_port 3335
-remote_bitbang_host foobar
+remote_bitbang port 3335
+remote_bitbang host foobar
@end example
To connect to another process running locally via UNIX sockets with socket
@@ -2718,8 +2718,8 @@ named mysocket:
@example
adapter driver remote_bitbang
-remote_bitbang_port 0
-remote_bitbang_host mysocket
+remote_bitbang port 0
+remote_bitbang host mysocket
@end example
@end deffn
diff --git a/src/jtag/drivers/remote_bitbang.c b/src/jtag/drivers/remote_bitbang.c
index 6d1f48bc3..ce1a06544 100644
--- a/src/jtag/drivers/remote_bitbang.c
+++ b/src/jtag/drivers/remote_bitbang.c
@@ -340,9 +340,9 @@ COMMAND_HANDLER(remote_bitbang_handle_remote_bitbang_host_command)
return ERROR_COMMAND_SYNTAX_ERROR;
}
-static const struct command_registration remote_bitbang_command_handlers[] = {
+static const struct command_registration remote_bitbang_subcommand_handlers[] = {
{
- .name = "remote_bitbang_port",
+ .name = "port",
.handler = remote_bitbang_handle_remote_bitbang_port_command,
.mode = COMMAND_CONFIG,
.help = "Set the port to use to connect to the remote jtag.\n"
@@ -350,7 +350,7 @@ static const struct command_registration remote_bitbang_command_handlers[] = {
.usage = "port_number",
},
{
- .name = "remote_bitbang_host",
+ .name = "host",
.handler = remote_bitbang_handle_remote_bitbang_host_command,
.mode = COMMAND_CONFIG,
.help = "Set the host to use to connect to the remote jtag.\n"
@@ -360,6 +360,17 @@ static const struct command_registration remote_bitbang_command_handlers[] = {
COMMAND_REGISTRATION_DONE,
};
+static const struct command_registration remote_bitbang_command_handlers[] = {
+ {
+ .name = "remote_bitbang",
+ .mode = COMMAND_ANY,
+ .help = "perform remote_bitbang management",
+ .chain = remote_bitbang_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static int remote_bitbang_execute_queue(void)
{
/* safety: the send buffer must be empty, no leftover characters from
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index f2e4ec353..02a3626f4 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -261,6 +261,18 @@ proc ftdi_tdo_sample_edge args {
eval ftdi tdo_sample_edge $args
}
+lappend _telnet_autocomplete_skip remote_bitbang_host
+proc remote_bitbang_host args {
+ echo "DEPRECATED! use 'remote_bitbang host' not 'remote_bitbang_host'"
+ eval remote_bitbang host $args
+}
+
+lappend _telnet_autocomplete_skip remote_bitbang_port
+proc remote_bitbang_port args {
+ echo "DEPRECATED! use 'remote_bitbang port' not 'remote_bitbang_port'"
+ eval remote_bitbang port $args
+}
+
lappend _telnet_autocomplete_skip openjtag_device_desc
proc openjtag_device_desc args {
echo "DEPRECATED! use 'openjtag device_desc' not 'openjtag_device_desc'"
-----------------------------------------------------------------------
Summary of changes:
contrib/remote_bitbang/remote_bitbang_sysfsgpio.c | 4 +--
doc/openocd.texi | 18 +++++++-------
src/jtag/drivers/presto.c | 15 ++++++++++--
src/jtag/drivers/remote_bitbang.c | 17 ++++++++++---
src/jtag/drivers/ulink.c | 15 ++++++++++--
src/jtag/drivers/xlnx-pcie-xvc.c | 15 ++++++++++--
src/jtag/startup.tcl | 30 +++++++++++++++++++++++
7 files changed, 94 insertions(+), 20 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X