This is an automated email from Gerrit.

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

-- gerrit

commit 2473d691348eb80476225502158c53fcc54113c0
Author: Matthias Welwarsky <[email protected]>
Date:   Tue Oct 13 12:02:58 2015 +0200

    AM335x: allow simultaneous debugging of A8 and M3 cores
    
    This patch fixes the tap order so that it matches the actual jtag
    chain when all taps are enabled. It also introduces a variable
    DEFAULT_TAPS that can be set outside of this script, e.g. on the
    command line, to specify which taps are to be enabled on init.
    Lastly, a new debug target "am335x.m3" is added so that the Wakeup-M3
    can be selected for debugging.
    
    Change-Id: Iccf177fda8d5e3737b1b2bb8fd1eaa7d3262ed9f
    Signed-off-by: Matthias Welwarsky <[email protected]>

diff --git a/tcl/target/am335x.cfg b/tcl/target/am335x.cfg
index e20c6f3..a6c5668 100644
--- a/tcl/target/am335x.cfg
+++ b/tcl/target/am335x.cfg
@@ -6,16 +6,14 @@ if { [info exists CHIPNAME] } {
    set _CHIPNAME am335x
 }
 
-#
-# M3 DAP
-#
-if { [info exists M3_DAP_TAPID] } {
-       set _M3_DAP_TAPID $M3_DAP_TAPID
+# set the taps to be enabled by default. this can be overridden
+# by setting DEFAULT_TAPS in a separate configuration file
+# or directly on the command line.
+if { [info exists DEFAULT_TAPS] } {
+  set _DEFAULT_TAPS "$DEFAULT_TAPS"
 } else {
-       set _M3_DAP_TAPID 0x4b6b902f
+  set _DEFAULT_TAPS "$_CHIPNAME.dap"
 }
-jtag newtap $_CHIPNAME m3_dap -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 
$_M3_DAP_TAPID -disable
-jtag configure $_CHIPNAME.m3_dap -event tap-enable "icepick_d_tapenable 
$_CHIPNAME.jrc 11 0"
 
 #
 # Main DAP
@@ -29,6 +27,17 @@ jtag newtap $_CHIPNAME dap -irlen 4 -ircapture 0x1 -irmask 
0xf -expected-id $_DA
 jtag configure $_CHIPNAME.dap -event tap-enable "icepick_d_tapenable 
$_CHIPNAME.jrc 12 0"
 
 #
+# M3 DAP
+#
+if { [info exists M3_DAP_TAPID] } {
+       set _M3_DAP_TAPID $M3_DAP_TAPID
+} else {
+       set _M3_DAP_TAPID 0x4b6b902f
+}
+jtag newtap $_CHIPNAME m3_dap -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 
$_M3_DAP_TAPID -disable
+jtag configure $_CHIPNAME.m3_dap -event tap-enable "icepick_d_tapenable 
$_CHIPNAME.jrc 11 0"
+
+#
 # ICEpick-D (JTAG route controller)
 #
 if { [info exists JRC_TAPID] } {
@@ -37,11 +46,26 @@ if { [info exists JRC_TAPID] } {
    set _JRC_TAPID 0x0b94402f
 }
 jtag newtap $_CHIPNAME jrc -irlen 6 -ircapture 0x1 -irmask 0x3f -expected-id 
$_JRC_TAPID -ignore-version
-jtag configure $_CHIPNAME.jrc -event setup "jtag tapenable $_CHIPNAME.dap"
+jtag configure $_CHIPNAME.jrc -event setup "enable_default_taps 
\"$_DEFAULT_TAPS\" "
 # some TCK tycles are required to activate the DEBUG power domain
 jtag configure $_CHIPNAME.jrc -event post-reset "runtest 100"
 
 #
+# helper function that enables all taps passed as argument
+#
+proc enable_default_taps { all_taps } {
+  foreach tap $all_taps {
+    jtag tapenable $tap
+  }
+}
+
+#
+# Cortex M3 target
+#
+set _TARGETNAME_2 $_CHIPNAME.m3
+target create $_TARGETNAME_2 cortex_m -chain-position $_CHIPNAME.m3_dap
+
+#
 # Cortex A8 target
 #
 set _TARGETNAME $_CHIPNAME.cpu

-- 

------------------------------------------------------------------------------
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to