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>

diff --git a/tcl/board/openrd.cfg b/tcl/board/openrd.cfg
index db3cb0326e7055c23c0ce5759b2cb29731d8b0ec..7659b07494076affbb7d2b41fcf4205e62a9a0cf 100644 (file)
--- 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 00fa777c590dc66de2fecf4ebe0caf359f5128c5..3e4579b91de27b13b4f78d92122ce314ce0abc82 100644 (file)
--- 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 1558a5274a186feb9d17db3c6b741649a2ec0e8c..e6f4da337b9362e640bdf560b4a6d9e9a3840714 100644 (file)
--- 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 ff333ca77f9fb30f02cf3649b5913955b915af7c..0d21be37c4010c4459d20c7ddec545cb53e9dbfe 100644 (file)
--- 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 386242597cefd9b3a8ae3d59a455c67170458a62..4b222de081e56d9b21b2f7354b388972f86633d8 100644 (file)
--- 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 79d53848025dfc134b7cd1824344aa76920077aa..5d013f073a1eb538e3bbeed4f7f5eb7d23e29330 100644 (file)
--- 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)