This is an automated email from Gerrit.
Paul Fertser (fercer...@gmail.com) just uploaded a new patch set to Gerrit,
which you can find at http://openocd.zylin.com/2003
-- gerrit
commit ccaaacda824e87035c3dbe3a3e72c2aa43c61c13
Author: Paul Fertser <fercer...@gmail.com>
Date: Sat Mar 1 22:40:54 2014 +0400
tcl: introduce using_(jtag|swd|hla) helpers and use them in reset handler
Barely tested with plain SWD transport.
Change-Id: I48b59136bf4294ffed737dba01f1b30ef83aa86b
Signed-off-by: Paul Fertser <fercer...@gmail.com>
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 4153118..94590e1 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -21,7 +21,9 @@ proc jtag_init {} {
# startup (at OpenOCD server startup, when JTAG may not yet work); and
# potentially more (for reset types like cold, warm, etc)
proc init_reset { mode } {
- jtag arp_init-reset
+ if {[using_jtag]} {
+ jtag arp_init-reset
+ }
}
#########
diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index 56fcbaa..e0f7fd0 100644
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -63,7 +63,7 @@ proc ocd_process_reset_inner { MODE } {
# Examine all targets on enabled taps.
foreach t $targets {
- if {[jtag tapisenabled [$t cget -chain-position]]} {
+ if {[using_swd] || [jtag tapisenabled [$t cget
-chain-position]]} {
$t invoke-event examine-start
set err [catch "$t arp_examine"]
if { $err == 0 } {
@@ -79,7 +79,7 @@ proc ocd_process_reset_inner { MODE } {
}
foreach t $targets {
# C code needs to know if we expect to 'halt'
- if {[jtag tapisenabled [$t cget -chain-position]]} {
+ if {[using_swd] || [jtag tapisenabled [$t cget
-chain-position]]} {
$t arp_reset assert $halt
}
}
@@ -94,7 +94,7 @@ proc ocd_process_reset_inner { MODE } {
}
foreach t $targets {
# Again, de-assert code needs to know if we 'halt'
- if {[jtag tapisenabled [$t cget -chain-position]]} {
+ if {[using_swd] || [jtag tapisenabled [$t cget
-chain-position]]} {
$t arp_reset deassert $halt
}
}
@@ -107,7 +107,7 @@ proc ocd_process_reset_inner { MODE } {
# first executing any instructions.
if { $halt } {
foreach t $targets {
- if {[jtag tapisenabled [$t cget -chain-position]] == 0}
{
+ if {[using_jtag] && ![jtag tapisenabled [$t cget
-chain-position]]} {
continue
}
@@ -131,7 +131,7 @@ proc ocd_process_reset_inner { MODE } {
#Pass 2 - if needed "init"
if { 0 == [string compare init $MODE] } {
foreach t $targets {
- if {[jtag tapisenabled [$t cget -chain-position]] == 0}
{
+ if {[using_jtag] && ![jtag tapisenabled [$t cget
-chain-position]]} {
continue
}
@@ -148,6 +148,21 @@ proc ocd_process_reset_inner { MODE } {
}
}
+proc using_jtag {} {
+ set _TRANSPORT [ transport select ]
+ expr { [ string first $_TRANSPORT "jtag" ] != -1 }
+}
+
+proc using_swd {} {
+ set _TRANSPORT [ transport select ]
+ expr { [ string first $_TRANSPORT "swd" ] != -1 }
+}
+
+proc using_hla {} {
+ set _TRANSPORT [ transport select ]
+ expr { [ string first $_TRANSPORT "hla" ] != -1 }
+}
+
#########
# Temporary migration aid. May be removed starting in January 2011.
diff --git a/tcl/target/at91sam4XXX.cfg b/tcl/target/at91sam4XXX.cfg
index cc2941a..1570114 100644
--- a/tcl/target/at91sam4XXX.cfg
+++ b/tcl/target/at91sam4XXX.cfg
@@ -56,7 +56,7 @@ $_TARGETNAME configure -event gdb-flash-erase-start {
adapter_khz 500
adapter_nsrst_delay 100
-if {$using_jtag} {
+if {[using_jtag]} {
jtag_ntrst_delay 100
}
diff --git a/tcl/target/lpc17xx.cfg b/tcl/target/lpc17xx.cfg
index 372107f..266cecb 100644
--- a/tcl/target/lpc17xx.cfg
+++ b/tcl/target/lpc17xx.cfg
@@ -72,7 +72,7 @@ adapter_khz 10
# delays on reset lines
adapter_nsrst_delay 200
-if {$using_jtag} {
+if {[using_jtag]} {
jtag_ntrst_delay 200
}
diff --git a/tcl/target/rtl8186.cfg b/tcl/target/rtl8186.cfg
new file mode 100644
index 0000000..c34b687
--- /dev/null
+++ b/tcl/target/rtl8186.cfg
@@ -0,0 +1,7 @@
+set _CHIPNAME rtl8186
+set _CPUID 0x1528000d
+
+jtag newtap $_CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id
$_CPUID
+
+set _TARGETNAME $_CHIPNAME.cpu
+target create $_TARGETNAME mips_m4k -endian big -chain-position $_TARGETNAME
diff --git a/tcl/target/stm32f1x.cfg b/tcl/target/stm32f1x.cfg
index f32654a..c89a5b5 100644
--- a/tcl/target/stm32f1x.cfg
+++ b/tcl/target/stm32f1x.cfg
@@ -61,7 +61,7 @@ if { [info exists BSTAPID] } {
set _BSTAPID9 0x06428041
}
-if {$using_jtag} {
+if {[using_jtag]} {
jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
-expected-id $_BSTAPID2 -expected-id $_BSTAPID3 \
-expected-id $_BSTAPID4 -expected-id $_BSTAPID5 \
@@ -82,7 +82,7 @@ flash bank $_FLASHNAME stm32f1x 0x08000000 0 0 0 $_TARGETNAME
adapter_khz 1000
adapter_nsrst_delay 100
-if {$using_jtag} {
+if {[using_jtag]} {
jtag_ntrst_delay 100
}
diff --git a/tcl/target/stm32f2x.cfg b/tcl/target/stm32f2x.cfg
index 5022ef7..4e43f0a 100644
--- a/tcl/target/stm32f2x.cfg
+++ b/tcl/target/stm32f2x.cfg
@@ -34,7 +34,7 @@ if { [info exists WORKAREASIZE] } {
adapter_khz 1000
adapter_nsrst_delay 100
-if {$using_jtag} {
+if {[using_jtag]} {
jtag_ntrst_delay 100
}
@@ -58,7 +58,7 @@ if { [info exists BSTAPID] } {
set _BSTAPID 0x06411041
}
-if {$using_jtag} {
+if {[using_jtag]} {
jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID
}
diff --git a/tcl/target/stm32f3x.cfg b/tcl/target/stm32f3x.cfg
index 3d68c4b..ec5941b 100644
--- a/tcl/target/stm32f3x.cfg
+++ b/tcl/target/stm32f3x.cfg
@@ -34,7 +34,7 @@ if { [info exists WORKAREASIZE] } {
adapter_khz 1000
adapter_nsrst_delay 100
-if {$using_jtag} {
+if {[using_jtag]} {
jtag_ntrst_delay 100
}
@@ -58,7 +58,7 @@ if { [info exists BSTAPID] } {
set _BSTAPID2 0x06432041
}
-if {$using_jtag} {
+if {[using_jtag]} {
jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 -expected-id
$_BSTAPID2
}
diff --git a/tcl/target/stm32f4x.cfg b/tcl/target/stm32f4x.cfg
index feca77c..30ec686 100644
--- a/tcl/target/stm32f4x.cfg
+++ b/tcl/target/stm32f4x.cfg
@@ -47,7 +47,7 @@ if { [info exists BSTAPID] } {
set _BSTAPID2 0x06419041
}
-if {$using_jtag} {
+if {[using_jtag]} {
jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
-expected-id $_BSTAPID2
}
@@ -69,7 +69,7 @@ flash bank $_FLASHNAME stm32f2x 0 0 0 0 $_TARGETNAME
adapter_khz 1000
adapter_nsrst_delay 100
-if {$using_jtag} {
+if {[using_jtag]} {
jtag_ntrst_delay 100
}
diff --git a/tcl/target/stm32l.cfg b/tcl/target/stm32l.cfg
index f9f7425..5d6a53e 100644
--- a/tcl/target/stm32l.cfg
+++ b/tcl/target/stm32l.cfg
@@ -30,7 +30,7 @@ if { [info exists WORKAREASIZE] } {
adapter_khz 100
adapter_nsrst_delay 100
-if {$using_jtag} {
+if {[using_jtag]} {
jtag_ntrst_delay 100
}
@@ -54,7 +54,7 @@ if { [info exists BSTAPID] } {
set _BSTAPID 0x06416041
}
-if {$using_jtag} {
+if {[using_jtag]} {
jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID
}
diff --git a/tcl/target/stm32w108xx.cfg b/tcl/target/stm32w108xx.cfg
index 4bc51fc..faea0d8 100644
--- a/tcl/target/stm32w108xx.cfg
+++ b/tcl/target/stm32w108xx.cfg
@@ -38,7 +38,7 @@ if { [info exists ENDIAN] } {
swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id
$_CPUTAPID
-if {$using_jtag} {
+if {[using_jtag]} {
if { [info exists BSTAPID] } {
set _BSTAPID $BSTAPID
jtag newtap $_CHIPNAME bs -irlen 4 -ircapture 0xe -irmask 0xf -expected-id
0x269a862b
diff --git a/tcl/target/swj-dp.tcl b/tcl/target/swj-dp.tcl
index fa44583..bd348e6 100644
--- a/tcl/target/swj-dp.tcl
+++ b/tcl/target/swj-dp.tcl
@@ -18,13 +18,8 @@
# split out "chip" and "tag" so we can someday handle
# them more uniformly irlen too...)
-global using_jtag
-set using_jtag 1
-
proc swj_newdap {chip tag args} {
- global using_jtag
- set tran [transport select]
- if [string equal $tran "jtag"] { eval jtag newtap $chip $tag $args; set
using_jtag 1 }
- if [string equal $tran "swd"] { eval swd newdap $chip $tag $args; set
using_jtag 0 }
- if [string equal $tran "cmsis-dap"] { eval cmsis-dap newdap $chip $tag $args;
set using_jtag 0 }
+ 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 }
}
--
------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
