tcl/target: Unify Renesas R-Car JTAG reset config

Both Gen2 and Gen3 used the same init_reset{} implementation,
pull it into common file and include it from both generations.
Moreover, this behavior is SoC specific, not board specific,
so move the common init_reset into target/ directory.

Change-Id: I5489a4bff9a786da8cb7fd7a515b0c9ce9dc16e3
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Reviewed-on: http://openocd.zylin.com/5400
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>

diff --git a/tcl/board/renesas_gen2_common.cfg b/tcl/board/renesas_gen2_common.cfg
deleted file mode 100644 (file)
index 3e4579b..0000000
--- a/tcl/board/renesas_gen2_common.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-# Renesas R-Car Gen2 Evaluation Board common settings
-
-reset_config trst_and_srst srst_nogate
-
-proc init_reset {mode} {
-    # Assert both resets: equivalent to a power-on reset
-    adapter assert trst assert srst
-
-    # Deassert TRST to begin TAP communication
-    adapter deassert trst assert srst
-
-    # TAP should now be responsive, validate the scan-chain
-    jtag arp_init
-}

diff --git a/tcl/board/renesas_salvator-xs.cfg b/tcl/board/renesas_salvator-xs.cfg
index e6f4da337b9362e640bdf560b4a6d9e9a3840714..6d3096ec1aa301cee64175f6dc6bdd2d58598b83 100644 (file)
--- a/tcl/board/renesas_salvator-xs.cfg
+++ b/tcl/board/renesas_salvator-xs.cfg
@@ -7,17 +7,3 @@ if { ![info exists SOC] } {
        set SOC H3
 }
 source [find target/renesas_rcar_gen3.cfg]
-
-reset_config trst_and_srst srst_nogate
-
-proc init_reset {mode} {
-       # Assert both resets: equivalent to a power-on reset
-       adapter assert trst assert srst
-
-       # Deassert TRST to begin TAP communication
-       adapter deassert trst assert srst
-
-       # TAP should now be responsive, validate the scan-chain
-       jtag arp_init
-}
-

diff --git a/tcl/target/renesas_rcar_gen2.cfg b/tcl/target/renesas_rcar_gen2.cfg
index 9f7421d914e2813971cc69f2d25f153734293751..91baa6c908202459506092a624e7ef2e90a2cc57 100644 (file)
--- a/tcl/target/renesas_rcar_gen2.cfg
+++ b/tcl/target/renesas_rcar_gen2.cfg
@@ -120,4 +120,6 @@ if { [string equal $_boot_core CA15] } {
        setup_ca a7  $CA7_DBGBASE  $_num_ca7 0
 }
 
+source [find target/renesas_rcar_reset_common.cfg]
+
 eval "target smp $smp_targets"

diff --git a/tcl/target/renesas_rcar_gen3.cfg b/tcl/target/renesas_rcar_gen3.cfg
index 34c191827b4e5ab3553468b10187d7421f30c68e..72f185d61bf1af43fbfff6f48a1b9a9f5312e0dd 100644 (file)
--- a/tcl/target/renesas_rcar_gen3.cfg
+++ b/tcl/target/renesas_rcar_gen3.cfg
@@ -166,4 +166,6 @@ if { [string equal $_boot_core CA57] } {
        setup_a5x a53 $CA53_DBGBASE $CA53_CTIBASE $_num_ca53 0
 }
 
+source [find target/renesas_rcar_reset_common.cfg]
+
 eval "target smp $smp_targets"

diff --git a/tcl/target/renesas_rcar_reset_common.cfg b/tcl/target/renesas_rcar_reset_common.cfg
new file mode 100644 (file)
index 0000000..3e4579b
--- /dev/null
+++ b/tcl/target/renesas_rcar_reset_common.cfg
@@ -0,0 +1,14 @@
+# Renesas R-Car Gen2 Evaluation Board common settings
+
+reset_config trst_and_srst srst_nogate
+
+proc init_reset {mode} {
+    # Assert both resets: equivalent to a power-on reset
+    adapter assert trst assert srst
+
+    # Deassert TRST to begin TAP communication
+    adapter deassert trst assert srst
+
+    # TAP should now be responsive, validate the scan-chain
+    jtag arp_init
+}