From c7384117c66e8f18896ca09ab8095d6da16bb1e5 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Sat, 28 Sep 2013 14:23:15 +0400 Subject: Allow transports to override the selected target (hla configs unification) This should allow to share common configs for both regular access and high-level adapters. Use the newly-added functionality in stlink and icdi drivers, amend the configs accordingly. Runtime-tested with a TI tm4c123g board. Change-Id: Ibb88266a4ca25f06f6c073e916c963f017447bad Signed-off-by: Paul Fertser [gus@projectgus.com: context-specific deprecation warnings] Signed-off-by: Angus Gratton [andrew.smirnov@gmail.com: additional nrf51.cfg mods] Signed-off-by: Andrey Smirnov Tested-by: Andrey Skvortsov Reviewed-on: http://openocd.zylin.com/1664 Tested-by: jenkins Reviewed-by: Andreas Fritiofson --- tcl/target/swj-dp.tcl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'tcl/target/swj-dp.tcl') diff --git a/tcl/target/swj-dp.tcl b/tcl/target/swj-dp.tcl index 2fa82ed3..4f2b4969 100644 --- a/tcl/target/swj-dp.tcl +++ b/tcl/target/swj-dp.tcl @@ -24,7 +24,13 @@ if [catch {transport select}] { } proc swj_newdap {chip tag args} { - if {[using_jtag]} { eval jtag newtap $chip $tag $args } - if {[using_swd]} { eval swd newdap $chip $tag $args } - if {[string equal [transport select] "cmsis-dap"]} { eval cmsis-dap 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 + } } -- cgit v1.2.3-18-g5258