X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=tcl%2Ftarget%2Fstm32_stlink.cfg;h=7dccd47302fb22e5caed13da2e052e2f48843d92;hp=9a67b99caa0afe72f30dcb63fe3695ebf7d780b5;hb=b7d2cdc0d4fc319169c60362708a67e2ff626525;hpb=6bbb1479b316890519da8aa93f115501711d8656 diff --git a/tcl/target/stm32_stlink.cfg b/tcl/target/stm32_stlink.cfg index 9a67b99caa..7dccd47302 100644 --- a/tcl/target/stm32_stlink.cfg +++ b/tcl/target/stm32_stlink.cfg @@ -23,14 +23,38 @@ if { [info exists CPUTAPID] } { set _CPUTAPID 0x1ba01477 } +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 stlink_swd or stlink_jtag +# possibles value are hla_swd or hla_jtag # -transport select stlink_swd +transport select $_TRANSPORT -stlink newtap $_CHIPNAME cpu -expected-id $_CPUTAPID +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