commit 6c9ab8991bca412179fbc3fb4be032e9f1a5321b
author Chris Kay <chris.kay@arm.com> Mon Feb 06 10:43:37 2023 +0000
committer Joanna Farley <joanna.farley@arm.com> Tue Feb 07 11:08:50 2023 +0100
tree d17316071c9423bc6041f88d3d572ca6a4bb5378
parent dbc1a9c057c43c7d694e707cea766088ba1fa389

fix: fix CSS port assignments

The ports currently assigned to the CSS FVPs are incorrect, and cause
LAVA to hang waiting on the wrong terminals.

Change-Id: Ifa2059cf237e47f4febfd8fdc8e3be1a3ef51aea
Signed-off-by: Chris Kay <chris.kay@arm.com>

model/morello.sh

diff --git a/model/morello.sh b/model/morello.sh
index c68c540..eb41d93 100644
--- a/model/morello.sh
+++ b/model/morello.sh
@@ -9,13 +9,14 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_Morello"
 
 cat <<EOF >"$model_param_file"
--C board.terminal_uart0_board.start_port=5000
--C board.terminal_uart1_board.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 css.scp.terminal_uart_aon.start_port=5000
+-C css.mcp.terminal_uart0.start_port=5001
+-C css.mcp.terminal_uart1.start_port=5002
+-C css.terminal_uart_ap.start_port=5003
+-C css.terminal_uart1_ap.start_port=5004
+-C css.terminal_sec_uart_ap.start_port=5005
+-C board.terminal_uart0_board.start_port=5006
+-C board.terminal_uart1_board.start_port=5007
 
 --data Morello_Top.css.scp.armcortexm7ct=$scp_rom_bin@0x0
 --data Morello_Top.css.mcp.armcortexm7ct=$mcp_rom_bin@0x0