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-rdn1edgex2.sh b/model/css-rdn1edgex2.sh
index d0203ab..62e1919 100644
--- a/model/css-rdn1edgex2.sh
+++ b/model/css-rdn1edgex2.sh
@@ -8,6 +8,26 @@
set_model_path "$warehouse/SysGen/SubSystemModels/11.17/33/models/$model_flavour/FVP_RD_N1_edge_dual"
cat <<EOF >"$model_param_file"
+-C board0.terminal_0.start_port=5000
+-C board0.terminal_1.start_port=5001
+-C board1.terminal_0.start_port=5002
+-C board1.terminal_1.start_port=5003
+-C css0.mcp.terminal_uart0.start_port=5004
+-C css0.mcp.terminal_uart1.start_port=5005
+-C css0.scp.terminal_uart_aon.start_port=5006
+-C css0.terminal_uart1_ap.start_port=5007
+-C css0.terminal_uart_ap.start_port=5008
+-C css1.mcp.terminal_uart0.start_port=5009
+-C css1.mcp.terminal_uart1.start_port=5010
+-C css1.scp.terminal_uart_aon.start_port=5011
+-C css1.terminal_uart1_ap.start_port=5012
+-C css1.terminal_uart_ap.start_port=5013
+-C soc0.terminal_mcp.start_port=5014
+-C soc0.terminal_s0.start_port=5015
+-C soc0.terminal_s1.start_port=5016
+-C soc1.terminal_mcp.start_port=5017
+-C soc1.terminal_s0.start_port=5018
+-C soc1.terminal_s1.start_port=5019
-C board0.flashloader0.fname=$fip_bin
-C board0.virtioblockdevice.image_path=$busybox_bin