tcl/target/stm32l4x: switch to new TPIU/SWO support

[fw/openocd] / tcl / target / bluenrg-x.cfg

diff --git a/tcl/target/bluenrg-x.cfg b/tcl/target/bluenrg-x.cfg
index 691bbbf83b2744ac0276ce422a9f7295f600f84c..ea94be9628779608a78c83b98a7836d4019718ce 100644 (file)
--- a/tcl/target/bluenrg-x.cfg
+++ b/tcl/target/bluenrg-x.cfg
@@ -23,13 +23,7 @@ if { [info exists WORKAREASIZE] } {
 
 adapter speed 4000
 
-if { [info exists CPUTAPID] } {
-   set _CPUTAPID $CPUTAPID
-} else {
-   set _CPUTAPID 0x0bb11477
-}
-
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
+swj_newdap $_CHIPNAME cpu -expected-id 0x0bb11477 -expected-id 0x0bc11477
 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 set _TARGETNAME $_CHIPNAME.cpu
@@ -60,9 +54,9 @@ $_TARGETNAME configure -event halted {
     if {$_JTAG_IDCODE != 0x0201E041} {
         # Stop watchdog during halt, if enabled. Only Bluenrg-1/2
         set WDOG_VALUE [mrw 0x40700008]
-        if [expr ($WDOG_VALUE & (1 << 1))] {
+        if [expr {$WDOG_VALUE & (1 << 1)}] {
             set WDOG_VALUE_SET 1
-            mww 0x40700008 [expr ($WDOG_VALUE & 0xFFFFFFFD)]
+            mww 0x40700008 [expr {$WDOG_VALUE & 0xFFFFFFFD}]
         }
     }
 }
@@ -71,7 +65,7 @@ $_TARGETNAME configure -event resumed {
     global WDOG_VALUE_SET
     set _JTAG_IDCODE [mrw 0x40000004]
     if {$_JTAG_IDCODE != 0x0201E041} {
-        if [expr $WDOG_VALUE_SET] {
+        if {$WDOG_VALUE_SET} {
             # Restore watchdog enable value after resume. Only Bluenrg-1/2
             mww 0x40700008 $WDOG_VALUE
             set WDOG_VALUE_SET 0