aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEvgeniy Naydanov <evgeniy.naydanov@syntacore.com>2024-02-15 11:08:42 +0300
committerEvgeniy Naydanov <evgeniy.naydanov@syntacore.com>2024-02-15 11:17:13 +0300
commitbfedb42adf8185e79b5cf077f77f02ae4af798c2 (patch)
treeaa79b048dfec1a13383291e9858dde096092d7e9 /doc
parent5d4fa0001e2f6bd23caf10fd02f980053adb2b3b (diff)
parentefdd5e09b1108e3bd35898a684817c01dc95cd93 (diff)
downloadriscv-openocd-bfedb42adf8185e79b5cf077f77f02ae4af798c2.zip
riscv-openocd-bfedb42adf8185e79b5cf077f77f02ae4af798c2.tar.gz
riscv-openocd-bfedb42adf8185e79b5cf077f77f02ae4af798c2.tar.bz2
Merge up to efdd5e09b1108e3bd35898a684817c01dc95cd93 from upstream
There is an ongoing discussion on https://review.openocd.org/c/openocd/+/8124 regarding 0d3d4c981ac77b600ce95c9ea6f1cdb280127342, but AFAIU it seems that the patch does not break anything. Change-Id: I48037504300e517b14e41a00f3bf978a16172d14
Diffstat (limited to 'doc')
-rw-r--r--doc/openocd.texi16
1 files changed, 13 insertions, 3 deletions
diff --git a/doc/openocd.texi b/doc/openocd.texi
index e7de90b..27a2601 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -3474,6 +3474,15 @@ Currently valid @var{variant} values include:
The USB device description string of the adapter.
This value is only used with the standard variant.
@end deffn
+
+@deffn {Config Command} {openjtag vid_pid} vid pid
+The USB vendor ID and product ID of the adapter. If not specified, default
+0x0403:0x6001 is used.
+This value is only used with the standard variant.
+@example
+openjtag vid_pid 0x403 0x6014
+@end example
+@end deffn
@end deffn
@@ -9055,9 +9064,10 @@ echo "Downloading kernel -- please wait"
@end example
@end deffn
-@deffn {Command} {log_output} [filename | "default"]
-Redirect logging to @var{filename} or set it back to default output;
-the default log output channel is stderr.
+@deffn {Command} {log_output} [filename | 'default']
+Redirect logging to @var{filename}. If used without an argument or
+@var{filename} is set to 'default' log output channel is set to
+stderr.
@end deffn
@deffn {Command} {add_script_search_dir} [directory]