X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Ftarget%2Fstellaris.cfg;h=4865e2916f602052aaa976e474e4930aacd5342d;hb=ad5ca263e931792483cdb2a820b7aba3980829eb;hp=fb591c2bf23ba7c87983f9108643306b9a4b1b29;hpb=38ac08c1c25adf42cf20e48e10e6ddeab6a12d71;p=fw%2Fopenocd

diff --git a/tcl/target/stellaris.cfg b/tcl/target/stellaris.cfg
index fb591c2bf..4865e2916 100644
--- a/tcl/target/stellaris.cfg
+++ b/tcl/target/stellaris.cfg
@@ -83,7 +83,7 @@ proc reset_peripherals {family} {
 	mmw $SYSCTL_RCC2 $SYSCTL_RCC2_BYPASS2 0
 
 	# RCC and RCC2 to their reset values
-	mww $SYSCTL_RCC [expr (0x078e3ad0 | ([mrw $SYSCTL_RCC] & $SYSCTL_RCC_MOSCDIS))]
+	mww $SYSCTL_RCC [expr {0x078e3ad0 | ([mrw $SYSCTL_RCC] & $SYSCTL_RCC_MOSCDIS)}]
 	mww $SYSCTL_RCC2 0x07806810
 	mww $SYSCTL_RCC 0x078e3ad1
 
@@ -121,8 +121,8 @@ proc reset_peripherals {family} {
 	mww $SYSCTL_MISC 0xffffffff
 
 	# Wait for any pending flash operations to complete
-	while {[expr [mrw $FLASH_FMC] & 0xffff] != 0} { sleep 1 }
-	while {[expr [mrw $FLASH_FMC2] & 0xffff] != 0} { sleep 1 }
+	while {[expr {[mrw $FLASH_FMC] & 0xffff}] != 0} { sleep 1 }
+	while {[expr {[mrw $FLASH_FMC2] & 0xffff}] != 0} { sleep 1 }
 
 	# Reset the flash controller registers
 	mww $FLASH_FMA 0
@@ -152,7 +152,7 @@ $_TARGETNAME configure -event reset-start {
 	if {$_DEVICECLASS != 0xff} {
 	   set device_class $_DEVICECLASS
 	} else {
-	   set device_class [expr (([mrw 0x400fe000] >> 16) & 0xff)]
+	   set device_class [expr {([mrw 0x400fe000] >> 16) & 0xff}]
 	}
 
 	if {$device_class == 0 || $device_class == 1 ||
@@ -164,7 +164,7 @@ $_TARGETNAME configure -event reset-start {
 	} else {
 		if {![using_hla]} {
 		   # Tempest and Firestorm default to using NVIC VECTRESET
-		   # peripherals will need reseting manually, see proc reset_peripherals
+		   # peripherals will need resetting manually, see proc reset_peripherals
 		   cortex_m reset_config vectreset
 		}
 		# reset peripherals, based on code in