Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-325-g8399cbc95
|
From: OpenOCD-Gerrit <ope...@us...> - 2021-08-14 12:37:38
|
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 8399cbc9584985c2b9e4aafb3a6afdb17df89b7f (commit)
via 8d70a67b200fbed8a5599873a55d7cab1e4c9994 (commit)
via a369b6b87a89bf09c51e65b037deb4bcd4683791 (commit)
via 14cefe82067e4b64ccc830159ad842e27aff6027 (commit)
via 620211bec677306854786892dcc0b6876a46a057 (commit)
via a33646a8827984c32e436603b552602b958c27f6 (commit)
from b421d2a4c52b3fe4d939c6f41327b6a5370e09c0 (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 8399cbc9584985c2b9e4aafb3a6afdb17df89b7f
Author: Marc Schink <de...@za...>
Date: Sun Aug 1 14:04:49 2021 +0200
drivers/buspirate: Group adapter commands
Use a command group 'buspirate' with subcommands instead of individual
commands with 'buspirate_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: Id999d4ba276af576fb22b76052f3c0a1f3e1b876
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6404
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 5aab4ba1d..65252d69e 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -3339,21 +3339,21 @@ It uses a simple data protocol over a serial port connection.
Most hardware development boards have a UART, a real serial port, or a virtual USB serial device, so this driver
allows you to start building your own JTAG adapter without the complexity of a custom USB connection.
-@deffn {Config Command} {buspirate_port} serial_port
+@deffn {Config Command} {buspirate port} serial_port
Specify the serial port's filename. For example:
@example
-buspirate_port /dev/ttyUSB0
+buspirate port /dev/ttyUSB0
@end example
@end deffn
-@deffn {Config Command} {buspirate_speed} (normal|fast)
+@deffn {Config Command} {buspirate speed} (normal|fast)
Set the communication speed to 115k (normal) or 1M (fast). For example:
@example
-buspirate_mode normal
+buspirate mode normal
@end example
@end deffn
-@deffn {Config Command} {buspirate_mode} (normal|open-drain)
+@deffn {Config Command} {buspirate mode} (normal|open-drain)
Set the Bus Pirate output mode.
@itemize @minus
@item In normal mode (push/pull), do not enable the pull-ups, and do not connect I/O header pin VPU to JTAG VREF.
@@ -3361,33 +3361,33 @@ Set the Bus Pirate output mode.
@end itemize
For example:
@example
-buspirate_mode normal
+buspirate mode normal
@end example
@end deffn
-@deffn {Config Command} {buspirate_pullup} (0|1)
+@deffn {Config Command} {buspirate pullup} (0|1)
Whether to connect (1) or not (0) the I/O header pin VPU (JTAG VREF)
to the pull-up/pull-down resistors on MOSI (JTAG TDI), CLK (JTAG TCK), MISO (JTAG TDO) and CS (JTAG TMS).
For example:
@example
-buspirate_pullup 0
+buspirate pullup 0
@end example
@end deffn
-@deffn {Config Command} {buspirate_vreg} (0|1)
+@deffn {Config Command} {buspirate vreg} (0|1)
Whether to enable (1) or disable (0) the built-in voltage regulator,
which can be used to supply power to a test circuit through
I/O header pins +3V3 and +5V. For example:
@example
-buspirate_vreg 0
+buspirate vreg 0
@end example
@end deffn
-@deffn {Command} {buspirate_led} (0|1)
+@deffn {Command} {buspirate led} (0|1)
Turns the Bus Pirate's LED on (1) or off (0). For example:
@end deffn
@example
-buspirate_led 1
+buspirate led 1
@end example
@end deffn
diff --git a/src/jtag/drivers/buspirate.c b/src/jtag/drivers/buspirate.c
index 0864c60b3..51ace615f 100644
--- a/src/jtag/drivers/buspirate.c
+++ b/src/jtag/drivers/buspirate.c
@@ -473,51 +473,51 @@ COMMAND_HANDLER(buspirate_handle_port_command)
}
-static const struct command_registration buspirate_command_handlers[] = {
+static const struct command_registration buspirate_subcommand_handlers[] = {
{
- .name = "buspirate_adc",
+ .name = "adc",
.handler = &buspirate_handle_adc_command,
.mode = COMMAND_EXEC,
.help = "reads voltages on adc pins",
.usage = "",
},
{
- .name = "buspirate_vreg",
+ .name = "vreg",
.usage = "<1|0>",
.handler = &buspirate_handle_vreg_command,
.mode = COMMAND_CONFIG,
.help = "changes the state of voltage regulators",
},
{
- .name = "buspirate_pullup",
+ .name = "pullup",
.usage = "<1|0>",
.handler = &buspirate_handle_pullup_command,
.mode = COMMAND_CONFIG,
.help = "changes the state of pullup",
},
{
- .name = "buspirate_led",
+ .name = "led",
.usage = "<1|0>",
.handler = &buspirate_handle_led_command,
.mode = COMMAND_EXEC,
.help = "changes the state of led",
},
{
- .name = "buspirate_speed",
+ .name = "speed",
.usage = "<normal|fast>",
.handler = &buspirate_handle_speed_command,
.mode = COMMAND_CONFIG,
.help = "speed of the interface",
},
{
- .name = "buspirate_mode",
+ .name = "mode",
.usage = "<normal|open-drain>",
.handler = &buspirate_handle_mode_command,
.mode = COMMAND_CONFIG,
.help = "pin mode of the interface",
},
{
- .name = "buspirate_port",
+ .name = "port",
.usage = "/dev/ttyUSB0",
.handler = &buspirate_handle_port_command,
.mode = COMMAND_CONFIG,
@@ -526,6 +526,17 @@ static const struct command_registration buspirate_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration buspirate_command_handlers[] = {
+ {
+ .name = "buspirate",
+ .mode = COMMAND_ANY,
+ .help = "perform buspirate management",
+ .chain = buspirate_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static const struct swd_driver buspirate_swd = {
.init = buspirate_swd_init,
.switch_seq = buspirate_swd_switch_seq,
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 9e5ac26f4..80d21e7bd 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -603,4 +603,46 @@ proc sysfsgpio_swdio_num args {
eval sysfsgpio swdio_num $args
}
+lappend _telnet_autocomplete_skip buspirate_adc
+proc buspirate_adc args {
+ echo "DEPRECATED! use 'buspirate adc' not 'buspirate_adc'"
+ eval buspirate adc $args
+}
+
+lappend _telnet_autocomplete_skip buspirate_vreg
+proc buspirate_vreg args {
+ echo "DEPRECATED! use 'buspirate vreg' not 'buspirate_vreg'"
+ eval buspirate vreg $args
+}
+
+lappend _telnet_autocomplete_skip buspirate_pullup
+proc buspirate_pullup args {
+ echo "DEPRECATED! use 'buspirate pullup' not 'buspirate_pullup'"
+ eval buspirate pullup $args
+}
+
+lappend _telnet_autocomplete_skip buspirate_led
+proc buspirate_led args {
+ echo "DEPRECATED! use 'buspirate led' not 'buspirate_led'"
+ eval buspirate led $args
+}
+
+lappend _telnet_autocomplete_skip buspirate_speed
+proc buspirate_speed args {
+ echo "DEPRECATED! use 'buspirate speed' not 'buspirate_speed'"
+ eval buspirate speed $args
+}
+
+lappend _telnet_autocomplete_skip buspirate_mode
+proc buspirate_mode args {
+ echo "DEPRECATED! use 'buspirate mode' not 'buspirate_mode'"
+ eval buspirate mode $args
+}
+
+lappend _telnet_autocomplete_skip buspirate_port
+proc buspirate_port args {
+ echo "DEPRECATED! use 'buspirate port' not 'buspirate_port'"
+ eval buspirate port $args
+}
+
# END MIGRATION AIDS
commit 8d70a67b200fbed8a5599873a55d7cab1e4c9994
Author: Marc Schink <de...@za...>
Date: Sat Jul 31 23:51:56 2021 +0200
tcl/interface: Adapt config files to new sysfsgpio command syntax
Change-Id: I8e8dee6e8869d2853a7a73c8d4dc8b4891fb0389
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6403
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/tcl/board/novena-internal-fpga.cfg b/tcl/board/novena-internal-fpga.cfg
index 0e9ff5b1f..780586223 100644
--- a/tcl/board/novena-internal-fpga.cfg
+++ b/tcl/board/novena-internal-fpga.cfg
@@ -19,6 +19,6 @@ adapter driver sysfsgpio
transport select jtag
# TCK TMS TDI TDO
-sysfsgpio_jtag_nums 136 139 137 138
+sysfsgpio jtag_nums 136 139 137 138
source [find cpld/xilinx-xc6s.cfg]
diff --git a/tcl/interface/sysfsgpio-raspberrypi.cfg b/tcl/interface/sysfsgpio-raspberrypi.cfg
index ebb150219..0030560ca 100644
--- a/tcl/interface/sysfsgpio-raspberrypi.cfg
+++ b/tcl/interface/sysfsgpio-raspberrypi.cfg
@@ -12,19 +12,19 @@ adapter driver sysfsgpio
# Each of the JTAG lines need a gpio number set: tck tms tdi tdo
# Header pin numbers: 23 22 19 21
-sysfsgpio_jtag_nums 11 25 10 9
+sysfsgpio jtag_nums 11 25 10 9
# Each of the SWD lines need a gpio number set: swclk swdio
# Header pin numbers: 23 22
-sysfsgpio_swd_nums 11 25
+sysfsgpio swd_nums 11 25
# If you define trst or srst, use appropriate reset_config
# Header pin numbers: TRST - 26, SRST - 18
-# sysfsgpio_trst_num 7
+# sysfsgpio trst_num 7
# reset_config trst_only
-# sysfsgpio_srst_num 24
+# sysfsgpio srst_num 24
# reset_config srst_only srst_push_pull
# or if you have both connected,
commit a369b6b87a89bf09c51e65b037deb4bcd4683791
Author: Marc Schink <de...@za...>
Date: Sat Jul 31 23:49:10 2021 +0200
drivers/sysfsgpio: Group adapter commands
Use a command group 'sysfsgpio' with subcommands instead of individual
commands with 'sysfsgpio_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: I103d8d9b0e3169a916d944a999579746f6f6a59c
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6402
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/jtag/drivers/sysfsgpio.c b/src/jtag/drivers/sysfsgpio.c
index 78a4c5b77..103b81009 100644
--- a/src/jtag/drivers/sysfsgpio.c
+++ b/src/jtag/drivers/sysfsgpio.c
@@ -468,72 +468,72 @@ COMMAND_HANDLER(sysfsgpio_handle_swd_gpionum_swdio)
return ERROR_OK;
}
-static const struct command_registration sysfsgpio_command_handlers[] = {
+static const struct command_registration sysfsgpio_subcommand_handlers[] = {
{
- .name = "sysfsgpio_jtag_nums",
+ .name = "jtag_nums",
.handler = &sysfsgpio_handle_jtag_gpionums,
.mode = COMMAND_CONFIG,
.help = "gpio numbers for tck, tms, tdi, tdo. (in that order)",
.usage = "[tck tms tdi tdo]",
},
{
- .name = "sysfsgpio_tck_num",
+ .name = "tck_num",
.handler = &sysfsgpio_handle_jtag_gpionum_tck,
.mode = COMMAND_CONFIG,
.help = "gpio number for tck.",
.usage = "[tck]",
},
{
- .name = "sysfsgpio_tms_num",
+ .name = "tms_num",
.handler = &sysfsgpio_handle_jtag_gpionum_tms,
.mode = COMMAND_CONFIG,
.help = "gpio number for tms.",
.usage = "[tms]",
},
{
- .name = "sysfsgpio_tdo_num",
+ .name = "tdo_num",
.handler = &sysfsgpio_handle_jtag_gpionum_tdo,
.mode = COMMAND_CONFIG,
.help = "gpio number for tdo.",
.usage = "[tdo]",
},
{
- .name = "sysfsgpio_tdi_num",
+ .name = "tdi_num",
.handler = &sysfsgpio_handle_jtag_gpionum_tdi,
.mode = COMMAND_CONFIG,
.help = "gpio number for tdi.",
.usage = "[tdi]",
},
{
- .name = "sysfsgpio_srst_num",
+ .name = "srst_num",
.handler = &sysfsgpio_handle_jtag_gpionum_srst,
.mode = COMMAND_CONFIG,
.help = "gpio number for srst.",
.usage = "[srst]",
},
{
- .name = "sysfsgpio_trst_num",
+ .name = "trst_num",
.handler = &sysfsgpio_handle_jtag_gpionum_trst,
.mode = COMMAND_CONFIG,
.help = "gpio number for trst.",
.usage = "[trst]",
},
{
- .name = "sysfsgpio_swd_nums",
+ .name = "swd_nums",
.handler = &sysfsgpio_handle_swd_gpionums,
.mode = COMMAND_CONFIG,
.help = "gpio numbers for swclk, swdio. (in that order)",
.usage = "[swclk swdio]",
},
{
- .name = "sysfsgpio_swclk_num",
+ .name = "swclk_num",
.handler = &sysfsgpio_handle_swd_gpionum_swclk,
.mode = COMMAND_CONFIG,
.help = "gpio number for swclk.",
.usage = "[swclk]",
},
{
- .name = "sysfsgpio_swdio_num",
+ .name = "swdio_num",
.handler = &sysfsgpio_handle_swd_gpionum_swdio,
.mode = COMMAND_CONFIG,
.help = "gpio number for swdio.",
@@ -542,6 +542,17 @@ static const struct command_registration sysfsgpio_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration sysfsgpio_command_handlers[] = {
+ {
+ .name = "sysfsgpio",
+ .mode = COMMAND_ANY,
+ .help = "perform sysfsgpio management",
+ .chain = sysfsgpio_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static int sysfsgpio_init(void);
static int sysfsgpio_quit(void);
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 5a0f96773..9e5ac26f4 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -543,4 +543,64 @@ proc linuxgpiod_gpiochip args {
eval linuxgpiod gpiochip $args
}
+lappend _telnet_autocomplete_skip sysfsgpio_jtag_nums
+proc sysfsgpio_jtag_nums args {
+ echo "DEPRECATED! use 'sysfsgpio jtag_nums' not 'sysfsgpio_jtag_nums'"
+ eval sysfsgpio jtag_nums $args
+}
+
+lappend _telnet_autocomplete_skip sysfsgpio_tck_num
+proc sysfsgpio_tck_num args {
+ echo "DEPRECATED! use 'sysfsgpio tck_num' not 'sysfsgpio_tck_num'"
+ eval sysfsgpio tck_num $args
+}
+
+lappend _telnet_autocomplete_skip sysfsgpio_tms_num
+proc sysfsgpio_tms_num args {
+ echo "DEPRECATED! use 'sysfsgpio tms_num' not 'sysfsgpio_tms_num'"
+ eval sysfsgpio tms_num $args
+}
+
+lappend _telnet_autocomplete_skip sysfsgpio_tdo_num
+proc sysfsgpio_tdo_num args {
+ echo "DEPRECATED! use 'sysfsgpio tdo_num' not 'sysfsgpio_tdo_num'"
+ eval sysfsgpio tdo_num $args
+}
+
+lappend _telnet_autocomplete_skip sysfsgpio_tdi_num
+proc sysfsgpio_tdi_num args {
+ echo "DEPRECATED! use 'sysfsgpio tdi_num' not 'sysfsgpio_tdi_num'"
+ eval sysfsgpio tdi_num $args
+}
+
+lappend _telnet_autocomplete_skip sysfsgpio_srst_num
+proc sysfsgpio_srst_num args {
+ echo "DEPRECATED! use 'sysfsgpio srst_num' not 'sysfsgpio_srst_num'"
+ eval sysfsgpio srst_num $args
+}
+
+lappend _telnet_autocomplete_skip sysfsgpio_trst_num
+proc sysfsgpio_trst_num args {
+ echo "DEPRECATED! use 'sysfsgpio trst_num' not 'sysfsgpio_trst_num'"
+ eval sysfsgpio trst_num $args
+}
+
+lappend _telnet_autocomplete_skip sysfsgpio_swd_nums
+proc sysfsgpio_swd_nums args {
+ echo "DEPRECATED! use 'sysfsgpio swd_nums' not 'sysfsgpio_swd_nums'"
+ eval sysfsgpio swd_nums $args
+}
+
+lappend _telnet_autocomplete_skip sysfsgpio_swclk_num
+proc sysfsgpio_swclk_num args {
+ echo "DEPRECATED! use 'sysfsgpio swclk_num' not 'sysfsgpio_swclk_num'"
+ eval sysfsgpio swclk_num $args
+}
+
+lappend _telnet_autocomplete_skip sysfsgpio_swdio_num
+proc sysfsgpio_swdio_num args {
+ echo "DEPRECATED! use 'sysfsgpio swdio_num' not 'sysfsgpio_swdio_num'"
+ eval sysfsgpio swdio_num $args
+}
+
# END MIGRATION AIDS
commit 14cefe82067e4b64ccc830159ad842e27aff6027
Author: Marc Schink <de...@za...>
Date: Sat Jul 31 23:45:31 2021 +0200
tcl/interface/dln-2-gpiod: Adapt to new linuxgpiod command syntax
Change-Id: Ife1e52fe5da0e0374a606072f1faf7c598cf0e2b
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6401
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/tcl/interface/dln-2-gpiod.cfg b/tcl/interface/dln-2-gpiod.cfg
index 5407a244e..cd6061fd9 100644
--- a/tcl/interface/dln-2-gpiod.cfg
+++ b/tcl/interface/dln-2-gpiod.cfg
@@ -17,11 +17,11 @@
adapter driver linuxgpiod
-linuxgpiod_gpiochip 0
-linuxgpiod_jtag_nums 2 3 4 1
-linuxgpiod_trst_num 5
-linuxgpiod_swd_nums 2 3
-linuxgpiod_srst_num 0
-linuxgpiod_led_num 6
+linuxgpiod gpiochip 0
+linuxgpiod jtag_nums 2 3 4 1
+linuxgpiod trst_num 5
+linuxgpiod swd_nums 2 3
+linuxgpiod srst_num 0
+linuxgpiod led_num 6
reset_config trst_and_srst separate srst_push_pull
commit 620211bec677306854786892dcc0b6876a46a057
Author: Marc Schink <de...@za...>
Date: Sat Jul 31 23:44:24 2021 +0200
drivers/linuxgpiod: Group adapter commands
Use a command group 'linuxgpiod' with subcommands instead of individual
commands with 'linuxgpiod_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: Iad9b330363f81128ab1ec1cbc498df28ba2ca152
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6400
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/jtag/drivers/linuxgpiod.c b/src/jtag/drivers/linuxgpiod.c
index 03afd3da7..42c8a3140 100644
--- a/src/jtag/drivers/linuxgpiod.c
+++ b/src/jtag/drivers/linuxgpiod.c
@@ -524,86 +524,86 @@ COMMAND_HANDLER(linuxgpiod_handle_gpiochip)
return ERROR_OK;
}
-static const struct command_registration linuxgpiod_command_handlers[] = {
+static const struct command_registration linuxgpiod_subcommand_handlers[] = {
{
- .name = "linuxgpiod_jtag_nums",
+ .name = "jtag_nums",
.handler = linuxgpiod_handle_jtag_gpionums,
.mode = COMMAND_CONFIG,
.help = "gpio numbers for tck, tms, tdi, tdo. (in that order)",
.usage = "tck tms tdi tdo",
},
{
- .name = "linuxgpiod_tck_num",
+ .name = "tck_num",
.handler = linuxgpiod_handle_jtag_gpionum_tck,
.mode = COMMAND_CONFIG,
.help = "gpio number for tck.",
.usage = "tck",
},
{
- .name = "linuxgpiod_tms_num",
+ .name = "tms_num",
.handler = linuxgpiod_handle_jtag_gpionum_tms,
.mode = COMMAND_CONFIG,
.help = "gpio number for tms.",
.usage = "tms",
},
{
- .name = "linuxgpiod_tdo_num",
+ .name = "tdo_num",
.handler = linuxgpiod_handle_jtag_gpionum_tdo,
.mode = COMMAND_CONFIG,
.help = "gpio number for tdo.",
.usage = "tdo",
},
{
- .name = "linuxgpiod_tdi_num",
+ .name = "tdi_num",
.handler = linuxgpiod_handle_jtag_gpionum_tdi,
.mode = COMMAND_CONFIG,
.help = "gpio number for tdi.",
.usage = "tdi",
},
{
- .name = "linuxgpiod_srst_num",
+ .name = "srst_num",
.handler = linuxgpiod_handle_jtag_gpionum_srst,
.mode = COMMAND_CONFIG,
.help = "gpio number for srst.",
.usage = "srst",
},
{
- .name = "linuxgpiod_trst_num",
+ .name = "trst_num",
.handler = linuxgpiod_handle_jtag_gpionum_trst,
.mode = COMMAND_CONFIG,
.help = "gpio number for trst.",
.usage = "trst",
},
{
- .name = "linuxgpiod_swd_nums",
+ .name = "swd_nums",
.handler = linuxgpiod_handle_swd_gpionums,
.mode = COMMAND_CONFIG,
.help = "gpio numbers for swclk, swdio. (in that order)",
.usage = "swclk swdio",
},
{
- .name = "linuxgpiod_swclk_num",
+ .name = "swclk_num",
.handler = linuxgpiod_handle_swd_gpionum_swclk,
.mode = COMMAND_CONFIG,
.help = "gpio number for swclk.",
.usage = "swclk",
},
{
- .name = "linuxgpiod_swdio_num",
+ .name = "swdio_num",
.handler = linuxgpiod_handle_swd_gpionum_swdio,
.mode = COMMAND_CONFIG,
.help = "gpio number for swdio.",
.usage = "swdio",
},
{
- .name = "linuxgpiod_led_num",
+ .name = "led_num",
.handler = linuxgpiod_handle_gpionum_led,
.mode = COMMAND_CONFIG,
.help = "gpio number for LED.",
.usage = "led",
},
{
- .name = "linuxgpiod_gpiochip",
+ .name = "gpiochip",
.handler = linuxgpiod_handle_gpiochip,
.mode = COMMAND_CONFIG,
.help = "number of the gpiochip.",
@@ -612,6 +612,17 @@ static const struct command_registration linuxgpiod_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration linuxgpiod_command_handlers[] = {
+ {
+ .name = "linuxgpiod",
+ .mode = COMMAND_ANY,
+ .help = "perform linuxgpiod management",
+ .chain = linuxgpiod_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static const char *const linuxgpiod_transport[] = { "swd", "jtag", NULL };
static struct jtag_interface linuxgpiod_interface = {
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 688d1fccf..5a0f96773 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -471,4 +471,76 @@ proc bcm2835gpio_peripheral_base args {
eval bcm2835gpio peripheral_base $args
}
+lappend _telnet_autocomplete_skip linuxgpiod_jtag_nums
+proc linuxgpiod_jtag_nums args {
+ echo "DEPRECATED! use 'linuxgpiod jtag_nums' not 'linuxgpiod_jtag_nums'"
+ eval linuxgpiod jtag_nums $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_tck_num
+proc linuxgpiod_tck_num args {
+ echo "DEPRECATED! use 'linuxgpiod tck_num' not 'linuxgpiod_tck_num'"
+ eval linuxgpiod tck_num $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_tms_num
+proc linuxgpiod_tms_num args {
+ echo "DEPRECATED! use 'linuxgpiod tms_num' not 'linuxgpiod_tms_num'"
+ eval linuxgpiod tms_num $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_tdo_num
+proc linuxgpiod_tdo_num args {
+ echo "DEPRECATED! use 'linuxgpiod tdo_num' not 'linuxgpiod_tdo_num'"
+ eval linuxgpiod tdo_num $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_tdi_num
+proc linuxgpiod_tdi_num args {
+ echo "DEPRECATED! use 'linuxgpiod tdi_num' not 'linuxgpiod_tdi_num'"
+ eval linuxgpiod tdi_num $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_srst_num
+proc linuxgpiod_srst_num args {
+ echo "DEPRECATED! use 'linuxgpiod srst_num' not 'linuxgpiod_srst_num'"
+ eval linuxgpiod srst_num $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_trst_num
+proc linuxgpiod_trst_num args {
+ echo "DEPRECATED! use 'linuxgpiod trst_num' not 'linuxgpiod_trst_num'"
+ eval linuxgpiod trst_num $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_swd_nums
+proc linuxgpiod_swd_nums args {
+ echo "DEPRECATED! use 'linuxgpiod swd_nums' not 'linuxgpiod_swd_nums'"
+ eval linuxgpiod swd_nums $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_swclk_num
+proc linuxgpiod_swclk_num args {
+ echo "DEPRECATED! use 'linuxgpiod swclk_num' not 'linuxgpiod_swclk_num'"
+ eval linuxgpiod swclk_num $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_swdio_num
+proc linuxgpiod_swdio_num args {
+ echo "DEPRECATED! use 'linuxgpiod swdio_num' not 'linuxgpiod_swdio_num'"
+ eval linuxgpiod swdio_num $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_led_num
+proc linuxgpiod_led_num args {
+ echo "DEPRECATED! use 'linuxgpiod led_num' not 'linuxgpiod_led_num'"
+ eval linuxgpiod led_num $args
+}
+
+lappend _telnet_autocomplete_skip linuxgpiod_gpiochip
+proc linuxgpiod_gpiochip args {
+ echo "DEPRECATED! use 'linuxgpiod gpiochip' not 'linuxgpiod_gpiochip'"
+ eval linuxgpiod gpiochip $args
+}
+
# END MIGRATION AIDS
commit a33646a8827984c32e436603b552602b958c27f6
Author: Marc Schink <de...@za...>
Date: Fri Jul 30 18:40:03 2021 +0200
tcl/interface/jtag_vpi: Adapt to new jtag_vpi command syntax
Change-Id: I27eeab5e3dd554af00799104471ee8f30fbd0c51
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6399
Tested-by: jenkins
Reviewed-by: Jan Matyas <ma...@co...>
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/tcl/interface/jtag_vpi.cfg b/tcl/interface/jtag_vpi.cfg
index e665a6331..f2f90f745 100644
--- a/tcl/interface/jtag_vpi.cfg
+++ b/tcl/interface/jtag_vpi.cfg
@@ -14,5 +14,5 @@ if { [info exists VPI_ADDRESS] } {
set _VPI_ADDRESS "127.0.0.1"
}
-jtag_vpi_set_port $_VPI_PORT
-jtag_vpi_set_address $_VPI_ADDRESS
+jtag_vpi set_port $_VPI_PORT
+jtag_vpi set_address $_VPI_ADDRESS
-----------------------------------------------------------------------
Summary of changes:
doc/openocd.texi | 24 ++---
src/jtag/drivers/buspirate.c | 27 +++--
src/jtag/drivers/linuxgpiod.c | 37 ++++---
src/jtag/drivers/sysfsgpio.c | 33 ++++--
src/jtag/startup.tcl | 174 ++++++++++++++++++++++++++++++++
tcl/board/novena-internal-fpga.cfg | 2 +-
tcl/interface/dln-2-gpiod.cfg | 12 +--
tcl/interface/jtag_vpi.cfg | 4 +-
tcl/interface/sysfsgpio-raspberrypi.cfg | 8 +-
9 files changed, 264 insertions(+), 57 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
