[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-432-g5f6b25aa9

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  5f6b25aa91eb81903aed128ee304ffc69e0492f3 (commit)
      from  2bd40b0bf930459f0fc3dbcbde3ac2f40ff56e4e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5f6b25aa91eb81903aed128ee304ffc69e0492f3
Author: Peter Lawrence <maj...@gm...>
Date:   Wed Nov 15 09:58:24 2023 -0600

    tcl/target/at91sama5d2.cfg: allow choice of SWD instead of JTAG
    
    The target supports both SWD and JTAG, but the existing cfg file
    only supports JTAG.  Using the standard [using_jtag] mechanism,
    the user would now have a choice.
    
    Change-Id: Ic6adb68090422812d591f6bf5b945ac10f323c74
    Signed-off-by: Peter Lawrence <maj...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8020
    Reviewed-by: Jörg Wunsch <op...@ur...>
    Reviewed-by: Paul Fertser <fer...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/target/at91sama5d2.cfg b/tcl/target/at91sama5d2.cfg
index 65e5217e1..30ddc92a9 100644
--- a/tcl/target/at91sama5d2.cfg
+++ b/tcl/target/at91sama5d2.cfg
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
+# SAMA5D2 devices support both JTAG and SWD transports.
+#
 # The JTAG connection is disabled at reset, and during the ROM Code execution.
 # It is re-enabled when the ROM code jumps in the boot file copied from an
 # external Flash memory into the internalSRAM, or when the ROM code launches
@@ -12,14 +14,28 @@
 # - if enabled, boundary Scan mode is activated. JTAG ID Code value is 0x05B3F03F.
 # - if disabled, ICE mode is activated. Debug Port JTAG IDCODE value is 0x5BA00477
 #
+
+source [find target/swj-dp.tcl]
+
+#jtag scan chain
+if { [info exists CPUTAPID] } {
+	set _CPUTAPID $CPUTAPID
+} else {
+	if { [using_jtag] } {
+		set _CPUTAPID 0x5ba00477
+	} else {
+		# SWD IDCODE (single drop, arm)
+		set _CPUTAPID 0x5ba02477
+	}
+}
+
 if { [info exists CHIPNAME] } {
 	set  _CHIPNAME $CHIPNAME
 } else {
 	set  _CHIPNAME at91sama5d2
 }
 
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x01 -irmask 0x0f \
-	-expected-id 0x5ba00477
+swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 # Cortex-A5 target
 set _TARGETNAME $_CHIPNAME.cpu_a5

-----------------------------------------------------------------------

Summary of changes:
 tcl/target/at91sama5d2.cfg | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository