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

[fw/openocd] / tcl / chip / atmel / at91 / at91sam9261_matrix.cfg

diff --git a/tcl/chip/atmel/at91/at91sam9261_matrix.cfg b/tcl/chip/atmel/at91/at91sam9261_matrix.cfg
index dc8de237625ca44d40b9b88b074016ecfc157eea..238e65841499a3027b3c5a2eb6d7263d2208d135 100644 (file)
--- a/tcl/chip/atmel/at91/at91sam9261_matrix.cfg
+++ b/tcl/chip/atmel/at91/at91sam9261_matrix.cfg
@@ -1,46 +1,46 @@
 
-set AT91_MATRIX_MCFG   [expr ($AT91_MATRIX + 0x00)]    ;# Master Configuration Register #
-set            AT91_MATRIX_RCB0        [expr (1 << 0)]         ;# Remap Command for AHB Master 0 (ARM926EJ-S Instruction Master)
-set            AT91_MATRIX_RCB1        [expr (1 << 1)]         ;# Remap Command for AHB Master 1 (ARM926EJ-S Data Master)
+set AT91_MATRIX_MCFG   [expr {$AT91_MATRIX + 0x00}]    ;# Master Configuration Register #
+set            AT91_MATRIX_RCB0        [expr {1 << 0}]         ;# Remap Command for AHB Master 0 (ARM926EJ-S Instruction Master)
+set            AT91_MATRIX_RCB1        [expr {1 << 1}]         ;# Remap Command for AHB Master 1 (ARM926EJ-S Data Master)
 
-set AT91_MATRIX_SCFG0  [expr ($AT91_MATRIX + 0x04)]    ;# Slave Configuration Register 0
-set AT91_MATRIX_SCFG1  [expr ($AT91_MATRIX + 0x08)]    ;# Slave Configuration Register 1
-set AT91_MATRIX_SCFG2  [expr ($AT91_MATRIX + 0x0C)]    ;# Slave Configuration Register 2
-set AT91_MATRIX_SCFG3  [expr ($AT91_MATRIX + 0x10)]    ;# Slave Configuration Register 3
-set AT91_MATRIX_SCFG4  [expr ($AT91_MATRIX + 0x14)]    ;# Slave Configuration Register 4
-set            AT91_MATRIX_SLOT_CYCLE          [expr (0xff << 0)]      ;# Maximum Number of Allowed Cycles for a Burst
-set            AT91_MATRIX_DEFMSTR_TYPE        [expr (3    << 16)]     ;# Default Master Type
-set                    AT91_MATRIX_DEFMSTR_TYPE_NONE   [expr (0 << 16)]
-set                    AT91_MATRIX_DEFMSTR_TYPE_LAST   [expr (1 << 16)]
-set                    AT91_MATRIX_DEFMSTR_TYPE_FIXED  [expr (2 << 16)]
-set            AT91_MATRIX_FIXED_DEFMSTR       [expr (7    << 18)]     ;# Fixed Index of Default Master
+set AT91_MATRIX_SCFG0  [expr {$AT91_MATRIX + 0x04}]    ;# Slave Configuration Register 0
+set AT91_MATRIX_SCFG1  [expr {$AT91_MATRIX + 0x08}]    ;# Slave Configuration Register 1
+set AT91_MATRIX_SCFG2  [expr {$AT91_MATRIX + 0x0C}]    ;# Slave Configuration Register 2
+set AT91_MATRIX_SCFG3  [expr {$AT91_MATRIX + 0x10}]    ;# Slave Configuration Register 3
+set AT91_MATRIX_SCFG4  [expr {$AT91_MATRIX + 0x14}]    ;# Slave Configuration Register 4
+set            AT91_MATRIX_SLOT_CYCLE          [expr {0xff << 0}]      ;# Maximum Number of Allowed Cycles for a Burst
+set            AT91_MATRIX_DEFMSTR_TYPE        [expr {3    << 16}]     ;# Default Master Type
+set                    AT91_MATRIX_DEFMSTR_TYPE_NONE   [expr {0 << 16}]
+set                    AT91_MATRIX_DEFMSTR_TYPE_LAST   [expr {1 << 16}]
+set                    AT91_MATRIX_DEFMSTR_TYPE_FIXED  [expr {2 << 16}]
+set            AT91_MATRIX_FIXED_DEFMSTR       [expr {7    << 18}]     ;# Fixed Index of Default Master
 
-set AT91_MATRIX_TCR            [expr ($AT91_MATRIX + 0x24)]    ;# TCM Configuration Register
-set            AT91_MATRIX_ITCM_SIZE           [expr (0xf << 0)]       ;# Size of ITCM enabled memory block
-set                    AT91_MATRIX_ITCM_0              [expr (0 << 0)]
-set                    AT91_MATRIX_ITCM_16             [expr (5 << 0)]
-set                    AT91_MATRIX_ITCM_32             [expr (6 << 0)]
-set                    AT91_MATRIX_ITCM_64             [expr (7 << 0)]
-set            AT91_MATRIX_DTCM_SIZE           [expr (0xf << 4)]       ;# Size of DTCM enabled memory block
-set                    AT91_MATRIX_DTCM_0              [expr (0 << 4)]
-set                    AT91_MATRIX_DTCM_16             [expr (5 << 4)]
-set                    AT91_MATRIX_DTCM_32             [expr (6 << 4)]
-set                    AT91_MATRIX_DTCM_64             [expr (7 << 4)]
+set AT91_MATRIX_TCR            [expr {$AT91_MATRIX + 0x24}]    ;# TCM Configuration Register
+set            AT91_MATRIX_ITCM_SIZE           [expr {0xf << 0}]       ;# Size of ITCM enabled memory block
+set                    AT91_MATRIX_ITCM_0              [expr {0 << 0}]
+set                    AT91_MATRIX_ITCM_16             [expr {5 << 0}]
+set                    AT91_MATRIX_ITCM_32             [expr {6 << 0}]
+set                    AT91_MATRIX_ITCM_64             [expr {7 << 0}]
+set            AT91_MATRIX_DTCM_SIZE           [expr {0xf << 4}]       ;# Size of DTCM enabled memory block
+set                    AT91_MATRIX_DTCM_0              [expr {0 << 4}]
+set                    AT91_MATRIX_DTCM_16             [expr {5 << 4}]
+set                    AT91_MATRIX_DTCM_32             [expr {6 << 4}]
+set                    AT91_MATRIX_DTCM_64             [expr {7 << 4}]
 
-set AT91_MATRIX_EBICSA [expr ($AT91_MATRIX + 0x30)]    ;# EBI Chip Select Assignment Register
-set            AT91_MATRIX_CS1A                [expr (1 << 1)] ;# Chip Select 1 Assignment
-set                    AT91_MATRIX_CS1A_SMC            [expr (0 << 1)]
-set                    AT91_MATRIX_CS1A_SDRAMC         [expr (1 << 1)]
-set            AT91_MATRIX_CS3A                [expr (1 << 3)] ;# Chip Select 3 Assignment
-set                    AT91_MATRIX_CS3A_SMC            [expr (0 << 3)]
-set                    AT91_MATRIX_CS3A_SMC_SMARTMEDIA [expr (1 << 3)]
-set            AT91_MATRIX_CS4A                [expr (1 << 4)] ;# Chip Select 4 Assignment
-set                    AT91_MATRIX_CS4A_SMC            [expr (0 << 4)]
-set                    AT91_MATRIX_CS4A_SMC_CF1        [expr (1 << 4)]
-set            AT91_MATRIX_CS5A                [expr (1 << 5)] ;# Chip Select 5 Assignment
-set                    AT91_MATRIX_CS5A_SMC            [expr (0 << 5)]
-set                    AT91_MATRIX_CS5A_SMC_CF2        [expr (1 << 5)]
-set            AT91_MATRIX_DBPUC               [expr (1 << 8)] ;# Data Bus Pull-up Configuration
+set AT91_MATRIX_EBICSA [expr {$AT91_MATRIX + 0x30}]    ;# EBI Chip Select Assignment Register
+set            AT91_MATRIX_CS1A                [expr {1 << 1}] ;# Chip Select 1 Assignment
+set                    AT91_MATRIX_CS1A_SMC            [expr {0 << 1}]
+set                    AT91_MATRIX_CS1A_SDRAMC         [expr {1 << 1}]
+set            AT91_MATRIX_CS3A                [expr {1 << 3}] ;# Chip Select 3 Assignment
+set                    AT91_MATRIX_CS3A_SMC            [expr {0 << 3}]
+set                    AT91_MATRIX_CS3A_SMC_SMARTMEDIA [expr {1 << 3}]
+set            AT91_MATRIX_CS4A                [expr {1 << 4}] ;# Chip Select 4 Assignment
+set                    AT91_MATRIX_CS4A_SMC            [expr {0 << 4}]
+set                    AT91_MATRIX_CS4A_SMC_CF1        [expr {1 << 4}]
+set            AT91_MATRIX_CS5A                [expr {1 << 5}] ;# Chip Select 5 Assignment
+set                    AT91_MATRIX_CS5A_SMC            [expr {0 << 5}]
+set                    AT91_MATRIX_CS5A_SMC_CF2        [expr {1 << 5}]
+set            AT91_MATRIX_DBPUC               [expr {1 << 8}] ;# Data Bus Pull-up Configuration
 
-set AT91_MATRIX_USBPUCR        [expr ($AT91_MATRIX + 0x34)]    ;# USB Pad Pull-Up Control Register
-set            AT91_MATRIX_USBPUCR_PUON        [expr (1 << 30)]        ;# USB Device PAD Pull-up Enable
+set AT91_MATRIX_USBPUCR        [expr {$AT91_MATRIX + 0x34}]    ;# USB Pad Pull-Up Control Register
+set            AT91_MATRIX_USBPUCR_PUON        [expr {1 << 30}]        ;# USB Device PAD Pull-up Enable