X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Ftarget%2Fstm32h7x.cfg;h=5aae93861909293c1ab4f67d8a86c66c24691506;hb=e6505b04892ccacf75603c3d173616f5d92809e7;hp=26d0d9301a4f912f85af7fe4fb9d2c93ae420e0c;hpb=c945d6e6160598894319860a92b602a192c2c268;p=fw%2Fopenocd

diff --git a/tcl/target/stm32h7x.cfg b/tcl/target/stm32h7x.cfg
index 26d0d9301..5aae93861 100644
--- a/tcl/target/stm32h7x.cfg
+++ b/tcl/target/stm32h7x.cfg
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 # script for stm32h7x family
 
 #
@@ -142,7 +144,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
@@ -208,7 +210,7 @@ proc stm32h7x_get_chipname {} {
 	if {$sep == -1} {
 		return $t
 	}
-	return [string range $t 0 [expr $sep - 1]]
+	return [string range $t 0 [expr {$sep - 1}]]
 }
 
 if {[set $_CHIPNAME.DUAL_CORE]} {
@@ -232,15 +234,13 @@ if {[set $_CHIPNAME.DUAL_CORE]} {
 
 # like mrw, but with target selection
 proc stm32h7x_mrw {used_target reg} {
-	set value ""
-	$used_target mem2array value 32 $reg 1
-	return $value(0)
+	return [$used_target read_memory $reg 32 1]
 }
 
 # like mmw, but with target selection
 proc stm32h7x_mmw {used_target reg setbits clearbits} {
 	set old [stm32h7x_mrw $used_target $reg]
-	set new [expr ($old & ~$clearbits) | $setbits]
+	set new [expr {($old & ~$clearbits) | $setbits}]
 	$used_target mww $reg $new
 }
 
@@ -251,10 +251,10 @@ proc stm32h7x_dbgmcu_mmw {reg_offset setbits clearbits} {
 	if {![using_hla]} {
 		set _CHIPNAME [stm32h7x_get_chipname]
 		set used_target $_CHIPNAME.ap2
-		set reg_addr [expr 0xE00E1000 + $reg_offset]
+		set reg_addr [expr {0xE00E1000 + $reg_offset}]
 	} {
 		set used_target [target current]
-		set reg_addr [expr 0x5C001000 + $reg_offset]
+		set reg_addr [expr {0x5C001000 + $reg_offset}]
 	}
 
 	stm32h7x_mmw $used_target $reg_addr $setbits $clearbits