aboutsummaryrefslogtreecommitdiff
path: root/tcl
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2014-02-28 18:22:35 -0600
committerSpencer Oliver <spen@spen-soft.co.uk>2014-03-17 12:53:02 +0000
commit3201a104fe198fc40f515a99ea56621f90302e2b (patch)
tree6f64c17cda399511543049115d6c4fcffa206554 /tcl
parent8d8937359606a56f1cda19d858a4edcda93eacb9 (diff)
downloadriscv-openocd-3201a104fe198fc40f515a99ea56621f90302e2b.zip
riscv-openocd-3201a104fe198fc40f515a99ea56621f90302e2b.tar.gz
riscv-openocd-3201a104fe198fc40f515a99ea56621f90302e2b.tar.bz2
tcl: target: icepick: add icepick_d_tapenable procedure
instead of replicating icepick_d_tapenable in many of TI's newer platforms, we can move to icepick.cfg and just call it from board TCL configuration file. This is similar to the C but has a few changes we need to make. Change-Id: I0ab48005ccd66cd5b67b919fb5e3b462288f211d Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Tom Rini <trini@ti.com> Reviewed-on: http://openocd.zylin.com/2030 Tested-by: jenkins Reviewed-by: Paul Fertser <fercerpav@gmail.com>
Diffstat (limited to 'tcl')
-rw-r--r--tcl/target/am335x.cfg21
-rw-r--r--tcl/target/icepick.cfg26
2 files changed, 25 insertions, 22 deletions
diff --git a/tcl/target/am335x.cfg b/tcl/target/am335x.cfg
index af06f79..6fad92c 100644
--- a/tcl/target/am335x.cfg
+++ b/tcl/target/am335x.cfg
@@ -1,3 +1,4 @@
+source [find target/icepick.cfg]
if { [info exists CHIPNAME] } {
set _CHIPNAME $CHIPNAME
@@ -5,26 +6,6 @@ if { [info exists CHIPNAME] } {
set _CHIPNAME am335x
}
-# This chip contains an IcePick-D JTAG router. The IcePick-C configuration is almost
-# compatible, but it doesn't work. For now, we will just embed the IcePick-D
-# routines here.
-proc icepick_d_tapenable {jrc port} {
- # select router
- irscan $jrc 7 -endstate IRPAUSE
- drscan $jrc 8 0x89 -endstate DRPAUSE
-
- # set ip control
- irscan $jrc 2 -endstate IRPAUSE
- drscan $jrc 32 [expr 0xa0002108 + ($port << 24)] -endstate DRPAUSE
-
- # for icepick_D
- irscan $jrc 2 -endstate IRPAUSE
- drscan $jrc 32 0xe0002008 -endstate DRPAUSE
-
- irscan $jrc 0x3F -endstate RUN/IDLE
- runtest 10
-}
-
#
# M3 DAP
#
diff --git a/tcl/target/icepick.cfg b/tcl/target/icepick.cfg
index 093d209..13a6a51 100644
--- a/tcl/target/icepick.cfg
+++ b/tcl/target/icepick.cfg
@@ -3,8 +3,9 @@
# Copyright (C) 2009 by David Brownell
#
-# Utilities for TI ICEpick-C ... used in DaVinci, OMAP3, and more.
-# Details about the ICEPickC are available in the AM/DM37x document SPRUGN4M
+# Utilities for TI ICEpick-C/D used in most TI SoCs
+# Details about the ICEPick are available in the the TRM for each SoC
+# and http://processors.wiki.ti.com/index.php/ICEPICK
# create "constants"
proc CONST { key } {
@@ -106,6 +107,27 @@ proc icepick_c_tapenable {jrc port} {
runtest 10
}
+# jrc == TAP name for the ICEpick
+# port == a port number, 0..15
+# Follow the sequence described in
+# http://processors.wiki.ti.com/images/f/f6/Router_Scan_Sequence-ICEpick-D.pdf
+proc icepick_d_tapenable {jrc port} {
+ # First CONNECT to the ICEPick
+ icepick_c_connect $jrc
+
+ # Select the port
+ irscan $jrc [CONST IR_ROUTER] -endstate IRPAUSE
+ drscan $jrc 32 [expr 0xa0002108 + ($port << 24)] -endstate DRPAUSE
+
+ # Set 4 bit core ID to the Cortex-A
+ irscan $jrc [CONST IR_ROUTER] -endstate IRPAUSE
+ drscan $jrc 32 0xe0002008 -endstate DRPAUSE
+
+ # Enter the bypass state
+ irscan $jrc [CONST IF_BYPASS] -endstate RUN/IDLE
+ runtest 10
+}
+
# This function uses the ICEPick to send a warm system reset
proc icepick_c_wreset {jrc} {