X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=tcl%2Ftarget%2Fstm32l1.cfg;h=13487c4e289cea7a55e140893988d98ccfea5824;hp=8591830cc176d0d8ca41afa5fbb1c0c82fc77e84;hb=f7394049d3a6a932003edf5fa35d10fe8bc17352;hpb=a20db2d205077c9f41ee79f83ad1984bac98716c

diff --git a/tcl/target/stm32l1.cfg b/tcl/target/stm32l1.cfg
index 8591830cc1..13487c4e28 100644
--- a/tcl/target/stm32l1.cfg
+++ b/tcl/target/stm32l1.cfg
@@ -49,21 +49,24 @@ if { [info exists BSTAPID] } {
    # FIXME this never gets used to override defaults...
    set _BSTAPID $BSTAPID
 } else {
-   # See STM Document RM0038 Section 30.6.1
-   # (section 30.6.2 seems incorrect, at least in RM0038 DocID 15965 Rev 10)
+   # See STM Document RM0038 Section 30.6.1 Rev. 12
 
    # Low and medium density
    set _BSTAPID1 0x06416041
+   # Cat.2 device (medium+ density)
+   set _BSTAPID2 0x06429041
    # Cat.3 device (medium+ density)
-   set _BSTAPID2 0x06427041
+   set _BSTAPID3 0x06427041
    # Cat.4 device, STM32L15/6xxD or Cat.3 device, some STM32L15/6xxC-A models
-   set _BSTAPID3 0x06436041
+   set _BSTAPID4 0x06436041
    # Cat.5 device (high density), STM32L15/6xxE
-   set _BSTAPID4 0x06437041
+   set _BSTAPID5 0x06437041
 }
 
 if {[using_jtag]} {
-   swj_newdap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 -expected-id $_BSTAPID4
+   swj_newdap $_CHIPNAME bs -irlen 5 \
+   -expected-id $_BSTAPID1 -expected-id $_BSTAPID2 expected-id $_BSTAPID3 \
+   -expected-id $_BSTAPID4 -expected-id $_BSTAPID5
 }
 
 set _TARGETNAME $_CHIPNAME.cpu