X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=tcl%2Ftarget%2Fstm32.cfg;h=9879c0458f5c93eddd82950c39dba5043ded4ad4;hb=578294dbdd93ab79a6ecc1561c52a974d1b588af;hp=b5a86527e704c82d1c829044a4bccf4f22b64234;hpb=0da0bfd40a0ba46a68a6b9db428700241d2700b1;p=fw%2Fopenocd

diff --git a/tcl/target/stm32.cfg b/tcl/target/stm32.cfg
index b5a86527e..9879c0458 100644
--- a/tcl/target/stm32.cfg
+++ b/tcl/target/stm32.cfg
@@ -21,14 +21,11 @@ if { [info exists WORKAREASIZE] } {
 }
 
 # JTAG speed should be <= F_CPU/6. F_CPU after reset is 8MHz, so use F_JTAG = 1MHz
-jtag_khz 1000
+adapter_khz 1000
 
-jtag_nsrst_delay 100
+adapter_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,29 +37,39 @@ 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
   set _BSTAPID2 0x06410041
   # Medium density devices, Rev B and Rev Z
   set _BSTAPID3 0x16410041
+  set _BSTAPID4 0x06420041
   # High density devices, Rev A
-  set _BSTAPID4 0x06414041
+  set _BSTAPID5 0x06414041
   # Connectivity line devices, Rev A and Rev Z
-  set _BSTAPID5 0x06418041
+  set _BSTAPID6 0x06418041
+  # XL line devices, Rev A
+  set _BSTAPID7 0x06430041
 }
-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 \
+	-expected-id $_BSTAPID6 -expected-id $_BSTAPID7
 
 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 $_TARGETNAME
+# flash size will be probed
+set _FLASHNAME $_CHIPNAME.flash
+flash bank $_FLASHNAME stm32x 0x08000000 0 0 0 $_TARGETNAME
 
-# For more information about the configuration files, take a look at:
-# openocd.texi
+# if srst is not fitted use SYSRESETREQ to
+# perform a soft reset
+cortex_m3 reset_config sysresetreq