tcl: [1/3] prepare for jimtcl 0.81 'expr' syntax change

[openocd.git] / tcl / board / dm365evm.cfg

diff --git a/tcl/board/dm365evm.cfg b/tcl/board/dm365evm.cfg
index f8ec4e04bf6f5a917b130b4f9105520ef2c6e600..8c7f8c0a60c7ce39e102d674d2e0c51f8395b8c5 100644 (file)
--- a/tcl/board/dm365evm.cfg
+++ b/tcl/board/dm365evm.cfg
@@ -56,10 +56,10 @@ if { $CS0 == "NAND" } {
                #set nand_timings 0x0400008c
 
                # CS0 == socketed NAND (default MT29F16G08FAA, 2 GBytes)
-               mww [expr $a_emif + 0x10] $nand_timings
+               mww [expr {$a_emif + 0x10}] $nand_timings
 
                # NANDFCR -- CS0 has NAND
-               mww [expr $a_emif + 0x60] 0x01
+               mww [expr {$a_emif + 0x60}] 0x01
        }
        proc flashprobe {} {
                nand probe 0
@@ -80,10 +80,10 @@ if { $CS0 == "NAND" } {
                davinci_pinmux $dm365 2 0x00000055
 
                # CS0 == OneNAND (KFG1G16U2B-DIB6, 128 KBytes)
-               mww [expr $a_emif + 0x10] 0x00000001
+               mww [expr {$a_emif + 0x10}] 0x00000001
 
                # ONENANDCTRL -- CS0 has OneNAND, enable sync reads
-               mww [expr $a_emif + 0x5c] 0x0441
+               mww [expr {$a_emif + 0x5c}] 0x0441
        }
        proc flashprobe {} { }
 }
@@ -103,7 +103,7 @@ proc dm365evm_init {} {
        echo "Initialize DM365 EVM board"
 
        # CLKIN = 24 MHz ... can't talk quickly to ARM yet
-       jtag_khz 1500
+       adapter speed 1500
 
        # FIXME -- PLL init
 
@@ -133,15 +133,13 @@ proc dm365evm_init {} {
        set a_emif [dict get $dm365 a_emif]
 
        # AWCCR
-       mww [expr $a_emif + 0x04] 0xff
+       mww [expr {$a_emif + 0x04}] 0xff
        # CS0 == NAND or OneNAND
        cs0_setup $a_emif
        # CS1 == CPLD
-       mww [expr $a_emif + 0x14] 0x00a00505
+       mww [expr {$a_emif + 0x14}] 0x00a00505
 
        # FIXME setup UART0
 
        flashprobe
 }
-
-