X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Ftarget%2Fstm32l1.cfg;h=a81d7c7985bc4ddab4e60a8d41a5c037af4a7dd9;hb=e44539d66c8929679321704768125df9ba7d5f67;hp=a8d6fdf257f2a15003b7f4a279d7232a1e0cdb4a;hpb=d3445cd146f8efa6f5bdbd636f51e247ec7de766;p=fw%2Fopenocd

diff --git a/tcl/target/stm32l1.cfg b/tcl/target/stm32l1.cfg
index a8d6fdf25..a81d7c798 100644
--- a/tcl/target/stm32l1.cfg
+++ b/tcl/target/stm32l1.cfg
@@ -23,9 +23,9 @@ if { [info exists WORKAREASIZE] } {
 
 # JTAG speed should be <= F_CPU/6.
 # F_CPU after reset is 2MHz, so use F_JTAG max = 333kHz
-adapter_khz 300
+adapter speed 300
 
-adapter_nsrst_delay 100
+adapter srst delay 100
 if {[using_jtag]} {
  jtag_ntrst_delay 100
 }
@@ -45,13 +45,14 @@ if { [info exists CPUTAPID] } {
 }
 
 swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 if {[using_jtag]} {
    jtag newtap $_CHIPNAME bs -irlen 5
 }
 
 set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m -endian $_ENDIAN -chain-position $_TARGETNAME
+target create $_TARGETNAME cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap
 
 $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
 
@@ -72,13 +73,13 @@ proc stm32l_enable_HSI {} {
 	echo "STM32L: Enabling HSI"
 
 	# Set HSION in RCC_CR
-	mww 0x40023800 0x00000101
+	mmw 0x40023800 0x00000101 0
 
 	# Set HSI as SYSCLK
-	mww 0x40023808 0x00000001
+	mmw 0x40023808 0x00000001 0
 
 	# Increase JTAG speed
-	adapter_khz 2000
+	adapter speed 2000
 }
 
 $_TARGETNAME configure -event reset-init {
@@ -86,7 +87,7 @@ $_TARGETNAME configure -event reset-init {
 }
 
 $_TARGETNAME configure -event reset-start {
-	adapter_khz 300
+	adapter speed 300
 }
 
 $_TARGETNAME configure -event examine-end {