This is an automated email from Gerrit.

Tom Rini ([email protected]) just uploaded a new patch set to Gerrit, which you can 
find at http://openocd.zylin.com/2015

-- gerrit

commit 163fadff53a55c5e0fb98d1ef0e3a01fe6365870
Author: Felipe Balbi <[email protected]>
Date:   Fri Feb 28 18:22:35 2014 -0600

    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: I81510a905ff8b862cb1be1e49f4d565f9244caac
    Signed-off-by: Felipe Balbi <[email protected]>
    Signed-off-by: Tom Rini <[email protected]>

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..0587a62 100644
--- a/tcl/target/icepick.cfg
+++ b/tcl/target/icepick.cfg
@@ -106,6 +106,25 @@ proc icepick_c_tapenable {jrc port} {
        runtest 10
 }
 
+# jrc  == TAP name for the ICEpick
+# port == a port number, 0..15
+proc icepick_d_tapenable {jrc port} {
+       # select router, same as C
+       icepick_c_connect $jrc
+
+       # set ip control
+       irscan $jrc [CONST IR_ROUTER] -endstate IRPAUSE
+       drscan $jrc 32 [expr 0xa0002108 + ($port << 24)] -endstate DRPAUSE
+
+       # for icepick_D
+       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} {
 

-- 

------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works. 
Faster operations. Version large binaries.  Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to