X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=tcl%2Ftarget%2Fstm32l1.cfg;h=d4673a100c949497e49b1817ad8c1ffff2361b62;hp=70e51308008473d7b2d316c2ed0bc9b723f54627;hb=3e1dfdcb8531ae684537325ad2c94b845d741085;hpb=0ea9a66239778db6939bd05505f3b580aa313cab

diff --git a/tcl/target/stm32l1.cfg b/tcl/target/stm32l1.cfg
index 70e5130800..d4673a100c 100644
--- a/tcl/target/stm32l1.cfg
+++ b/tcl/target/stm32l1.cfg
@@ -10,11 +10,7 @@ if { [info exists CHIPNAME] } {
    set _CHIPNAME stm32l1
 }
 
-if { [info exists ENDIAN] } {
-   set _ENDIAN $ENDIAN
-} else {
-   set _ENDIAN little
-}
+set _ENDIAN little
 
 # Work-area is a space in RAM used for flash programming
 # By default use 10kB
@@ -53,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
@@ -79,6 +78,8 @@ $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE
 set _FLASHNAME $_CHIPNAME.flash
 flash bank $_FLASHNAME stm32lx 0x08000000 0 0 0 $_TARGETNAME
 
+reset_config srst_nogate
+
 if {![using_hla]} {
    # if srst is not fitted use SYSRESETREQ to
    # perform a soft reset