-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