mips_m4k.c: EJTAGBOOT and NORMALBOOT are not supported on EJTAG 2.0

[fw/openocd] / tcl / target / swj-dp.tcl

diff --git a/tcl/target/swj-dp.tcl b/tcl/target/swj-dp.tcl
index 377b7b5f4182f6d77841d30f3186ba914e608539..4f2b49692bb1582351e0ab23a38d22528aac4d2e 100644 (file)
--- a/tcl/target/swj-dp.tcl
+++ b/tcl/target/swj-dp.tcl
@@ -18,8 +18,19 @@
 # split out "chip" and "tag" so we can someday handle
 # them more uniformly irlen too...)
 
+if [catch {transport select}] {
+ echo "Info : session transport was not selected, defaulting to JTAG"
+ transport select jtag
+}
+
 proc swj_newdap {chip tag args} {
-set tran [transport select]
-if [string equal $tran "jtag"] { eval jtag newtap $chip $tag $args}
-if [string equal $tran "swd"] { eval swd newdap $chip $tag $args }
+ if [using_hla] {
+     eval hla newtap $chip $tag $args
+ } elseif [using_jtag] {
+     eval jtag newtap $chip $tag $args
+ } elseif [using_swd] {
+     eval swd newdap $chip $tag $args
+ } elseif [string equal [transport select] "cmsis-dap"] {
+     eval cmsis-dap newdap $chip $tag $args
+ }
 }