flash/nor/at91samd: Use 32-bit register writes for ST-Link compat

[fw/openocd] / tcl / target / icepick.cfg

diff --git a/tcl/target/icepick.cfg b/tcl/target/icepick.cfg
index d1250711bf8a594af5de27b7624b0af778b08a18..5509532111ec9a2442bd431df80c3019abe7cdfa 100644 (file)
--- a/tcl/target/icepick.cfg
+++ b/tcl/target/icepick.cfg
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 #
 # Copyright (C)   2011        by Karl Kurbjun
 # Copyright (C)   2009        by David Brownell
@@ -54,8 +56,8 @@ proc icepick_c_disconnect {jrc} {
 proc icepick_c_router {jrc rw block register payload} {
 
        set new_dr_value \
-               [expr ( ($rw & 0x1) << 31)        | ( ($block & 0x7) << 28) | \
-                       ( ($register & 0xF) << 24)  | ( $payload & 0xFFFFFF ) ]
+               [expr { ( ($rw & 0x1) << 31)        | ( ($block & 0x7) << 28) | \
+                               ( ($register & 0xF) << 24)  | ( $payload & 0xFFFFFF ) } ]
 
 #      echo "\tNew router value:\t0x[format %x $new_dr_value]"
 
@@ -84,7 +86,7 @@ proc icepick_c_tapenable {jrc port} {
                set block 0x2
        } elseif { $port < 32 } {
                # Test tap
-               set tap [expr ($port - 16)]
+               set tap [expr {$port - 16}]
                set block 0x1
        } else {
                echo "ERROR: Invalid ICEPick C port number: $port"