icepick-d: extend access to core control register

[openocd.git] / tcl / target / icepick.cfg

diff --git a/tcl/target/icepick.cfg b/tcl/target/icepick.cfg
index ff73138ccaa2ceec9cac817576f23fbfdc90be06..0f160bb1073c2342391c3ba5cd9c373b8ad83730 100644 (file)
--- 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 } {
@@ -62,7 +63,8 @@ proc icepick_c_router {jrc rw block register payload} {
        irscan $jrc [CONST IR_ROUTER] -endstate IRPAUSE
 
        # ROUTER instructions are 32 bits wide
-       set old_dr_value [drscan $jrc 32 $new_dr_value -endstate DRPAUSE]
+       set old_dr_value 0x[drscan $jrc 32 $new_dr_value -endstate DRPAUSE]
+#      echo "\tOld router value:\t0x[format %x $old_dr_value]"
 }
 
 # Configure the icepick control register
@@ -83,7 +85,7 @@ proc icepick_c_tapenable {jrc port} {
 #      echo "Configuring the ICEpick"
        icepick_c_setup $jrc
 
-       # NOTE:  it's important not to enter RUN/IDLE state until
+       # NOTE: it's important not to enter RUN/IDLE state until
        # done sending these instructions and data to the ICEpick.
        # And never to enter RESET, which will disable the TAPs.
 
@@ -106,6 +108,32 @@ proc icepick_c_tapenable {jrc port} {
        runtest 10
 }
 
+# jrc  == TAP name for the ICEpick
+# coreid== core id number 0..15 (not same as port number!)
+proc icepick_d_set_core_control {jrc coreid value } {
+       icepick_c_router $jrc 1 0x6 $coreid $value
+}
+
+# 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 coreid { value 0x2008 } } {
+       # First CONNECT to the ICEPick
+       icepick_c_connect $jrc
+       icepick_c_setup $jrc
+
+       # Select the port
+       icepick_c_router $jrc 1 0x2 $port 0x2108
+
+       # Set icepick core control for $coreid
+       icepick_d_set_core_control $jrc $coreid $value
+
+       # 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} {