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/lpc1850.cfg | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'tcl/target/lpc1850.cfg') diff --git a/tcl/target/lpc1850.cfg b/tcl/target/lpc1850.cfg index 94aec38f..a7814037 100644 --- a/tcl/target/lpc1850.cfg +++ b/tcl/target/lpc1850.cfg @@ -1,3 +1,4 @@ +source [find target/swj-dp.tcl] adapter_khz 500 @@ -21,11 +22,13 @@ if { [info exists M3_JTAG_TAPID] } { set _M3_JTAG_TAPID 0x4ba00477 } -jtag newtap $_CHIPNAME m3 -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_M3_JTAG_TAPID +swj_newdap $_CHIPNAME m3 -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_M3_JTAG_TAPID set _TARGETNAME $_CHIPNAME.m3 target create $_TARGETNAME cortex_m -endian $_ENDIAN -chain-position $_TARGETNAME -# if srst is not fitted use SYSRESETREQ to -# perform a soft reset -cortex_m reset_config sysresetreq +if {![using_hla]} { + # if srst is not fitted use SYSRESETREQ to + # perform a soft reset + cortex_m reset_config sysresetreq +} -- cgit v1.2.3-18-g5258