diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2013-08-06 13:12:10 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2014-01-09 15:22:42 +0000 |
| commit | acc4bb83fd1f26a677fdc2c8ccdc7a235f877d2d (patch) | |
| tree | 4a8ac63e67ef83e7514dc25e05b73b39c5f81cc0 /tcl/target/stm32f4x.cfg | |
| parent | 4dc8cd201c667bac72bc083ef1fa1b285eb093fc (diff) | |
cfg: add stm32 cmsis-dap compliant config
Change-Id: I3cfb21fdcef830e22b03bf4b5d58993728cc7475
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1543
Tested-by: jenkins
Diffstat (limited to 'tcl/target/stm32f4x.cfg')
| -rw-r--r-- | tcl/target/stm32f4x.cfg | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tcl/target/stm32f4x.cfg b/tcl/target/stm32f4x.cfg index b5ab2004..eafa1226 100644 --- a/tcl/target/stm32f4x.cfg +++ b/tcl/target/stm32f4x.cfg @@ -1,5 +1,10 @@ # script for stm32f4x family +# +# stm32 devices support both JTAG and SWD transports. +# +source [find target/swj-dp.tcl] + if { [info exists CHIPNAME] } { set _CHIPNAME $CHIPNAME } else { @@ -29,7 +34,9 @@ if { [info exists WORKAREASIZE] } { adapter_khz 1000 adapter_nsrst_delay 100 -jtag_ntrst_delay 100 +if {$using_jtag} { + jtag_ntrst_delay 100 +} #jtag scan chain if { [info exists CPUTAPID] } { @@ -39,7 +46,8 @@ if { [info exists CPUTAPID] } { # Section 38.6.3 - corresponds to Cortex-M4 r0p1 set _CPUTAPID 0x4ba00477 } -jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID + +swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID if { [info exists BSTAPID] } { set _BSTAPID $BSTAPID @@ -51,8 +59,11 @@ if { [info exists BSTAPID] } { # STM32F42xxx and STM32F43xxx set _BSTAPID2 0x06419041 } -jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \ + +if {$using_jtag} { + jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \ -expected-id $_BSTAPID2 +} set _TARGETNAME $_CHIPNAME.cpu target create $_TARGETNAME cortex_m -endian $_ENDIAN -chain-position $_TARGETNAME |