This is an automated email from Gerrit.
Antonio Borneo (borneo.anto...@gmail.com) just uploaded a new patch set to
Gerrit, which you can find at http://openocd.zylin.com/5268
-- gerrit
commit 1fd5f7dc1eeaa7b4efcea3d42d2868899be67e6c
Author: Antonio Borneo <borneo.anto...@gmail.com>
Date: Wed Jul 24 15:15:32 2019 +0200
tcl: replace "combined" with "trst_srst_tied" in reset_config
After changing the syntax of command reset_config, update all the
cases where the removed "combined" option was used.
Change-Id: I9ad29c309c84c3d4bb7768721538d355821a080d
Signed-off-by: Antonio Borneo <borneo.anto...@gmail.com>
diff --git a/tcl/board/at91cap7a-stk-sdram.cfg
b/tcl/board/at91cap7a-stk-sdram.cfg
index 9bc02e8..67ab432 100644
--- a/tcl/board/at91cap7a-stk-sdram.cfg
+++ b/tcl/board/at91cap7a-stk-sdram.cfg
@@ -1,6 +1,6 @@
# http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4394
#
-# use combined on interfaces or targets that can't set TRST/SRST separately
+# use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config trst_and_srst srst_pulls_trst
if { [info exists CHIPNAME] } {
diff --git a/tcl/board/csb732.cfg b/tcl/board/csb732.cfg
index 4d6f0e4..7a73df3 100644
--- a/tcl/board/csb732.cfg
+++ b/tcl/board/csb732.cfg
@@ -2,7 +2,7 @@
source [find target/imx35.cfg]
# Determined by trial and error
-reset_config trst_and_srst combined
+reset_config trst_and_srst trst_srst_tied
adapter_nsrst_delay 200
jtag_ntrst_delay 200
diff --git a/tcl/board/hitex_str9-comstick.cfg
b/tcl/board/hitex_str9-comstick.cfg
index be15331..0e834cd 100644
--- a/tcl/board/hitex_str9-comstick.cfg
+++ b/tcl/board/hitex_str9-comstick.cfg
@@ -9,7 +9,7 @@ adapter_khz 3000
adapter_nsrst_delay 100
jtag_ntrst_delay 100
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config trst_and_srst
#
diff --git a/tcl/target/at91sam7se512.cfg b/tcl/target/at91sam7se512.cfg
index ab09701..6861389 100644
--- a/tcl/target/at91sam7se512.cfg
+++ b/tcl/target/at91sam7se512.cfg
@@ -21,7 +21,7 @@ if { [info exists CPUTAPID] } {
set _CPUTAPID 0xffffffff
}
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config srst_only srst_pulls_trst
#jtag scan chain
diff --git a/tcl/target/at91sam7sx.cfg b/tcl/target/at91sam7sx.cfg
index a563ac0..d16f332 100644
--- a/tcl/target/at91sam7sx.cfg
+++ b/tcl/target/at91sam7sx.cfg
@@ -1,4 +1,4 @@
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config srst_only srst_pulls_trst
if { [info exists CHIPNAME] } {
diff --git a/tcl/target/at91sam7x256.cfg b/tcl/target/at91sam7x256.cfg
index e1a2435..73b9079 100644
--- a/tcl/target/at91sam7x256.cfg
+++ b/tcl/target/at91sam7x256.cfg
@@ -1,4 +1,4 @@
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config srst_only srst_pulls_trst
if { [info exists CHIPNAME] } {
diff --git a/tcl/target/at91sam7x512.cfg b/tcl/target/at91sam7x512.cfg
index 6910e85..9dc653c 100644
--- a/tcl/target/at91sam7x512.cfg
+++ b/tcl/target/at91sam7x512.cfg
@@ -1,4 +1,4 @@
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config srst_only srst_pulls_trst
if { [info exists CHIPNAME] } {
diff --git a/tcl/target/imx21.cfg b/tcl/target/imx21.cfg
index 2d9ce39..bc21485 100644
--- a/tcl/target/imx21.cfg
+++ b/tcl/target/imx21.cfg
@@ -1,4 +1,4 @@
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
#
# Hmmm.... should srst_pulls_trst be used here like i.MX27???
reset_config trst_and_srst
diff --git a/tcl/target/samsung_s3c2410.cfg b/tcl/target/samsung_s3c2410.cfg
index 017c104..9a97a30 100644
--- a/tcl/target/samsung_s3c2410.cfg
+++ b/tcl/target/samsung_s3c2410.cfg
@@ -20,7 +20,7 @@ if { [info exists CPUTAPID] } {
set _CPUTAPID 0xffffffff
}
-#use combined on interfaces or targets that cannot set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that cannot set TRST/SRST
separately
reset_config trst_and_srst
#jtag scan chain
diff --git a/tcl/target/str710.cfg b/tcl/target/str710.cfg
index d26a8b1..0f6206c 100644
--- a/tcl/target/str710.cfg
+++ b/tcl/target/str710.cfg
@@ -19,7 +19,7 @@ if { [info exists CPUTAPID] } {
set _CPUTAPID 0x3f0f0f0f
}
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config trst_and_srst srst_pulls_trst
#jtag scan chain
diff --git a/tcl/target/str730.cfg b/tcl/target/str730.cfg
index 48d3134..e89f02d 100644
--- a/tcl/target/str730.cfg
+++ b/tcl/target/str730.cfg
@@ -20,7 +20,7 @@ if { [info exists CPUTAPID] } {
set _CPUTAPID 0x3f0f0f0f
}
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config trst_and_srst srst_pulls_trst
#jtag scan chain
diff --git a/tcl/target/str750.cfg b/tcl/target/str750.cfg
index ef6e795..e5a9bee 100644
--- a/tcl/target/str750.cfg
+++ b/tcl/target/str750.cfg
@@ -21,7 +21,7 @@ if { [info exists CPUTAPID] } {
# jtag speed
adapter_khz 10
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config trst_and_srst srst_pulls_trst
#jtag scan chain
diff --git a/tcl/target/str912.cfg b/tcl/target/str912.cfg
index 36c0b2a..6965630 100644
--- a/tcl/target/str912.cfg
+++ b/tcl/target/str912.cfg
@@ -18,7 +18,7 @@ adapter_khz 16
adapter_nsrst_delay 100
jtag_ntrst_delay 100
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config trst_and_srst
if { [info exists FLASHTAPID] } {
diff --git a/tcl/target/tmpa900.cfg b/tcl/target/tmpa900.cfg
index 3ba3591..6f9385c 100644
--- a/tcl/target/tmpa900.cfg
+++ b/tcl/target/tmpa900.cfg
@@ -26,7 +26,7 @@ if { [info exists CPUTAPID] } {
#
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id
$_CPUTAPID
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config trst_and_srst
adapter_nsrst_delay 20
jtag_ntrst_delay 20
diff --git a/tcl/target/tmpa910.cfg b/tcl/target/tmpa910.cfg
index 5d41c8c..f23d058 100644
--- a/tcl/target/tmpa910.cfg
+++ b/tcl/target/tmpa910.cfg
@@ -26,7 +26,7 @@ if { [info exists CPUTAPID] } {
#
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id
$_CPUTAPID
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
reset_config trst_and_srst
adapter_nsrst_delay 20
jtag_ntrst_delay 20
diff --git a/tcl/target/u8500.cfg b/tcl/target/u8500.cfg
index 7ff3929..6318e56 100644
--- a/tcl/target/u8500.cfg
+++ b/tcl/target/u8500.cfg
@@ -321,6 +321,6 @@ gdb_breakpoint_override hard
set mem inaccessible-by-default-off
jtag_ntrst_delay 100
-reset_config trst_and_srst combined
+reset_config trst_and_srst trst_srst_tied
diff --git a/tcl/test/syntax1.cfg b/tcl/test/syntax1.cfg
index 79d5384..bf8de8b 100644
--- a/tcl/test/syntax1.cfg
+++ b/tcl/test/syntax1.cfg
@@ -1,7 +1,7 @@
adapter_nsrst_delay 200
jtag_ntrst_delay 200
-#use combined on interfaces or targets that can't set TRST/SRST separately
+#use trst_srst_tied on interfaces or targets that can't set TRST/SRST
separately
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
--
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
