X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Ftarget%2Ffm3.cfg;h=544cff9d6a088e5a53f6768149543ca8efea33eb;hb=5b70c1f679755677c925b4e6dd2c3d8be4715717;hp=78bbc945cea63967e767307fda1c6947214de638;hpb=0c8ec7c826c60391034fe5f0ea90f8538ac94b38;p=fw%2Fopenocd

diff --git a/tcl/target/fm3.cfg b/tcl/target/fm3.cfg
index 78bbc945c..544cff9d6 100644
--- a/tcl/target/fm3.cfg
+++ b/tcl/target/fm3.cfg
@@ -22,7 +22,7 @@ if { [info exists CPUTAPID] } {
 }
 
 # delays on reset lines
-adapter_nsrst_delay 100
+adapter srst delay 100
 if {[using_jtag]} {
    jtag_ntrst_delay 100
 }
@@ -31,20 +31,21 @@ if {[using_jtag]} {
 reset_config trst_only
 
 swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m -endian $_ENDIAN -chain-position $_TARGETNAME
+target create $_TARGETNAME cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap
 
-# MB9BF506 has 64kB of SRAM on its main system bus 
+# MB9BF506 has 64kB of SRAM on its main system bus
 $_TARGETNAME configure -work-area-phys 0x1FFF8000 -work-area-size 0x10000 -work-area-backup 0
 
-# MB9BF506 has 512kB internal FLASH 
+# MB9BF506 has 512kB internal FLASH
 
 set _FLASHNAME $_CHIPNAME.flash
 flash bank $_FLASHNAME fm3 0 0 0 0 $_TARGETNAME
 
 # 4MHz / 6 = 666kHz, so use 500
-adapter_khz 500
+adapter speed 500
 
 if {![using_hla]} {
    # if srst is not fitted use SYSRESETREQ to