X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Ftarget%2Fdavinci.cfg;h=54afb6428939517355a8ed5892e179de704247d3;hb=e6505b04892ccacf75603c3d173616f5d92809e7;hp=ef07856d218c178eb8dc6c69ebf740c6a472dfd5;hpb=f5657aa76e795e4ed5b13a9f5df943181a123e49;p=fw%2Fopenocd

diff --git a/tcl/target/davinci.cfg b/tcl/target/davinci.cfg
index ef07856d2..54afb6428 100644
--- a/tcl/target/davinci.cfg
+++ b/tcl/target/davinci.cfg
@@ -1,10 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 #
 # Utility code for DaVinci-family chips
 #
 
 # davinci_pinmux: assigns PINMUX$reg <== $value
 proc davinci_pinmux {soc reg value} {
-	mww [expr [dict get $soc sysbase] + 4 * $reg] $value
+	mww [expr {[dict get $soc sysbase] + 4 * $reg}] $value
 }
 
 source [find mem_helper.tcl]
@@ -110,7 +112,7 @@ proc pll_v02_setup {pll_addr mult config} {
 		# write pllcmd.GO; poll pllstat.GO
 		mww [expr {$pll_addr + 0x0138}] 0x01
 		set pllstat [expr {$pll_addr + 0x013c}]
-		while {[expr [mrw $pllstat] & 0x01] != 0} { sleep 1 }
+		while {[expr {[mrw $pllstat] & 0x01}] != 0} { sleep 1 }
 	}
 	mww [expr {$pll_addr + 0x0138}] 0x00
 
@@ -267,16 +269,16 @@ proc pll_v03_setup {pll_addr mult config} {
 	if {$aln != 0} {
 		# clear pllcmd.GO
 		mww [expr {$pll_addr + 0x0138}] 0x00
-		# write alingment flags
+		# write alignment flags
 		mww [expr {$pll_addr + 0x0140}] $aln
 		# write pllcmd.GO; poll pllstat.GO
 		mww [expr {$pll_addr + 0x0138}] 0x01
 		set pllstat [expr {$pll_addr + 0x013c}]
-		while {[expr [mrw $pllstat] & 0x01] != 0} { sleep 1 }
+		while {[expr {[mrw $pllstat] & 0x01}] != 0} { sleep 1 }
 	}
 	mww [expr {$pll_addr + 0x0138}] 0x00
 	set addr [dict get $config ctladdr]
-	while {[expr [mrw $addr] & 0x0e000000] != 0x0e000000} { sleep 1 }
+	while {[expr {[mrw $addr] & 0x0e000000}] != 0x0e000000} { sleep 1 }
 
 	# 12 - set PLLEN (bit 0) ... leave bypass mode
 	set pll_ctrl [expr {$pll_ctrl | 0x0001}]
@@ -306,13 +308,13 @@ proc psc_go {} {
 	set ptstat_addr [expr {$psc_addr + 0x0128}]
 
 	# just in case PTSTAT.go isn't clear
-	while { [expr [mrw $ptstat_addr] & 0x01] != 0 } { sleep 1 }
+	while { [expr {[mrw $ptstat_addr] & 0x01}] != 0 } { sleep 1 }
 
 	# write PTCMD.go ... ignoring any DSP power domain
 	mww [expr {$psc_addr + 0x0120}] 1
 
 	# wait for PTSTAT.go to clear (again ignoring DSP power domain)
-	while { [expr [mrw $ptstat_addr] & 0x01] != 0 } { sleep 1 }
+	while { [expr {[mrw $ptstat_addr] & 0x01}] != 0 } { sleep 1 }
 }
 
 #