summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2010-03-15 08:41:30 -0700
committerDavid Brownell <dbrownell@users.sourceforge.net>2010-03-15 08:41:30 -0700
commitb559b273b526b3077b3ca219eecc8df9f86efac0 (patch)
tree5848552f09431e065550e60e8106029e01db3136
parent96f9790279f74f39b35fc3ad09340fd03123180c (diff)
downloadopenocd+libswd-b559b273b526b3077b3ca219eecc8df9f86efac0.tar.gz
openocd+libswd-b559b273b526b3077b3ca219eecc8df9f86efac0.tar.bz2
openocd+libswd-b559b273b526b3077b3ca219eecc8df9f86efac0.tar.xz
openocd+libswd-b559b273b526b3077b3ca219eecc8df9f86efac0.zip
rename jtag_nsrst_delay as adapter_nsrst_delay
Globally rename "jtag_nsrst_delay" as "adapter_nsrst_delay", and move it out of the "jtag" command group ... it needs to be used with non-JTAG transports Includes a migration aid (in jtag/startup.tcl) so that old user scripts won't break. That aid should Sunset in about a year. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-rw-r--r--NEWS1
-rw-r--r--doc/openocd.texi4
-rw-r--r--src/jtag/core.c10
-rw-r--r--src/jtag/startup.tcl1
-rw-r--r--src/jtag/tcl.c18
-rw-r--r--tcl/board/at91sam9g20-ek.cfg2
-rw-r--r--tcl/board/crossbow_tech_imote2.cfg2
-rw-r--r--tcl/board/csb732.cfg2
-rw-r--r--tcl/board/digi_connectcore_wi-9c.cfg2
-rw-r--r--tcl/board/ek-lm3s1968.cfg2
-rw-r--r--tcl/board/ek-lm3s811.cfg2
-rw-r--r--tcl/board/ek-lm3s9b9x.cfg2
-rw-r--r--tcl/board/ethernut3.cfg2
-rw-r--r--tcl/board/hitex_lpc2929.cfg2
-rw-r--r--tcl/board/hitex_str9-comstick.cfg2
-rw-r--r--tcl/board/lubbock.cfg2
-rw-r--r--tcl/board/mini2440.cfg4
-rw-r--r--tcl/board/phytec_lpc3250.cfg2
-rw-r--r--tcl/board/pxa255_sst.cfg2
-rw-r--r--tcl/board/telo.cfg2
-rw-r--r--tcl/interface/calao-usb-a9260.cfg2
-rw-r--r--tcl/target/aduc702x.cfg2
-rw-r--r--tcl/target/ar71xx.cfg2
-rw-r--r--tcl/target/at91sam9260.cfg2
-rw-r--r--tcl/target/at91sam9260_ext_RAM_ext_flash.cfg2
-rw-r--r--tcl/target/at91sam9rl.cfg2
-rw-r--r--tcl/target/dragonite.cfg2
-rw-r--r--tcl/target/epc9301.cfg2
-rw-r--r--tcl/target/feroceon.cfg2
-rw-r--r--tcl/target/imx31.cfg2
-rw-r--r--tcl/target/lm3s6965.cfg2
-rw-r--r--tcl/target/lpc1768.cfg2
-rw-r--r--tcl/target/lpc2103.cfg2
-rw-r--r--tcl/target/lpc2124.cfg2
-rw-r--r--tcl/target/lpc2129.cfg2
-rw-r--r--tcl/target/lpc2148.cfg2
-rw-r--r--tcl/target/lpc2294.cfg2
-rw-r--r--tcl/target/lpc2378.cfg2
-rw-r--r--tcl/target/lpc2478.cfg2
-rw-r--r--tcl/target/mega128.cfg2
-rw-r--r--tcl/target/netx500.cfg2
-rw-r--r--tcl/target/omap5912.cfg2
-rw-r--r--tcl/target/pic32mx.cfg2
-rw-r--r--tcl/target/pxa270.cfg4
-rw-r--r--tcl/target/pxa3xx.cfg4
-rw-r--r--tcl/target/samsung_s3c6410.cfg2
-rw-r--r--tcl/target/smp8634.cfg2
-rw-r--r--tcl/target/stm32.cfg2
-rw-r--r--tcl/target/str730.cfg2
-rw-r--r--tcl/target/str750.cfg2
-rw-r--r--tcl/target/str912.cfg2
-rw-r--r--tcl/target/telo.cfg2
-rw-r--r--tcl/target/tmpa900.cfg2
-rw-r--r--tcl/target/tmpa910.cfg2
-rw-r--r--tcl/target/xba_revA3.cfg2
-rw-r--r--tcl/test/syntax1.cfg2
56 files changed, 72 insertions, 70 deletions
diff --git a/NEWS b/NEWS
index 4e093dcb..924ee372 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ JTAG Layer:
convert your scripts to the new names, since those procedures
will not be around forever.
jtag_khz ... is now adapter_khz
+ jtag_nsrst_delay ... is now adapter_nsrst_delay
Boundary Scan:
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 5a1e0956..9d1532b1 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2603,7 +2603,7 @@ stops issuing the reset. For example, there may be chip or board
requirements that all reset pulses last for at least a
certain amount of time; and reset buttons commonly have
hardware debouncing.
-Use the @command{jtag_nsrst_delay} and @command{jtag_ntrst_delay}
+Use the @command{adapter_nsrst_delay} and @command{jtag_ntrst_delay}
commands to say when extra delays are needed.
@item @emph{Drive type} ... Reset lines often have a pullup
@@ -2649,7 +2649,7 @@ after asserting nSRST (active-low system reset) before
allowing it to be deasserted.
@end deffn
-@deffn {Command} jtag_nsrst_delay milliseconds
+@deffn {Command} adapter_nsrst_delay milliseconds
How long (in milliseconds) OpenOCD should wait after deasserting
nSRST (active-low system reset) before starting new JTAG operations.
When a board has a reset button connected to SRST line it will
diff --git a/src/jtag/core.c b/src/jtag/core.c
index bdf968e9..bb11ff15 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -93,7 +93,7 @@ static bool jtag_verify_capture_ir = true;
static int jtag_verify = 1;
/* how long the OpenOCD should wait before attempting JTAG communication after reset lines deasserted (in ms) */
-static int jtag_nsrst_delay = 0; /* default to no nSRST delay */
+static int adapter_nsrst_delay = 0; /* default to no nSRST delay */
static int jtag_ntrst_delay = 0; /* default to no nTRST delay */
static int jtag_nsrst_assert_width = 0; /* width of assertion */
static int jtag_ntrst_assert_width = 0; /* width of assertion */
@@ -704,8 +704,8 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
}
else {
LOG_DEBUG("SRST line released");
- if (jtag_nsrst_delay)
- jtag_add_sleep(jtag_nsrst_delay * 1000);
+ if (adapter_nsrst_delay)
+ jtag_add_sleep(adapter_nsrst_delay * 1000);
}
}
@@ -1696,11 +1696,11 @@ int jtag_get_srst(void)
void jtag_set_nsrst_delay(unsigned delay)
{
- jtag_nsrst_delay = delay;
+ adapter_nsrst_delay = delay;
}
unsigned jtag_get_nsrst_delay(void)
{
- return jtag_nsrst_delay;
+ return adapter_nsrst_delay;
}
void jtag_set_ntrst_delay(unsigned delay)
{
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index c49c43e1..42fbe4f6 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -83,4 +83,5 @@ proc srst_asserted {} {
# FIXME phase these aids out after about April 2011
#
proc jtag_khz args { eval adapter_khz $args }
+proc jtag_nsrst_delay args { eval adapter_nsrst_delay $args }
# END MIGRATION AIDS
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 8faefd1a..d587922b 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -1291,7 +1291,7 @@ next:
return ERROR_OK;
}
-COMMAND_HANDLER(handle_jtag_nsrst_delay_command)
+COMMAND_HANDLER(handle_adapter_nsrst_delay_command)
{
if (CMD_ARGC > 1)
return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1302,7 +1302,7 @@ COMMAND_HANDLER(handle_jtag_nsrst_delay_command)
jtag_set_nsrst_delay(delay);
}
- command_print(CMD_CTX, "jtag_nsrst_delay: %u", jtag_get_nsrst_delay());
+ command_print(CMD_CTX, "adapter_nsrst_delay: %u", jtag_get_nsrst_delay());
return ERROR_OK;
}
@@ -1619,6 +1619,13 @@ static const struct command_registration interface_command_handlers[] = {
.usage = "[khz]",
},
{
+ .name = "adapter_nsrst_delay",
+ .handler = handle_adapter_nsrst_delay_command,
+ .mode = COMMAND_ANY,
+ .help = "delay after deasserting srst in ms",
+ .usage = "[milliseconds]",
+ },
+ {
.name = "interface",
.handler = handle_interface_command,
.mode = COMMAND_CONFIG,
@@ -1667,13 +1674,6 @@ static const struct command_registration jtag_command_handlers[] = {
"[srst_push_pull|srst_open_drain]",
},
{
- .name = "jtag_nsrst_delay",
- .handler = handle_jtag_nsrst_delay_command,
- .mode = COMMAND_ANY,
- .help = "delay after deasserting srst in ms",
- .usage = "[milliseconds]",
- },
- {
.name = "jtag_ntrst_delay",
.handler = handle_jtag_ntrst_delay_command,
.mode = COMMAND_ANY,
diff --git a/tcl/board/at91sam9g20-ek.cfg b/tcl/board/at91sam9g20-ek.cfg
index f24f1a13..c3eb952c 100644
--- a/tcl/board/at91sam9g20-ek.cfg
+++ b/tcl/board/at91sam9g20-ek.cfg
@@ -32,7 +32,7 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CP
# affected by the board and type of JTAG adapter. A value of 200 ms seems
# to work reliably for the configuration listed in the file header above.
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
# Set fallback clock to 1/6 of worst-case clock speed (which would be the 32.768 kHz slow clock).
diff --git a/tcl/board/crossbow_tech_imote2.cfg b/tcl/board/crossbow_tech_imote2.cfg
index 88d4aa72..002b5372 100644
--- a/tcl/board/crossbow_tech_imote2.cfg
+++ b/tcl/board/crossbow_tech_imote2.cfg
@@ -4,7 +4,7 @@ set CHIPNAME imote2
source [find target/pxa270.cfg]
# longer-than-normal reset delay
-jtag_nsrst_delay 800
+adapter_nsrst_delay 800
reset_config trst_and_srst separate
diff --git a/tcl/board/csb732.cfg b/tcl/board/csb732.cfg
index cad38e2e..4d6f0e48 100644
--- a/tcl/board/csb732.cfg
+++ b/tcl/board/csb732.cfg
@@ -3,7 +3,7 @@ source [find target/imx35.cfg]
# Determined by trial and error
reset_config trst_and_srst combined
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
$_TARGETNAME configure -event gdb-attach { reset init }
diff --git a/tcl/board/digi_connectcore_wi-9c.cfg b/tcl/board/digi_connectcore_wi-9c.cfg
index 2d823766..ad40d537 100644
--- a/tcl/board/digi_connectcore_wi-9c.cfg
+++ b/tcl/board/digi_connectcore_wi-9c.cfg
@@ -36,7 +36,7 @@ if { [info exists CPUTAPID ] } {
set _TARGETNAME $_CHIPNAME.cpu
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 0
diff --git a/tcl/board/ek-lm3s1968.cfg b/tcl/board/ek-lm3s1968.cfg
index 6ce7f7fa..28066f3f 100644
--- a/tcl/board/ek-lm3s1968.cfg
+++ b/tcl/board/ek-lm3s1968.cfg
@@ -16,7 +16,7 @@ source [find target/lm3s1968.cfg]
# jtag speed
adapter_khz 3000
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
#LM3S1968 Evaluation Board has only srst
reset_config srst_only
diff --git a/tcl/board/ek-lm3s811.cfg b/tcl/board/ek-lm3s811.cfg
index 078cae1f..7d3f2ce3 100644
--- a/tcl/board/ek-lm3s811.cfg
+++ b/tcl/board/ek-lm3s811.cfg
@@ -12,7 +12,7 @@ source [find target/lm3s811.cfg]
# jtag speed
adapter_khz 500
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
#LM3S811 Evaluation Board has only srst
reset_config srst_only
diff --git a/tcl/board/ek-lm3s9b9x.cfg b/tcl/board/ek-lm3s9b9x.cfg
index b8be88b8..fb6272af 100644
--- a/tcl/board/ek-lm3s9b9x.cfg
+++ b/tcl/board/ek-lm3s9b9x.cfg
@@ -11,7 +11,7 @@ source [find target/lm3s9b9x.cfg]
# jtag speed
adapter_khz 500
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
#LM3S9B9x Evaluation Board has only srst
reset_config srst_only
diff --git a/tcl/board/ethernut3.cfg b/tcl/board/ethernut3.cfg
index 359cb0bf..34e9b72d 100644
--- a/tcl/board/ethernut3.cfg
+++ b/tcl/board/ethernut3.cfg
@@ -20,7 +20,7 @@ flash bank $_FLASHNAME cfi 0x10000000 0x400000 2 2 $_TARGETNAME
# Micrel MIC2775-29YM5 Supervisor
# Reset output will remain active for 280ms (maximum)
#
-jtag_nsrst_delay 300
+adapter_nsrst_delay 300
jtag_ntrst_delay 300
diff --git a/tcl/board/hitex_lpc2929.cfg b/tcl/board/hitex_lpc2929.cfg
index 35cc7d0b..d9ca1109 100644
--- a/tcl/board/hitex_lpc2929.cfg
+++ b/tcl/board/hitex_lpc2929.cfg
@@ -2,7 +2,7 @@
# http://www.hitex.com/
# Delays on reset lines
-jtag_nsrst_delay 50
+adapter_nsrst_delay 50
jtag_ntrst_delay 1
# Maximum of 1/8 of clock frequency (XTAL = 16 MHz).
diff --git a/tcl/board/hitex_str9-comstick.cfg b/tcl/board/hitex_str9-comstick.cfg
index ade24f62..4d1bb2e4 100644
--- a/tcl/board/hitex_str9-comstick.cfg
+++ b/tcl/board/hitex_str9-comstick.cfg
@@ -7,7 +7,7 @@ source [find interface/hitex_str9-comstick.cfg]
# set jtag speed
adapter_khz 3000
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
#use combined on interfaces or targets that can't set TRST/SRST separately
reset_config trst_and_srst
diff --git a/tcl/board/lubbock.cfg b/tcl/board/lubbock.cfg
index 32af386e..095c60aa 100644
--- a/tcl/board/lubbock.cfg
+++ b/tcl/board/lubbock.cfg
@@ -4,7 +4,7 @@
source [find target/pxa255.cfg]
-jtag_nsrst_delay 250
+adapter_nsrst_delay 250
jtag_ntrst_delay 250
# NOTE: until after pinmux and such are set up, only CS0 is
diff --git a/tcl/board/mini2440.cfg b/tcl/board/mini2440.cfg
index b053c225..16889654 100644
--- a/tcl/board/mini2440.cfg
+++ b/tcl/board/mini2440.cfg
@@ -112,7 +112,7 @@ target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME
$_TARGETNAME configure -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 1
#reset configuration
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
reset_config trst_and_srst
@@ -141,7 +141,7 @@ reset_config trst_and_srst
nand device s3c2440 0
- jtag_nsrst_delay 100
+ adapter_nsrst_delay 100
jtag_ntrst_delay 100
reset_config trst_and_srst
init
diff --git a/tcl/board/phytec_lpc3250.cfg b/tcl/board/phytec_lpc3250.cfg
index 51622ef1..6a7e8e92 100644
--- a/tcl/board/phytec_lpc3250.cfg
+++ b/tcl/board/phytec_lpc3250.cfg
@@ -1,6 +1,6 @@
source [find target/lpc3250.cfg]
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 1
adapter_khz 200
reset_config trst_and_srst separate
diff --git a/tcl/board/pxa255_sst.cfg b/tcl/board/pxa255_sst.cfg
index ce903871..44f34ca1 100644
--- a/tcl/board/pxa255_sst.cfg
+++ b/tcl/board/pxa255_sst.cfg
@@ -93,7 +93,7 @@ $_TARGETNAME configure -event reset-init {pxa255_sst_init}
reset_config trst_and_srst
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
#xscale debug_handler 0 0xFFFF0800 # debug handler base address
diff --git a/tcl/board/telo.cfg b/tcl/board/telo.cfg
index cb4bc2a3..80040b14 100644
--- a/tcl/board/telo.cfg
+++ b/tcl/board/telo.cfg
@@ -16,7 +16,7 @@ source [find target/c100helper.tcl]
jtag_nsrst_assert_width 100
jtag_ntrst_assert_width 100
# don't talk to JTAG after reset for: [ms]
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
reset_config trst_and_srst separate
diff --git a/tcl/interface/calao-usb-a9260.cfg b/tcl/interface/calao-usb-a9260.cfg
index a9d7dec4..5fae2f3b 100644
--- a/tcl/interface/calao-usb-a9260.cfg
+++ b/tcl/interface/calao-usb-a9260.cfg
@@ -6,6 +6,6 @@
# See calao-usb-a9260-c01.cfg and calao-usb-a9260-c02.cfg.
#
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
diff --git a/tcl/target/aduc702x.cfg b/tcl/target/aduc702x.cfg
index 50b2a0de..d58b723a 100644
--- a/tcl/target/aduc702x.cfg
+++ b/tcl/target/aduc702x.cfg
@@ -17,7 +17,7 @@ if { [info exists CPUTAPID] } {
set _CPUTAPID 0x3f0f0f0f
}
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
## JTAG scan chain
diff --git a/tcl/target/ar71xx.cfg b/tcl/target/ar71xx.cfg
index 20383315..126efe4d 100644
--- a/tcl/target/ar71xx.cfg
+++ b/tcl/target/ar71xx.cfg
@@ -1,7 +1,7 @@
# Atheros AR71xx MIPS 24Kc SoC.
# tested on PB44 refererence board
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
reset_config trst_and_srst
diff --git a/tcl/target/at91sam9260.cfg b/tcl/target/at91sam9260.cfg
index df08d10d..86258c62 100644
--- a/tcl/target/at91sam9260.cfg
+++ b/tcl/target/at91sam9260.cfg
@@ -26,7 +26,7 @@ reset_config trst_and_srst separate trst_push_pull srst_open_drain
#
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-jtag_nsrst_delay 300
+adapter_nsrst_delay 300
jtag_ntrst_delay 200
jtag_rclk 3
diff --git a/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg b/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg
index 03595404..034a3489 100644
--- a/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg
+++ b/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg
@@ -30,7 +30,7 @@ if { [info exists CPUTAPID ] } {
reset_config trst_and_srst
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
diff --git a/tcl/target/at91sam9rl.cfg b/tcl/target/at91sam9rl.cfg
index 6db18261..5ee5c49e 100644
--- a/tcl/target/at91sam9rl.cfg
+++ b/tcl/target/at91sam9rl.cfg
@@ -26,7 +26,7 @@ reset_config trst_and_srst separate trst_push_pull srst_open_drain
#
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-jtag_nsrst_delay 300
+adapter_nsrst_delay 300
jtag_ntrst_delay 200
jtag_rclk 3
diff --git a/tcl/target/dragonite.cfg b/tcl/target/dragonite.cfg
index d2e7e328..7e85624c 100644
--- a/tcl/target/dragonite.cfg
+++ b/tcl/target/dragonite.cfg
@@ -26,6 +26,6 @@ set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME dragonite -endian $_ENDIAN -chain-position $_TARGETNAME
reset_config trst_and_srst
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
diff --git a/tcl/target/epc9301.cfg b/tcl/target/epc9301.cfg
index 7e4599da..d2dc7ecb 100644
--- a/tcl/target/epc9301.cfg
+++ b/tcl/target/epc9301.cfg
@@ -20,7 +20,7 @@ if { [info exists CPUTAPID ] } {
}
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
set _TARGETNAME $_CHIPNAME.cpu
diff --git a/tcl/target/feroceon.cfg b/tcl/target/feroceon.cfg
index b7077706..e90165b4 100644
--- a/tcl/target/feroceon.cfg
+++ b/tcl/target/feroceon.cfg
@@ -26,6 +26,6 @@ set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME feroceon -endian $_ENDIAN -chain-position $_TARGETNAME
reset_config trst_and_srst
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
diff --git a/tcl/target/imx31.cfg b/tcl/target/imx31.cfg
index 46b4f94e..3af6383c 100644
--- a/tcl/target/imx31.cfg
+++ b/tcl/target/imx31.cfg
@@ -3,7 +3,7 @@
reset_config trst_and_srst srst_gates_jtag
-jtag_nsrst_delay 5
+adapter_nsrst_delay 5
if { [info exists CHIPNAME] } {
set _CHIPNAME $CHIPNAME
diff --git a/tcl/target/lm3s6965.cfg b/tcl/target/lm3s6965.cfg
index c6e623ee..137cba9d 100644
--- a/tcl/target/lm3s6965.cfg
+++ b/tcl/target/lm3s6965.cfg
@@ -15,7 +15,7 @@ if { [info exists CPUTAPID ] } {
# jtag speed
adapter_khz 500
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
#LM3S6965 Evaluation Board has only srst
diff --git a/tcl/target/lpc1768.cfg b/tcl/target/lpc1768.cfg
index 182fb89d..82a097f4 100644
--- a/tcl/target/lpc1768.cfg
+++ b/tcl/target/lpc1768.cfg
@@ -25,7 +25,7 @@ if { [info exists CPUTAPID ] } {
}
#delays on reset lines
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
# LPC2000 & LPC1700 -> SRST causes TRST
diff --git a/tcl/target/lpc2103.cfg b/tcl/target/lpc2103.cfg
index 13535f59..2ebe91ae 100644
--- a/tcl/target/lpc2103.cfg
+++ b/tcl/target/lpc2103.cfg
@@ -22,7 +22,7 @@ if { [info exists CPUTAPID ] } {
reset_config trst_and_srst srst_pulls_trst
# reset delays
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
diff --git a/tcl/target/lpc2124.cfg b/tcl/target/lpc2124.cfg
index ce55952a..1b60c155 100644
--- a/tcl/target/lpc2124.cfg
+++ b/tcl/target/lpc2124.cfg
@@ -24,7 +24,7 @@ if { [info exists CPUTAPID ] } {
reset_config trst_and_srst srst_pulls_trst
# reset delays
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
adapter_khz 1000
diff --git a/tcl/target/lpc2129.cfg b/tcl/target/lpc2129.cfg
index 287fa5d0..5b2a2f74 100644
--- a/tcl/target/lpc2129.cfg
+++ b/tcl/target/lpc2129.cfg
@@ -25,7 +25,7 @@ if { [info exists CPUTAPID ] } {
reset_config trst_and_srst srst_pulls_trst
# reset delays
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
#jtag scan chain
diff --git a/tcl/target/lpc2148.cfg b/tcl/target/lpc2148.cfg
index cf6287c6..502a3550 100644
--- a/tcl/target/lpc2148.cfg
+++ b/tcl/target/lpc2148.cfg
@@ -21,7 +21,7 @@ if { [info exists CPUTAPID ] } {
set _CPUTAPID 0x4f1f0f0f
}
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
# NOTE!!! LPCs need reset pulled while RTCK is low. 0 to activate
diff --git a/tcl/target/lpc2294.cfg b/tcl/target/lpc2294.cfg
index d43d740b..9ac3c6c1 100644
--- a/tcl/target/lpc2294.cfg
+++ b/tcl/target/lpc2294.cfg
@@ -17,7 +17,7 @@ if { [info exists CPUTAPID ] } {
set _CPUTAPID 0xffffffff
}
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
#use combined on interfaces or targets that can't set TRST/SRST separately
diff --git a/tcl/target/lpc2378.cfg b/tcl/target/lpc2378.cfg
index 7eb0dabb..1a42e070 100644
--- a/tcl/target/lpc2378.cfg
+++ b/tcl/target/lpc2378.cfg
@@ -19,7 +19,7 @@ if { [info exists CPUTAPID ] } {
}
#delays on reset lines
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
# LPC2000 -> SRST causes TRST
diff --git a/tcl/target/lpc2478.cfg b/tcl/target/lpc2478.cfg
index d0bff1ae..950ef63f 100644
--- a/tcl/target/lpc2478.cfg
+++ b/tcl/target/lpc2478.cfg
@@ -19,7 +19,7 @@ if { [info exists CPUTAPID ] } {
}
#delays on reset lines
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
# LPC2000 -> SRST causes TRST
diff --git a/tcl/target/mega128.cfg b/tcl/target/mega128.cfg
index 697ec45b..bb7cdeef 100644
--- a/tcl/target/mega128.cfg
+++ b/tcl/target/mega128.cfg
@@ -7,7 +7,7 @@
adapter_khz 4500
reset_config srst_only
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
#jtag scan chain
if { [info exists CPUTAPID ] } {
diff --git a/tcl/target/netx500.cfg b/tcl/target/netx500.cfg
index 90315afd..04a267ba 100644
--- a/tcl/target/netx500.cfg
+++ b/tcl/target/netx500.cfg
@@ -20,7 +20,7 @@ if { [info exists CPUTAPID ] } {
# FIXME most reset config belongs in board code
reset_config trst_and_srst
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
# jtag scan chain
diff --git a/tcl/target/omap5912.cfg b/tcl/target/omap5912.cfg
index d825df7f..ed64f523 100644
--- a/tcl/target/omap5912.cfg
+++ b/tcl/target/omap5912.cfg
@@ -14,7 +14,7 @@ if { [info exists CPUTAPID ] } {
set _CPUTAPID 0x0692602f
}
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
# NOTE: presumes irlen 38 is the C55x DSP, matching BSDL for
# its standalone siblings (like TMS320VC5502) of the same era
diff --git a/tcl/target/pic32mx.cfg b/tcl/target/pic32mx.cfg
index d77c3a8c..8c9a93d3 100644
--- a/tcl/target/pic32mx.cfg
+++ b/tcl/target/pic32mx.cfg
@@ -26,7 +26,7 @@ if { [info exists WORKAREASIZE] } {
}
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
#use combined on interfaces or targets that can't set TRST/SRST separately
diff --git a/tcl/target/pxa270.cfg b/tcl/target/pxa270.cfg
index 6ca057ca..7aaef8c7 100644
--- a/tcl/target/pxa270.cfg
+++ b/tcl/target/pxa270.cfg
@@ -28,9 +28,9 @@ if { [info exists CPUTAPID2 ] } {
}
-# set jtag_nsrst_delay to the delay introduced by your reset circuit
+# set adapter_nsrst_delay to the delay introduced by your reset circuit
# the rest of the needed delays are built into the openocd program
-jtag_nsrst_delay 260
+adapter_nsrst_delay 260
# set the jtag_ntrst_delay to the delay introduced by a reset circuit
# the rest of the needed delays are built into the openocd program
jtag_ntrst_delay 250
diff --git a/tcl/target/pxa3xx.cfg b/tcl/target/pxa3xx.cfg
index 5d649865..62c325b7 100644
--- a/tcl/target/pxa3xx.cfg
+++ b/tcl/target/pxa3xx.cfg
@@ -59,9 +59,9 @@ if { [info exists CPUTAPID_PXA32X_C0 ] } {
set _CPUTAPID_PXA32X_C0 0x7E642013
}
-# set jtag_nsrst_delay to the delay introduced by your reset circuit
+# set adapter_nsrst_delay to the delay introduced by your reset circuit
# the rest of the needed delays are built into the openocd program
-jtag_nsrst_delay 260
+adapter_nsrst_delay 260
# set the jtag_ntrst_delay to the delay introduced by a reset circuit
# the rest of the needed delays are built into the openocd program
diff --git a/tcl/target/samsung_s3c6410.cfg b/tcl/target/samsung_s3c6410.cfg
index 91371991..f9738c23 100644
--- a/tcl/target/samsung_s3c6410.cfg
+++ b/tcl/target/samsung_s3c6410.cfg
@@ -42,7 +42,7 @@ jtag newtap $_CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id
set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm11 -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm1176
-jtag_nsrst_delay 500
+adapter_nsrst_delay 500
jtag_ntrst_delay 500
#reset configuration
diff --git a/tcl/target/smp8634.cfg b/tcl/target/smp8634.cfg
index b6b037aa..4f3959d5 100644
--- a/tcl/target/smp8634.cfg
+++ b/tcl/target/smp8634.cfg
@@ -19,7 +19,7 @@ if { [info exists CPUTAPID ] } {
set _CPUTAPID 0x08630001
}
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
reset_config trst_and_srst separate
diff --git a/tcl/target/stm32.cfg b/tcl/target/stm32.cfg
index 29c9f7ff..a13dc314 100644
--- a/tcl/target/stm32.cfg
+++ b/tcl/target/stm32.cfg
@@ -23,7 +23,7 @@ if { [info exists WORKAREASIZE] } {
# JTAG speed should be <= F_CPU/6. F_CPU after reset is 8MHz, so use F_JTAG = 1MHz
adapter_khz 1000
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
#jtag scan chain
diff --git a/tcl/target/str730.cfg b/tcl/target/str730.cfg
index 3a84897c..a1491ff1 100644
--- a/tcl/target/str730.cfg
+++ b/tcl/target/str730.cfg
@@ -27,7 +27,7 @@ reset_config trst_and_srst srst_pulls_trst
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0x0f -expected-id $_CPUTAPID
#jtag nTRST and nSRST delay
-jtag_nsrst_delay 500
+adapter_nsrst_delay 500
jtag_ntrst_delay 500
set _TARGETNAME $_CHIPNAME.cpu
diff --git a/tcl/target/str750.cfg b/tcl/target/str750.cfg
index c2fb7869..8a642261 100644
--- a/tcl/target/str750.cfg
+++ b/tcl/target/str750.cfg
@@ -29,7 +29,7 @@ reset_config trst_and_srst srst_pulls_trst
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0x0f -expected-id $_CPUTAPID
#jtag nTRST and nSRST delay
-jtag_nsrst_delay 500
+adapter_nsrst_delay 500
jtag_ntrst_delay 500
set _TARGETNAME $_CHIPNAME.cpu
diff --git a/tcl/target/str912.cfg b/tcl/target/str912.cfg
index 2defe9fd..6f2981a1 100644
--- a/tcl/target/str912.cfg
+++ b/tcl/target/str912.cfg
@@ -15,7 +15,7 @@ if { [info exists ENDIAN] } {
# jtag speed. We need to stick to 16kHz until we've finished reset.
jtag_rclk 16
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
#use combined on interfaces or targets that can't set TRST/SRST separately
diff --git a/tcl/target/telo.cfg b/tcl/target/telo.cfg
index 99b9cd69..40674b9d 100644
--- a/tcl/target/telo.cfg
+++ b/tcl/target/telo.cfg
@@ -16,7 +16,7 @@ source [find target/c100helper.tcl]
jtag_nsrst_assert_width 100
jtag_ntrst_assert_width 100
# don't talk to JTAG after reset for: [ms]
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
reset_config trst_and_srst separate
diff --git a/tcl/target/tmpa900.cfg b/tcl/target/tmpa900.cfg
index 329e03ca..a5513915 100644
--- a/tcl/target/tmpa900.cfg
+++ b/tcl/target/tmpa900.cfg
@@ -32,7 +32,7 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CP
#use combined on interfaces or targets that can't set TRST/SRST separately
reset_config trst_and_srst
-jtag_nsrst_delay 20
+adapter_nsrst_delay 20
jtag_ntrst_delay 20
######################
diff --git a/tcl/target/tmpa910.cfg b/tcl/target/tmpa910.cfg
index 29d2d6ef..fa6f87b0 100644
--- a/tcl/target/tmpa910.cfg
+++ b/tcl/target/tmpa910.cfg
@@ -32,7 +32,7 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CP
#use combined on interfaces or targets that can't set TRST/SRST separately
reset_config trst_and_srst
-jtag_nsrst_delay 20
+adapter_nsrst_delay 20
jtag_ntrst_delay 20
######################
diff --git a/tcl/target/xba_revA3.cfg b/tcl/target/xba_revA3.cfg
index fb02c687..8ff5be93 100644
--- a/tcl/target/xba_revA3.cfg
+++ b/tcl/target/xba_revA3.cfg
@@ -22,7 +22,7 @@ if { [info exists CPUTAPID ] } {
reset_config trst_and_srst separate
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
jtag_ntrst_delay 100
#jtag scan chain
diff --git a/tcl/test/syntax1.cfg b/tcl/test/syntax1.cfg
index c3d8ed90..79d53848 100644
--- a/tcl/test/syntax1.cfg
+++ b/tcl/test/syntax1.cfg
@@ -1,4 +1,4 @@
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
jtag_ntrst_delay 200
#use combined on interfaces or targets that can't set TRST/SRST separately