X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Ftarget%2Ffm4.cfg;h=bfe7115ca7192dc90ce7b04131cda4c142fd38b5;hb=3359419e6a121e73361c74fcae08999aa85330da;hp=dcf0601f017ae527ce028c35590c59e66dc9d873;hpb=fd23fb4c6e023b688fdb67987c885b52545a9f41;p=fw%2Fopenocd

diff --git a/tcl/target/fm4.cfg b/tcl/target/fm4.cfg
index dcf0601f0..bfe7115ca 100644
--- a/tcl/target/fm4.cfg
+++ b/tcl/target/fm4.cfg
@@ -12,16 +12,19 @@ source [find target/swj-dp.tcl]
 
 if { [info exists CPUTAPID] } {
 	set _CPU_TAPID $CPUTAPID
+} elseif { [using_jtag] } {
+	set _CPU_TAPID 0x4ba00477
 } else {
 	set _CPU_TAPID 0x2ba01477
 }
 
 swj_newdap $_CHIPNAME cpu -irlen 4 -expected-id $_CPU_TAPID
+dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m -endian little -chain-position $_TARGETNAME
+target create $_TARGETNAME cortex_m -endian little -dap $_CHIPNAME.dap
 
-adapter_khz 500
+adapter speed 500
 
 if {![using_hla]} {
 	cortex_m reset_config sysresetreq