diff --git a/tcl/target/renesas_rcar_gen2.cfg b/tcl/target/renesas_rcar_gen2.cfg
index 91baa6c90..e51b37202 100644
--- a/tcl/target/renesas_rcar_gen2.cfg
+++ b/tcl/target/renesas_rcar_gen2.cfg
@@ -87,12 +87,14 @@ dap create $_DAPNAME -chain-position $_CHIPNAME.cpu
 set CA15_DBGBASE {0x800B0000 0x800B2000 0x800B4000 0x800B6000}
 set CA7_DBGBASE  {0x800F0000 0x800F2000 0x800F4000 0x800F6000}
 
+set _targets ""
 set smp_targets ""
 
 proc setup_ca {core_name dbgbase num boot} {
 	global _CHIPNAME
 	global _DAPNAME
 	global smp_targets
+	global _targets
 	for { set _core 0 } { $_core < $num } { incr _core } {
 		set _TARGETNAME $_CHIPNAME.$core_name.$_core
 		set _CTINAME $_TARGETNAME.cti
@@ -123,3 +125,4 @@ if { [string equal $_boot_core CA15] } {
 source [find target/renesas_rcar_reset_common.cfg]
 
 eval "target smp $smp_targets"
+targets $_targets
diff --git a/tcl/target/renesas_rcar_gen3.cfg b/tcl/target/renesas_rcar_gen3.cfg
index 5738d371c..36e654491 100644
--- a/tcl/target/renesas_rcar_gen3.cfg
+++ b/tcl/target/renesas_rcar_gen3.cfg
@@ -112,12 +112,14 @@ set CA53_CTIBASE {0x80C20000 0x80D20000 0x80E20000 0x80F20000}
 set  CR7_DBGBASE 0x80910000
 set  CR7_CTIBASE 0x80918000
 
+set _targets ""
 set smp_targets ""
 
 proc setup_a5x {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.$_core
 		set _CTINAME $_TARGETNAME.cti
@@ -169,3 +171,4 @@ if { [string equal $_boot_core CA57] } {
 source [find target/renesas_rcar_reset_common.cfg]
 
 eval "target smp $smp_targets"
+targets $_targets