Add more STM32F3 IDs in target/stm32f3.cfg.

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

diff --git a/tcl/target/stm32f3x.cfg b/tcl/target/stm32f3x.cfg
index 9547d8437c6371f2aa839a43c100d99d92bb6047..318d96c656c12b370a3b95d13e4adde37a9efa2d 100644 (file)
--- a/tcl/target/stm32f3x.cfg
+++ b/tcl/target/stm32f3x.cfg
@@ -52,14 +52,26 @@ swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPU
 if { [info exists BSTAPID] } {
    set _BSTAPID $BSTAPID
 } else {
-  # STM Document RM0316 rev 2 Section 30.6.2 says 0x06432041
-  # but STM32F303VCT6 rev Y has 0x06422041
+  # STM Document RM0316 rev 5 for STM32F302/303 B/C size
   set _BSTAPID1 0x06422041
+  # STM Document RM0313 rev 3 for STM32F37x
   set _BSTAPID2 0x06432041
+  # STM Document RM0313 rev 3 for STM32F37x Chip Revision 1.0
+  set _BSTAPID3 0x06422041
+  #  STM Document RM364 rev 1 for STM32F334
+  set _BSTAPID4 0x06438041
+  #  STM Document RM316 rev 5 for STM32F303 6/8 size
+  #  STM Document RM365 rev 3 for STM32F302 6/8 size
+  #  STM Document RM366 rev 2 for STM32F301 6/8 size
+  set _BSTAPID5 0x06439041
+  #  STM Document RM016 rev 5 for STM32F303 D/E size
+  set _BSTAPID6 0x06446041
 }
 
 if {[using_jtag]} {
- swj_newdap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 -expected-id $_BSTAPID2
+ swj_newdap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
+ -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 -expected-id $_BSTAPID4 \
+ -expected-id $_BSTAPID5 -expected-id $_BSTAPID6
 }
 
 set _TARGETNAME $_CHIPNAME.cpu