[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-918-ga9fa33926

[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  a9fa3392670659dfd558d8733911ffce9538e2d2 (commit)
      from  a86fdfc73548a2b317ed8e61a618ebff2ee4f5e2 (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 a9fa3392670659dfd558d8733911ffce9538e2d2
Author: Marek Vasut <mar...@gm...>
Date:   Fri Aug 23 01:29:12 2024 +0200

    tcl/target: Add Renesas R-Car Gen4 R8A779G0 V4H and R8A779H0 V4M targets
    
    Add support for Renesas R-Car Gen4 R8A779G0 V4H and R8A779H0 V4M SoCs.
    Those contain 4x CA76 and 3x CR52 cores.
    
    Change-Id: I4a701f0fec4dd574fc099a221d464ccc55db6252
    Signed-off-by: Marek Vasut <mar...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8807
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/target/renesas_rcar_gen3.cfg b/tcl/target/renesas_rcar_gen3.cfg
index 73b3003a9..f6bc5e4c8 100644
--- a/tcl/target/renesas_rcar_gen3.cfg
+++ b/tcl/target/renesas_rcar_gen3.cfg
@@ -90,6 +90,18 @@ switch $_soc {
 		set _num_cr52 1
 		set _boot_core CA76
 	}
+	V4H {
+		set _CHIPNAME r8a779g0
+		set _num_ca76 4
+		set _num_cr52 3
+		set _boot_core CR52
+	}
+	V4M {
+		set _CHIPNAME r8a779h0
+		set _num_ca76 4
+		set _num_cr52 3
+		set _boot_core CR52
+	}
 	default {
 		error "'$_soc' is invalid!"
 	}
@@ -126,8 +138,8 @@ set CA57_DBGBASE {0x80410000 0x80510000 0x80610000 0x80710000}
 set CA57_CTIBASE {0x80420000 0x80520000 0x80620000 0x80720000}
 set CA53_DBGBASE {0x80C10000 0x80D10000 0x80E10000 0x80F10000}
 set CA53_CTIBASE {0x80C20000 0x80D20000 0x80E20000 0x80F20000}
-set CR52_DBGBASE 0x80c10000
-set CR52_CTIBASE 0x80c20000
+set CR52_DBGBASE {0x80C10000 0x80D10000 0x80E10000}
+set CR52_CTIBASE {0x80C20000 0x80D20000 0x80E20000}
 set  CR7_DBGBASE 0x80910000
 set  CR7_CTIBASE 0x80918000
 
@@ -159,24 +171,27 @@ proc setup_a5x {core_name dbgbase ctibase num boot} {
 proc setup_crx {core_name dbgbase ctibase num boot} {
 	global _CHIPNAME
 	global _DAPNAME
+	global smp_targets
 	global _targets
 	for { set _core 0 } { $_core < $num } { incr _core } {
-		set _TARGETNAME $_CHIPNAME.$core_name
+		set _TARGETNAME $_CHIPNAME.$core_name.$_core
 		set _CTINAME $_TARGETNAME.cti
-		cti create $_CTINAME -dap $_DAPNAME -ap-num 1 -baseaddr $ctibase
+		cti create $_CTINAME -dap $_DAPNAME -ap-num 1 -baseaddr [lindex $ctibase $_core]
 		if { $core_name == "r52" } {
 			set _command "target create $_TARGETNAME armv8r -dap $_DAPNAME \
-				-ap-num 1 -dbgbase $dbgbase -cti $_CTINAME"
+				-ap-num 1 -dbgbase [lindex $dbgbase $_core] -cti $_CTINAME"
 		} else {
 			set _command "target create $_TARGETNAME cortex_r4 -dap $_DAPNAME \
-				-ap-num 1 -dbgbase $dbgbase"
+				-ap-num 1 -dbgbase [lindex $dbgbase $_core]"
 		}
-		if { $boot == 1 } {
+		if { $_core == 0 && $boot == 1 } {
 			set _targets "$_TARGETNAME"
 		} else {
 			set _command "$_command -defer-examine"
 		}
+		set smp_targets "$smp_targets $_TARGETNAME"
 		eval $_command
+		$_TARGETNAME configure -event examine-end { halt }
 	}
 }
 

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

Summary of changes:
 tcl/target/renesas_rcar_gen3.cfg | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository