[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-590-g223e3d8fe

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  223e3d8fe76d86f01111bbe37f83a19d719ac81a (commit)
      from  eecba412cd8a6d515c925d87fe53e79881305517 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 223e3d8fe76d86f01111bbe37f83a19d719ac81a
Author: Noah Moroze <noa...@gm...>
Date:   Wed May 15 22:47:53 2024 -0400

    tcl/target/c100helper: fix syntax errors
    
    Fixes: 64d89d5ee1a5 ("tcl: [3/3] prepare for jimtcl 0.81 'expr' syntax change")
    
    These syntax errors were caught by tclint v0.2.5
    (https://github.com/nmoroze/tclint):
    
    ```
    tclint tcl/target/c100helper.tcl | grep "syntax error"
    ```
    
    Change-Id: I511c54353c4853560adca6b4852d48df2aade283
    Signed-off-by: Noah Moroze <noa...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8280
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/tcl/target/c100helper.tcl b/tcl/target/c100helper.tcl
index d1d3f258b..ba0e4fe0a 100644
--- a/tcl/target/c100helper.tcl
+++ b/tcl/target/c100helper.tcl
@@ -176,7 +176,7 @@ proc setupAmbaClk {} {
     mmw $CLKCORE_AHB_CLK_CNTRL [expr {($x << 16) + ($w << 8) + $y}] 0x0
     # wait for PLL to lock
     echo "Waiting for Amba PLL to lock"
-    while {[expr {[mrw $CLKCORE_PLL_STATUS] & $AHBCLK_PLL_LOCK]} == 0} { sleep 1 }
+    while {[mrw $CLKCORE_PLL_STATUS] & $AHBCLK_PLL_LOCK == 0} { sleep 1 }
     # remove the internal PLL bypass
     mmw $CLKCORE_AHB_CLK_CNTRL 0x0 $AHB_PLL_BY_CTRL
     # remove PLL from BYPASS mode using MUX
@@ -250,7 +250,7 @@ proc setupArmClk {} {
     mmw $CLKCORE_ARM_CLK_CNTRL [expr {($x << 16) + ($w << 8) + $y}] 0x0
     # wait for PLL to lock
     echo "Waiting for Amba PLL to lock"
-    while {[expr {[mrw $CLKCORE_PLL_STATUS] & $FCLK_PLL_LOCK]} == 0} { sleep 1 }
+    while {[mrw $CLKCORE_PLL_STATUS] & $FCLK_PLL_LOCK == 0} { sleep 1 }
     # remove the internal PLL bypass
     mmw $CLKCORE_ARM_CLK_CNTRL 0x0 $ARM_PLL_BY_CTRL
     # remove PLL from BYPASS mode using MUX

-----------------------------------------------------------------------

Summary of changes:
 tcl/target/c100helper.tcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository