X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=tcl%2Ftarget%2Ficepick.cfg;h=abd7b6a084db6c5468edc49db3acffcaf97241c1;hb=5396ec5dcc64354c8101f8d3f16d498ca3b10326;hp=3a0afdef24ffd34fb36da46d3feb295a19123563;hpb=b6cb48c212680b8b8598227f4e3bab6c6b5a4cd4;p=openocd.git

diff --git a/tcl/target/icepick.cfg b/tcl/target/icepick.cfg
index 3a0afdef24..abd7b6a084 100644
--- a/tcl/target/icepick.cfg
+++ b/tcl/target/icepick.cfg
@@ -107,20 +107,26 @@ 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_coreid {jrc coreid } {
+	icepick_c_router $jrc 1 0x6 $coreid 0x2008
+}
+
 # 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} {
+proc icepick_d_tapenable {jrc port coreid} {
 	# 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 4 bit core ID to the Cortex-A
-	irscan $jrc [CONST IR_ROUTER] -endstate IRPAUSE
-	drscan $jrc 32 0xe0002008 -endstate DRPAUSE
+	icepick_d_set_coreid $jrc $coreid
 
 	# Enter the bypass state
 	irscan $jrc [CONST IF_BYPASS] -endstate RUN/IDLE