interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Antonio Borneo 2019-01-26 16:19:55 +01:00
parent f1d77a485c
commit 1457a1ab42
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jtag/hla/hla_transport.c
View File

@ -62,6 +62,9 @@ hl_transport_stlink_subcommand_handlers[] = {
static const struct command_registration static const struct command_registration
hl_transport_jtag_subcommand_handlers[] = { hl_transport_jtag_subcommand_handlers[] = {
{
.chain = hl_transport_stlink_subcommand_handlers,
},
{ {
.name = "init", .name = "init",
.mode = COMMAND_ANY, .mode = COMMAND_ANY,

2
tcl/target/em357.cfg
View File

@ -52,7 +52,7 @@ if { [info exists FLASHSIZE] } {
swj_newdap $_CHIPNAME cpu -irlen 4 -expected-id $_CPUTAPID swj_newdap $_CHIPNAME cpu -irlen 4 -expected-id $_CPUTAPID
dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
if { [using_jtag] } { 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 set _TARGETNAME $_CHIPNAME.cpu

2
tcl/target/psoc6.cfg
View File

@ -146,5 +146,5 @@ if { $_ENABLE_CM0 } {
} }
if {[using_jtag]} { if {[using_jtag]} {
swj_newdap $_CHIPNAME bs -irlen 18 -expected-id 0x2e200069 jtag newtap $_CHIPNAME bs -irlen 18 -expected-id 0x2e200069
} }

2
tcl/target/stm32h7x.cfg
View File

@ -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 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
if {[using_jtag]} { if {[using_jtag]} {
swj_newdap $_CHIPNAME bs -irlen 5 jtag newtap $_CHIPNAME bs -irlen 5
} }
if {![using_hla]} { if {![using_hla]} {

4
tcl/target/stm32w108xx.cfg
View File

@ -42,11 +42,11 @@ dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
if {[using_jtag]} { if {[using_jtag]} {
if { [info exists BSTAPID] } { if { [info exists BSTAPID] } {
set _BSTAPID $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 { } else {
set _BSTAPID_1 0x169a862b set _BSTAPID_1 0x169a862b
set _BSTAPID_2 0x269a862b 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 -expected-id $_BSTAPID_1 -expected-id $_BSTAPID_2
} }
} }

2
tcl/target/stm32wlx.cfg
View File

@ -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 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
if {[using_jtag]} { if {[using_jtag]} {
swj_newdap $_CHIPNAME bs -irlen 5 jtag newtap $_CHIPNAME bs -irlen 5
} }
set _TARGETNAME $_CHIPNAME.cpu set _TARGETNAME $_CHIPNAME.cpu