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

[fw/openocd] / tcl / board / at91sam9263-ek.cfg

diff --git a/tcl/board/at91sam9263-ek.cfg b/tcl/board/at91sam9263-ek.cfg
index b88efa9716f4005c9d673be4582ca14be08b45df..ab04228ce1a891421b4e2a7208d6e99e2d782394 100644 (file)
--- a/tcl/board/at91sam9263-ek.cfg
+++ b/tcl/board/at91sam9263-ek.cfg
@@ -24,9 +24,9 @@ proc at91sam9263ek_reset_init { } {
        set config(master_pll_div)      14
        set config(master_pll_mul)      171
 
-       set val [expr $::AT91_WDT_WDV]                  ;# Counter Value
-       set val [expr {$val | $::AT91_WDT_WDDIS}]       ;# Watchdog Disable
-       set val [expr {$val | $::AT91_WDT_WDD}]         ;# Delta Value
+       set val $::AT91_WDT_WDV                                                 ;# Counter Value
+       set val [expr {$val | $::AT91_WDT_WDDIS}]               ;# Watchdog Disable
+       set val [expr {$val | $::AT91_WDT_WDD}]                 ;# Delta Value
        set val [expr {$val | $::AT91_WDT_WDDBGHLT}]    ;# Debug Halt
        set val [expr {$val | $::AT91_WDT_WDIDLEHLT}]   ;# Idle Halt
 
@@ -36,13 +36,13 @@ proc at91sam9263ek_reset_init { } {
        ;# EBI_CSA, no pull-ups for D[15:0], CS1 SDRAM, CS3 NAND Flash
        set config(matrix_ebicsa_addr)  $::AT91_MATRIX_EBI0CSA
 
-       set val [expr $::AT91_MATRIX_EBI0_DBPUC]
+       set val $::AT91_MATRIX_EBI0_DBPUC
        set val [expr {$val | $::AT91_MATRIX_EBI0_VDDIOMSEL_3_3V}]
        set val [expr {$val | $::AT91_MATRIX_EBI0_CS1A_SDRAMC}]
        set config(matrix_ebicsa_val) $val
 
        ;# SDRAMC_CR - Configuration register
-       set val [expr $::AT91_SDRAMC_NC_9]
+       set val $::AT91_SDRAMC_NC_9
        set val [expr {$val | $::AT91_SDRAMC_NR_13}]
        set val [expr {$val | $::AT91_SDRAMC_NB_4}]
        set val [expr {$val | $::AT91_SDRAMC_CAS_3}]