X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=tcl%2Ftarget%2Fstm32_stlink.cfg;h=7dccd47302fb22e5caed13da2e052e2f48843d92;hp=7af07ce7a03677c46cbe2a86828febdf07c6d63f;hb=79d6d3cda90c6694343bde909978069994049ab7;hpb=327fafc6a22f5ff22c591c1ca345d3910022cfec diff --git a/tcl/target/stm32_stlink.cfg b/tcl/target/stm32_stlink.cfg index 7af07ce7a0..7dccd47302 100644 --- a/tcl/target/stm32_stlink.cfg +++ b/tcl/target/stm32_stlink.cfg @@ -23,9 +23,38 @@ if { [info exists CPUTAPID] } { set _CPUTAPID 0x1ba01477 } -stlink newtap $_CHIPNAME cpu -expected-id $_CPUTAPID +if { [info exists TRANSPORT] } { + set _TRANSPORT $TRANSPORT + if { $TRANSPORT == "hla_jtag" } { + if { [info exists CPUTAPID] == 0 } { + # jtag requires us to use the jtag tap id + set _CPUTAPID 0x3ba00477 + } + } +} else { + set _TRANSPORT hla_swd +} + +# add deprecated transport name check +if { $_TRANSPORT == "stlink_swd" } { + set _TRANSPORT "hla_swd" + echo "DEPRECATED! use 'hla_swd' transport not 'stlink_swd'" +} + +if { $_TRANSPORT == "stlink_jtag" } { + set _TRANSPORT "hla_jtag" + echo "DEPRECATED! use 'hla_jtag' transport not 'stlink_jtag'" +} +# end deprecated checks + +# +# possibles value are hla_swd or hla_jtag +# +transport select $_TRANSPORT + +hla newtap $_CHIPNAME cpu -expected-id $_CPUTAPID set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME stm32_stlink -chain-position $_TARGETNAME +target create $_TARGETNAME hla_target -chain-position $_TARGETNAME $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0