fix: specify FVP start ports explicitly
This change ensures that every supported FVP is explicit about the ports
that it will try to bind to. This is a mitigation against the
sometimes-random order in which terminals are enumerated by the various
FVPs, which causes our LAVA tests to attempt to read from the wrong
terminal.
Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: Ida12fcdae988fe119226c05032c90387e574727b
(cherry picked from commit 30120b38df617c05307ee42f46bc6f5db5d7f568)
diff --git a/model/css-rde1edge.sh b/model/css-rde1edge.sh
index 340d9bb..7b0dbd2 100644
--- a/model/css-rde1edge.sh
+++ b/model/css-rde1edge.sh
@@ -8,6 +8,17 @@
set_model_path "$warehouse/SysGen/SubSystemModels/11.17/29/models/$model_flavour/FVP_RD_E1_edge"
cat <<EOF >"$model_param_file"
+-C board.terminal_0.start_port=5000
+-C board.terminal_1.start_port=5001
+-C css.mcp.terminal_uart0.start_port=5002
+-C css.mcp.terminal_uart1.start_port=5003
+-C css.scp.terminal_uart_aon.start_port=5004
+-C css.terminal_uart1_ap.start_port=5005
+-C css.terminal_uart_ap.start_port=5006
+-C soc.terminal_mcp.start_port=5007
+-C soc.terminal_s0.start_port=5008
+-C soc.terminal_s1.start_port=5009
+
-C board.flashloader0.fname=$fip_bin
-C css.cmn600.force_rnsam_internal=false
-C css.cmn600.mesh_config_file=RD_N1_E1_cmn600.yml