fix: track primary UART instead of using timeouts
Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: I0c3e265020e757f41a4dba6dac242ea5f2139b40
diff --git a/script/lava-templates/fvp-linux.yaml b/script/lava-templates/fvp-linux.yaml
index a0acc6e..2203d1b 100644
--- a/script/lava-templates/fvp-linux.yaml
+++ b/script/lava-templates/fvp-linux.yaml
@@ -62,11 +62,19 @@
local: true
image: ${model_dir}/${model_bin}
version_string: ${version_string}
- console_string: 'terminal_0: Listening for serial connection on port (?P<PORT>\d+)'
+ console_string: '${ports[${payload_uart:?}]:?}: Listening for serial connection on port (?P<PORT>\d+)'
feedbacks:
- - '(?P<NAME>terminal_1): Listening for serial connection on port (?P<PORT>\d+)'
- - '(?P<NAME>terminal_2): Listening for serial connection on port (?P<PORT>\d+)'
- - '(?P<NAME>terminal_3): Listening for serial connection on port (?P<PORT>\d+)'
+
+$(for port in "${ports[@]}"; do
+ if [ "${port}" = "${ports[${payload_uart}]}" ]; then
+ continue
+ fi
+
+ cat <<-YAML
+ - '(?P<NAME>${port}): Listening for serial connection on port (?P<PORT>\d+)'
+ YAML
+done)
+
timeout:
minutes: 30
arguments: