platform/rd: adapt to changes in cmn model parameters

The location of the RNSAM (internal or externa) can be specified using
model parameters. Due to changes in the names of the model parameters
used to specify the location of the RNSAM, adapt the model launch
scripts for the same.

Change-Id: Ia2f61b4d17264df0a2ab9149d2ca998b51521c7b
Signed-off-by: Vijayenthiran Subramaniam <vijayenthiran.subramaniam@arm.com>

rdinfra/platforms/rddaniel/run_model.sh

@@ -248,7 +248,6 @@ echo
 
 # print the model version.
 ${MODEL} --version
-export FASTSIM_CMN_INTERNAL_RNSAM=1
 
 TZC_BYPASS_PARAMS=" \
 	-C css.mem.tzc0.tzc400.rst_gate_keeper=0x0f                \
@@ -266,7 +265,7 @@ TZC_BYPASS_PARAMS=" \
 	"
 
 PARAMS="-C css.cmn_rhodes.mesh_config_file=$PATH_TO_MODEL/rhodes_daniel_cfgm.yml \
-	-C css.cmn_rhodes.force_on_from_start=1 \
+	-C css.cmn_rhodes.force_rnsam_internal=true \
 	--data css.scp.armcortexm7ct=$OUTDIR/scp_ramfw.bin@0x0BD80000 \
 	-C css.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
 	-C css.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \

rdinfra/platforms/rddanielxlr/run_model.sh

@@ -278,7 +278,6 @@ echo
 
 # print the model version.
 ${MODEL} --version
-export FASTSIM_CMN_INTERNAL_RNSAM=1
 
 TZC_BYPASS_PARAMS=" \
 	-C css0.mem.tzc0.tzc400.rst_gate_keeper=0x0f                \
@@ -380,8 +379,8 @@ TZC_BYPASS_PARAMS=" \
 	"
 
 PARAMS=" \
-	-C css0.cmn_rhodes.force_on_from_start=1 \
 	--data css0.scp.armcortexm7ct=$OUTDIR/scp_ramfw.bin@0x0BD80000 \
+	-C css0.cmn_rhodes.force_rnsam_internal=true \
 	-C css0.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
 	-C css0.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \
 	-C css0.trustedBootROMloader.fname=$OUTDIR/$BL1_IMAGE \
@@ -403,8 +402,8 @@ PARAMS=" \
 	-C soc0.pl011_uart1.unbuffered_output=1 \
 	-C css0.pl011_uart_ap.unbuffered_output=1 \
 
-	-C css1.cmn_rhodes.force_on_from_start=1 \
 	--data css1.scp.armcortexm7ct=$OUTDIR/scp_ramfw.bin@0x0BD80000 \
+	-C css1.cmn_rhodes.force_rnsam_internal=true \
 	-C css1.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
 	-C css1.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \
 	-C css1.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME}_1 \
@@ -416,8 +415,8 @@ PARAMS=" \
 	-C soc1.pl011_uart1.unbuffered_output=1 \
 	-C css1.pl011_uart_ap.unbuffered_output=1 \
 
-	-C css2.cmn_rhodes.force_on_from_start=1 \
 	--data css2.scp.armcortexm7ct=$OUTDIR/scp_ramfw.bin@0x0BD80000 \
+	-C css2.cmn_rhodes.force_rnsam_internal=true \
 	-C css2.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
 	-C css2.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \
 	-C css2.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME}_2 \
@@ -429,8 +428,8 @@ PARAMS=" \
 	-C soc2.pl011_uart1.unbuffered_output=1 \
 	-C css2.pl011_uart_ap.unbuffered_output=1 \
 
-	-C css3.cmn_rhodes.force_on_from_start=1 \
 	--data css3.scp.armcortexm7ct=$OUTDIR/scp_ramfw.bin@0x0BD80000 \
+	-C css3.cmn_rhodes.force_rnsam_internal=true \
 	-C css3.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
 	-C css3.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \
 	-C css3.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME}_3 \

rdinfra/platforms/rde1edge/run_model.sh

@@ -250,7 +250,7 @@ echo
 ${MODEL} --version
 
 PARAMS="-C css.cmn600.mesh_config_file=$PATH_TO_MODEL/RD_N1_E1_cmn600.yml \
-	-C css.cmn600.force_on_from_start=1 \
+	-C css.cmn600.force_rnsam_internal=false
 	--data css.scp.armcortexm7ct=$OUTDIR/scp_ramfw.bin@0x0BD80000 \
 	-C css.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
 	-C css.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \

rdinfra/platforms/rdn1edge/run_model.sh

@@ -250,7 +250,7 @@ echo
 ${MODEL} --version
 
 PARAMS="-C css.cmn600.mesh_config_file=$PATH_TO_MODEL/RD_N1_E1_cmn600.yml \
-	-C css.cmn600.force_on_from_start=1 \
+	-C css.cmn600.force_rnsam_internal=false \
 	--data css.scp.armcortexm7ct=$OUTDIR/scp_ramfw.bin@0x0BD80000 \
 	-C css.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
 	-C css.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \

rdinfra/platforms/rdn1edgex2/run_model.sh

@@ -273,8 +273,8 @@ echo
 ${MODEL} --version
 
 PARAMS=" \
-	-C css0.cmn600.mesh_config_file=$PATH_TO_MODEL/RD_N1_E1_cmn600_ccix.yml \
-	-C css0.cmn600.force_on_from_start=1 \
+	-C css0.cmn600.mesh_config_file=$PATH_TO_MODEL/RD_N1_E1_cmn600.yml \
+	-C css0.cmn600.force_rnsam_internal=false \
 	--data css0.scp.armcortexm7ct=$OUTDIR/scp_ramfw.bin@0x0BD80000 \
 	-C css0.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
 	-C css0.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \
@@ -295,8 +295,8 @@ PARAMS=" \
 	-C soc0.pl011_uart1.unbuffered_output=1 \
 	-C css0.pl011_uart_ap.unbuffered_output=1 \
 
-	-C css1.cmn600.mesh_config_file=$PATH_TO_MODEL/RD_N1_E1_cmn600_ccix.yml \
-	-C css1.cmn600.force_on_from_start=1 \
+	-C css1.cmn600.mesh_config_file=$PATH_TO_MODEL/RD_N1_E1_cmn600.yml \
+	-C css1.cmn600.force_rnsam_internal=false \
 	--data css1.scp.armcortexm7ct=$OUTDIR/scp_ramfw.bin@0x0BD80000 \
 	-C css1.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
 	-C css1.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \

sgi/platforms/sgi575/run_model.sh

@@ -230,7 +230,7 @@ echo
 ${MODEL} --version
 
 PARAMS="-C css.cmn600.mesh_config_file=\"$PATH_TO_MODEL/SGI-575_cmn600.yml\" \
-	-C css.cmn600.force_on_from_start=1 \
+	-C css.cmn600.force_rnsam_internal=false \
 	--data css.scp.armcortexm7ct=$OUTDIR/scp_ramfw.bin@0x0BD80000 \
 	-C css.mcp.ROMloader.fname=\"$OUTDIR/mcp_romfw.bin\" \
 	-C css.scp.ROMloader.fname=\"$OUTDIR/scp_romfw.bin\" \