stm32l: split l0/l1 support no jtag, different HSI settings

[openocd.git] / tcl / target / stm32l1.cfg

diff --git a/tcl/target/stm32l.cfg b/tcl/target/stm32l1.cfg
similarity index 85%
rename from tcl/target/stm32l.cfg
rename to tcl/target/stm32l1.cfg
index 8f6d90550a6bf335f7bf71dac8001f212a778d80..8b83d3f36c402176f10557bf81280027a4481581 100644 (file)
--- a/tcl/target/stm32l.cfg
+++ b/tcl/target/stm32l1.cfg
@@ -1,8 +1,7 @@
-# script for stm32l
-
 #
-# stm32 devices support both JTAG and SWD transports.
+# stm32l1 devices support both JTAG and SWD transports.
 #
+
 source [find target/swj-dp.tcl]
 
 if { [info exists CHIPNAME] } {
@@ -42,17 +41,13 @@ if { [info exists CPUTAPID] } {
       # See STM Document RM0038
       # Section 30.6.3 - corresponds to Cortex-M3 r2p0
       set _CPUTAPID 0x4ba00477
-   } {
-      set _CPUTAPID1 0x2ba01477
-      set _CPUTAPID2 0x0bc11477
+   } else {
+      # SWD IDCODE (single drop, arm)
+      set _CPUTAPID 0x2ba01477
    }
 }
 
-if { [using_jtag] } {
-   swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-} else {
-   swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID1 -expected-id $_CPUTAPID2
-}
+swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 if { [info exists BSTAPID] } {
    # FIXME this never gets used to override defaults...
@@ -93,13 +88,13 @@ if {![using_hla]} {
 proc stm32l_enable_HSI {} {
        # Enable HSI as clock source
        echo "STM32L: Enabling HSI"
-       
+
        # Set HSION in RCC_CR
        mww 0x40023800 0x00000101
-       
+
        # Set HSI as SYSCLK
        mww 0x40023808 0x00000001
-       
+
        # Increase JTAG speed
        adapter_khz 2000
 }