diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2019-01-26 16:19:55 +0100 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2020-09-05 17:10:14 +0100 |
| commit | 1457a1ab425febd3dfceeb8c908b69135ff0b8b6 (patch) | |
| tree | 299e532f97e9772b0494d3a10252d24baf6c8ed5 /tcl/target | |
| parent | f1d77a485ce4ca81ea791f3d584f7d5d452a10a9 (diff) | |
| download | riscv-openocd-1457a1ab425febd3dfceeb8c908b69135ff0b8b6.zip riscv-openocd-1457a1ab425febd3dfceeb8c908b69135ff0b8b6.tar.gz riscv-openocd-1457a1ab425febd3dfceeb8c908b69135ff0b8b6.tar.bz2 | |
tcl/target: use command 'jtag newtap' to add a boundary scan TAP
A JTAG TAP for boundary scan should be added in the scan chain
through the command "jtag newtap".
In some TCL target script the boundary scan TAP is added through
the command "swj_newdap", command that is inappropriate in this
context because specific for arm adi-v5 SWJ-DP.
This situation was probably created to bypass the error with HLA
framework, caused by missing command "jtag newtap".
Add the command "jtag newtap" in HLA, by reusing the existing
code for command "hla newtap".
Fix the TCL target scripts to use the command "jtag newtap" for
the boundary scan TAPs.
The TCL script target/psoc6.cfg has no evident reference to HLA,
so the reason for using "swj_newdap" is less clear. Nevertheless
it uses the wrong command and, once HLA is fixed, there is no
reason to avoid fixing it too.
Change-Id: Ia92f8221430cf6f3d2c34294e22e5e18963bb88c
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4873
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'tcl/target')
| -rw-r--r-- | tcl/target/em357.cfg | 2 | ||||
| -rw-r--r-- | tcl/target/psoc6.cfg | 2 | ||||
| -rw-r--r-- | tcl/target/stm32h7x.cfg | 2 | ||||
| -rw-r--r-- | tcl/target/stm32w108xx.cfg | 4 | ||||
| -rw-r--r-- | tcl/target/stm32wlx.cfg | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/tcl/target/em357.cfg b/tcl/target/em357.cfg index 5720071..f39f3f4 100644 --- a/tcl/target/em357.cfg +++ b/tcl/target/em357.cfg @@ -52,7 +52,7 @@ if { [info exists FLASHSIZE] } { swj_newdap $_CHIPNAME cpu -irlen 4 -expected-id $_CPUTAPID dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu if { [using_jtag] } { - swj_newdap $_CHIPNAME bs -irlen 4 -expected-id $_BSTAPID -ircapture 0xe -irmask 0xf + jtag newtap $_CHIPNAME bs -irlen 4 -expected-id $_BSTAPID -ircapture 0xe -irmask 0xf } set _TARGETNAME $_CHIPNAME.cpu diff --git a/tcl/target/psoc6.cfg b/tcl/target/psoc6.cfg index 51d032b..bf63fd5 100644 --- a/tcl/target/psoc6.cfg +++ b/tcl/target/psoc6.cfg @@ -146,5 +146,5 @@ if { $_ENABLE_CM0 } { } if {[using_jtag]} { - swj_newdap $_CHIPNAME bs -irlen 18 -expected-id 0x2e200069 + jtag newtap $_CHIPNAME bs -irlen 18 -expected-id 0x2e200069 } diff --git a/tcl/target/stm32h7x.cfg b/tcl/target/stm32h7x.cfg index 2d92eca..43a8b02 100644 --- a/tcl/target/stm32h7x.cfg +++ b/tcl/target/stm32h7x.cfg @@ -70,7 +70,7 @@ swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPU dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu if {[using_jtag]} { - swj_newdap $_CHIPNAME bs -irlen 5 + jtag newtap $_CHIPNAME bs -irlen 5 } if {![using_hla]} { diff --git a/tcl/target/stm32w108xx.cfg b/tcl/target/stm32w108xx.cfg index 3a83fd1..0470bf6 100644 --- a/tcl/target/stm32w108xx.cfg +++ b/tcl/target/stm32w108xx.cfg @@ -42,11 +42,11 @@ dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu if {[using_jtag]} { if { [info exists BSTAPID] } { set _BSTAPID $BSTAPID - swj_newdap $_CHIPNAME bs -irlen 4 -ircapture 0xe -irmask 0xf -expected-id _BSTAPID + jtag newtap $_CHIPNAME bs -irlen 4 -ircapture 0xe -irmask 0xf -expected-id _BSTAPID } else { set _BSTAPID_1 0x169a862b set _BSTAPID_2 0x269a862b - swj_newdap $_CHIPNAME bs -irlen 4 -ircapture 0xe -irmask 0xf \ + jtag newtap $_CHIPNAME bs -irlen 4 -ircapture 0xe -irmask 0xf \ -expected-id $_BSTAPID_1 -expected-id $_BSTAPID_2 } } diff --git a/tcl/target/stm32wlx.cfg b/tcl/target/stm32wlx.cfg index 98c9a7e..ba16fab 100644 --- a/tcl/target/stm32wlx.cfg +++ b/tcl/target/stm32wlx.cfg @@ -38,7 +38,7 @@ swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPU dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu if {[using_jtag]} { - swj_newdap $_CHIPNAME bs -irlen 5 + jtag newtap $_CHIPNAME bs -irlen 5 } set _TARGETNAME $_CHIPNAME.cpu |