From b559b273b526b3077b3ca219eecc8df9f86efac0 Mon Sep 17 00:00:00 2001
From: David Brownell <dbrownell@users.sourceforge.net>
Date: Mon, 15 Mar 2010 08:41:30 -0700
Subject: 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>
---
tcl/target/aduc702x.cfg | 2 +-
tcl/target/ar71xx.cfg | 2 +-
tcl/target/at91sam9260.cfg | 2 +-
tcl/target/at91sam9260_ext_RAM_ext_flash.cfg | 2 +-
tcl/target/at91sam9rl.cfg | 2 +-
tcl/target/dragonite.cfg | 2 +-
tcl/target/epc9301.cfg | 2 +-
tcl/target/feroceon.cfg | 2 +-
tcl/target/imx31.cfg | 2 +-
tcl/target/lm3s6965.cfg | 2 +-
tcl/target/lpc1768.cfg | 2 +-
tcl/target/lpc2103.cfg | 2 +-
tcl/target/lpc2124.cfg | 2 +-
tcl/target/lpc2129.cfg | 2 +-
tcl/target/lpc2148.cfg | 2 +-
tcl/target/lpc2294.cfg | 2 +-
tcl/target/lpc2378.cfg | 2 +-
tcl/target/lpc2478.cfg | 2 +-
tcl/target/mega128.cfg | 2 +-
tcl/target/netx500.cfg | 2 +-
tcl/target/omap5912.cfg | 2 +-
tcl/target/pic32mx.cfg | 2 +-
tcl/target/pxa270.cfg | 4 ++--
tcl/target/pxa3xx.cfg | 4 ++--
tcl/target/samsung_s3c6410.cfg | 2 +-
tcl/target/smp8634.cfg | 2 +-
tcl/target/stm32.cfg | 2 +-
tcl/target/str730.cfg | 2 +-
tcl/target/str750.cfg | 2 +-
tcl/target/str912.cfg | 2 +-
tcl/target/telo.cfg | 2 +-
tcl/target/tmpa900.cfg | 2 +-
tcl/target/tmpa910.cfg | 2 +-
tcl/target/xba_revA3.cfg | 2 +-
34 files changed, 36 insertions(+), 36 deletions(-)
(limited to 'tcl/target')
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
--
cgit v1.2.3