diff --git a/tcl/board/renesas_salvator-xs.cfg b/tcl/board/renesas_salvator-xs.cfg
index e6f4da337..6d3096ec1 100644
--- 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 9f7421d91..91baa6c90 100644
--- 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 34c191827..72f185d61 100644
--- 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/board/renesas_gen2_common.cfg b/tcl/target/renesas_rcar_reset_common.cfg
similarity index 100%
rename from tcl/board/renesas_gen2_common.cfg
rename to tcl/target/renesas_rcar_reset_common.cfg