tcl/target/stm32(f7/h7)x: do not assume presence of the reset

do not force the presence of the reset line, since some custom boards
may do not contain the reset line.

Change-Id: I031ab34012b34a1b49def9db16461f9de0ae29cc
Signed-off-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reported-by: Fleck <fleckz@users.sourceforge.net>
Fixes: https://sourceforge.net/p/openocd/tickets/316/
Reviewed-on: https://review.openocd.org/c/openocd/+/6506
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins

diff --git a/tcl/board/stm327x6g_eval.cfg b/tcl/board/stm327x6g_eval.cfg
index a5e5896b32f4a9dbe26905ad924af0537a641d27..3d522f59d42ef9875d12aad4ba8ead308e2b9aeb 100644 (file)
--- a/tcl/board/stm327x6g_eval.cfg
+++ b/tcl/board/stm327x6g_eval.cfg
@@ -8,3 +8,5 @@
 set WORKAREASIZE 0x40000
 
 source [find target/stm32f7x.cfg]
+
+reset_config srst_only

diff --git a/tcl/board/stm32f723e-disco.cfg b/tcl/board/stm32f723e-disco.cfg
index 3c04d86f0160d3c5f24ef197e2de1cd6eceac90b..b809c5e46cc209fd48d06f355033066c1cddc5c6 100644 (file)
--- a/tcl/board/stm32f723e-disco.cfg
+++ b/tcl/board/stm32f723e-disco.cfg
@@ -14,6 +14,8 @@ set QUADSPI 1
 
 source [find target/stm32f7x.cfg]
 
+reset_config srst_only
+
 # QUADSPI initialization
 proc qspi_init { } {
        global a

diff --git a/tcl/board/stm32f746g-disco.cfg b/tcl/board/stm32f746g-disco.cfg
index 14e89e162e82e8bb5bd00bce46823f7e6342cc8d..5d2c1a46539a662c47a4a43c241d5c0f3ccbab29 100644 (file)
--- a/tcl/board/stm32f746g-disco.cfg
+++ b/tcl/board/stm32f746g-disco.cfg
@@ -14,6 +14,8 @@ set QUADSPI 1
 
 source [find target/stm32f7x.cfg]
 
+reset_config srst_only
+
 # QUADSPI initialization
 proc qspi_init { } {
        global a

diff --git a/tcl/board/stm32f769i-disco.cfg b/tcl/board/stm32f769i-disco.cfg
index cc4334bf4df8575efaac094b3f2a7fa96b08c79f..75dffd8db78105847321c1c89f2e3ae694118e3b 100644 (file)
--- a/tcl/board/stm32f769i-disco.cfg
+++ b/tcl/board/stm32f769i-disco.cfg
@@ -14,6 +14,8 @@ set QUADSPI 1
 
 source [find target/stm32f7x.cfg]
 
+reset_config srst_only
+
 # QUADSPI initialization
 proc qspi_init { } {
        global a

diff --git a/tcl/board/stm32f7discovery.cfg b/tcl/board/stm32f7discovery.cfg
index 7d1bc9665c98dea9e34698ed1e40ff075da7ae54..d6cbff465b1a850baf19043f0b2f59e76e57c7e4 100644 (file)
--- a/tcl/board/stm32f7discovery.cfg
+++ b/tcl/board/stm32f7discovery.cfg
@@ -10,3 +10,5 @@ transport select hla_swd
 set WORKAREASIZE 0x40000
 
 source [find target/stm32f7x.cfg]
+
+reset_config srst_only

diff --git a/tcl/board/stm32h735g-disco.cfg b/tcl/board/stm32h735g-disco.cfg
index 405e47024a55a8b41768eb93e7f277ab0bd602d7..cb5caa4af7ff8a6a057df6f1a76dccd2713236bd 100644 (file)
--- a/tcl/board/stm32h735g-disco.cfg
+++ b/tcl/board/stm32h735g-disco.cfg
@@ -17,6 +17,8 @@ if {![info exists OCTOSPI1]} {
 
 source [find target/stm32h7x.cfg]
 
+reset_config srst_only
+
 # OCTOSPI initialization
 # octo: 8-line mode
 proc octospi_init { octo } {

diff --git a/tcl/board/stm32h745i-disco.cfg b/tcl/board/stm32h745i-disco.cfg
index 5adcfea1642d096fb010307f46bd1cde9c7c47f5..5a587ae8c589a8dc650e3b40906f76fb0ecc0caa 100644 (file)
--- a/tcl/board/stm32h745i-disco.cfg
+++ b/tcl/board/stm32h745i-disco.cfg
@@ -16,6 +16,8 @@ if {![info exists QUADSPI]} {
 
 source [find target/stm32h7x_dual_bank.cfg]
 
+reset_config srst_only
+
 source [find board/stm32h7x_dual_qspi.cfg]
 
 $_CHIPNAME.cpu0 configure -event reset-init {

diff --git a/tcl/board/stm32h747i-disco.cfg b/tcl/board/stm32h747i-disco.cfg
index 22fd74aeae9d41df8ade67734f0bcd4b9f4bcd5a..698ef58846ba6a3ccbc2502da497252be15bbf9f 100644 (file)
--- a/tcl/board/stm32h747i-disco.cfg
+++ b/tcl/board/stm32h747i-disco.cfg
@@ -16,6 +16,8 @@ if {![info exists QUADSPI]} {
 
 source [find target/stm32h7x_dual_bank.cfg]
 
+reset_config srst_only
+
 # QUADSPI initialization
 # qpi: 4-line mode
 proc qspi_init { qpi } {

diff --git a/tcl/board/stm32h750b-disco.cfg b/tcl/board/stm32h750b-disco.cfg
index e6062035aea87179b0d8229ee7b15a92e12338f9..609cf3853786a7d1d48e39d217bf7e11004fcebe 100644 (file)
--- a/tcl/board/stm32h750b-disco.cfg
+++ b/tcl/board/stm32h750b-disco.cfg
@@ -16,6 +16,8 @@ if {![info exists QUADSPI]} {
 
 source [find target/stm32h7x.cfg]
 
+reset_config srst_only
+
 source [find board/stm32h7x_dual_qspi.cfg]
 
 $_CHIPNAME.cpu0 configure -event reset-init {

diff --git a/tcl/board/stm32h7b3i-disco.cfg b/tcl/board/stm32h7b3i-disco.cfg
index e5512eade0f56a078168691a6fcd66306eac6d8b..0c4cc23bebde7c6e7527ebb8b875fcbe64939cff 100644 (file)
--- a/tcl/board/stm32h7b3i-disco.cfg
+++ b/tcl/board/stm32h7b3i-disco.cfg
@@ -17,6 +17,8 @@ if {![info exists OCTOSPI1]} {
 
 source [find target/stm32h7x_dual_bank.cfg]
 
+reset_config srst_only
+
 # OCTOSPI initialization
 # octo: 8-line mode
 proc octospi_init { octo } {

diff --git a/tcl/target/stm32f7x.cfg b/tcl/target/stm32f7x.cfg
index 3c7679de253b5d22c17445edfcf579870d6a4dc9..91ab2891ba48d9d53b57cdab3992ba5c8d5edefe 100644 (file)
--- a/tcl/target/stm32f7x.cfg
+++ b/tcl/target/stm32f7x.cfg
@@ -82,7 +82,7 @@ if {[using_jtag]} {
 #
 # This target is compatible with connect_assert_srst, which may be set in a
 # board file.
-reset_config srst_only srst_nogate
+reset_config srst_nogate
 
 if {![using_hla]} {
    # if srst is not fitted use SYSRESETREQ to

diff --git a/tcl/target/stm32h7x.cfg b/tcl/target/stm32h7x.cfg
index 877976c1acca3f8da61c0ac2251200422b73828d..f2a5c42c6d7386e616a4936a6849274c3cffcc25 100644 (file)
--- a/tcl/target/stm32h7x.cfg
+++ b/tcl/target/stm32h7x.cfg
@@ -142,7 +142,7 @@ if {[using_jtag]} {
 # usage does not work with HLA, so is not done by default. That change could be
 # made in a local configuration file if connect_assert_srst mode is needed for
 # a specific application and a non-HLA adapter is in use.
-reset_config srst_only srst_nogate
+reset_config srst_nogate
 
 if {![using_hla]} {
    # if srst is not fitted use SYSRESETREQ to