ARM11: ETM + ETB support

[fw/openocd] / tcl / target / stm32.cfg

diff --git a/tcl/target/stm32.cfg b/tcl/target/stm32.cfg
index a37e73341cb4708297f6bec1eb24109a0b1ced67..242bbbee7bfba0939df6b974981cf791af3efc9b 100644 (file)
--- a/tcl/target/stm32.cfg
+++ b/tcl/target/stm32.cfg
@@ -26,9 +26,6 @@ jtag_khz 1000
 jtag_nsrst_delay 100
 jtag_ntrst_delay 100
 
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config trst_and_srst
-
 #jtag scan chain
 if { [info exists CPUTAPID ] } {
    set _CPUTAPID $CPUTAPID
@@ -40,10 +37,11 @@ if { [info exists CPUTAPID ] } {
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 if { [info exists BSTAPID ] } {
+   # FIXME this never gets used to override defaults...
    set _BSTAPID $BSTAPID
 } else {
   # See STM Document RM0008
-  # Section 26.6.2
+  # Section 29.6.2
   # Low density devices, Rev A
   set _BSTAPID1 0x06412041
   # Medium density devices, Rev A
@@ -55,14 +53,16 @@ if { [info exists BSTAPID ] } {
   # Connectivity line devices, Rev A and Rev Z
   set _BSTAPID5 0x06418041
 }
-jtag newtap $_CHIPNAME bs  -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BSTAPID1 -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 -expected-id $_BSTAPID4 -expected-id $_BSTAPID5
+jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
+       -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 \
+       -expected-id $_BSTAPID4 -expected-id $_BSTAPID5
 
 set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME
 
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
+$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
 
-flash bank stm32x 0 0 0 0 0
+flash bank stm32x 0 0 0 0 $_TARGETNAME
 
 # For more information about the configuration files, take a look at:
 # openocd.texi