aboutsummaryrefslogtreecommitdiff
path: root/tcl
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2019-08-14 14:53:24 +0200
committerTomas Vanek <vanekt@fbl.cz>2020-01-02 21:24:45 +0000
commit5d08bcb715599466dc88d1cdf5b599a7bba1be6a (patch)
tree088b0bfa0b97681308eff91e35c532a61397b41e /tcl
parentc07b774e8f490984f749c2693f83483af7c0d098 (diff)
tcl: update scripts after "jtag_reset" got deprecated
Avoid annoying "deprecated" messages in the scripts distributed with OpenOCD code. Change-Id: I82d27cd420db30f0653efbd286a627ef56a8c1fd Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: http://openocd.zylin.com/5287 Tested-by: jenkins Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Diffstat (limited to 'tcl')
-rw-r--r--tcl/board/openrd.cfg4
-rw-r--r--tcl/board/renesas_gen2_common.cfg4
-rw-r--r--tcl/board/renesas_salvator-xs.cfg4
-rw-r--r--tcl/board/sheevaplug.cfg4
-rw-r--r--tcl/target/pxa255.cfg6
-rw-r--r--tcl/test/syntax1.cfg4
6 files changed, 13 insertions, 13 deletions
diff --git a/tcl/board/openrd.cfg b/tcl/board/openrd.cfg
index db3cb032..7659b074 100644
--- a/tcl/board/openrd.cfg
+++ b/tcl/board/openrd.cfg
@@ -25,10 +25,10 @@ proc openrd_init { } {
# possible that initial tap examination failed. So let's
# re-examine the target again here when nSRST is asserted which
# should then succeed.
- jtag_reset 0 1
+ adapter assert srst
feroceon.cpu arp_examine
halt 0
- jtag_reset 0 0
+ adapter deassert srst
wait_halt
arm mcr 15 0 0 1 0 0x00052078
diff --git a/tcl/board/renesas_gen2_common.cfg b/tcl/board/renesas_gen2_common.cfg
index 00fa777c..3e4579b9 100644
--- a/tcl/board/renesas_gen2_common.cfg
+++ b/tcl/board/renesas_gen2_common.cfg
@@ -4,10 +4,10 @@ reset_config trst_and_srst srst_nogate
proc init_reset {mode} {
# Assert both resets: equivalent to a power-on reset
- jtag_reset 1 1
+ adapter assert trst assert srst
# Deassert TRST to begin TAP communication
- jtag_reset 0 1
+ adapter deassert trst assert srst
# TAP should now be responsive, validate the scan-chain
jtag arp_init
diff --git a/tcl/board/renesas_salvator-xs.cfg b/tcl/board/renesas_salvator-xs.cfg
index 1558a527..e6f4da33 100644
--- a/tcl/board/renesas_salvator-xs.cfg
+++ b/tcl/board/renesas_salvator-xs.cfg
@@ -12,10 +12,10 @@ reset_config trst_and_srst srst_nogate
proc init_reset {mode} {
# Assert both resets: equivalent to a power-on reset
- jtag_reset 1 1
+ adapter assert trst assert srst
# Deassert TRST to begin TAP communication
- jtag_reset 0 1
+ adapter deassert trst assert srst
# TAP should now be responsive, validate the scan-chain
jtag arp_init
diff --git a/tcl/board/sheevaplug.cfg b/tcl/board/sheevaplug.cfg
index ff333ca7..0d21be37 100644
--- a/tcl/board/sheevaplug.cfg
+++ b/tcl/board/sheevaplug.cfg
@@ -25,10 +25,10 @@ proc sheevaplug_init { } {
# possible that initial tap examination failed. So let's
# re-examine the target again here when nSRST is asserted which
# should then succeed.
- jtag_reset 0 1
+ adapter assert srst
feroceon.cpu arp_examine
halt 0
- jtag_reset 0 0
+ adapter deassert srst
wait_halt
arm mcr 15 0 0 1 0 0x00052078
diff --git a/tcl/target/pxa255.cfg b/tcl/target/pxa255.cfg
index 38624259..4b222de0 100644
--- a/tcl/target/pxa255.cfg
+++ b/tcl/target/pxa255.cfg
@@ -38,11 +38,11 @@ reset_config trst_and_srst separate srst_nogate
# reset processing that works with PXA
proc init_reset {mode} {
# assert both resets; equivalent to power-on reset
- jtag_reset 1 1
+ adapter assert trst assert srst
# drop TRST after at least 32 cycles
sleep 1
- jtag_reset 0 1
+ adapter deassert trst assert srst
# minimum 32 TCK cycles to wake up the controller
runtest 50
@@ -51,7 +51,7 @@ proc init_reset {mode} {
jtag arp_init
# ... and take it out of reset
- jtag_reset 0 0
+ adapter deassert trst deassert srst
}
proc jtag_init {} {
diff --git a/tcl/test/syntax1.cfg b/tcl/test/syntax1.cfg
index 79d53848..5d013f07 100644
--- a/tcl/test/syntax1.cfg
+++ b/tcl/test/syntax1.cfg
@@ -5,8 +5,8 @@ jtag_ntrst_delay 200
reset_config trst_and_srst srst_pulls_trst
#LPCs need reset pulled while RTCK is low. 0 to activate JTAG, power-on reset is not enough
-jtag_reset 1 1
-jtag_reset 0 0
+adapter assert trst assert srst
+adapter deassert trst deassert srst
#jtag scan chain
#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)