commit ce3783bdf1ee24423924331e285f0abdebbd32ed
author Leonardo Sandoval <leonardo.sandoval@linaro.org> Fri Mar 05 12:04:02 2021 -0600
committer Leonardo Sandoval <leonardo.sandoval@linaro.org> Thu Mar 11 09:55:09 2021 -0600
tree 74064938d0bc48250f171a3f19f74e410a8a156e
parent 850a486f0de88d75c38c5a16ca05fe4412a4e132

fvp: enable model consoles 1-3

Since LAVA version 2021.01 [1], other model consoles can be opened for
consumption [2], so enable them.

For the case of model/fvp_common.sh removed parameters, uart?.untimed_fifos
and terminal_?.start_telnet, these defaults to 1, so no need to
explicitly set it to 1.

[1] https://git.lavasoftware.org/lava/lava/-/tree/2021.01
[2] https://validation.linaro.org/static/docs/v2/fvp.html?highlight=feedbacks#reading-from-all-model-consoles

Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: Ie4279405e08a6afefb156665031549f132cd6c51

model/fvp_common.sh

diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index f1e126a..608fc66 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -82,22 +82,14 @@
 
 EOF
 
+# OpenCI uses LAVA to launch models, the latter requiring (uart) unbuffered output,
+# otherwise these may get full and models hang.
 if ! is_arm_jenkins_env && not_upon "$local_ci"; then
 	cat <<EOF >>"$model_param_file"
--C bp.pl011_uart0.untimed_fifos=1
--C bp.pl011_uart1.untimed_fifos=1
--C bp.pl011_uart2.untimed_fifos=1
--C bp.pl011_uart3.untimed_fifos=1
-
 -C bp.pl011_uart0.unbuffered_output=1
 -C bp.pl011_uart1.unbuffered_output=1
 -C bp.pl011_uart2.unbuffered_output=1
 -C bp.pl011_uart3.unbuffered_output=1
-
--C bp.terminal_0.start_telnet=1
--C bp.terminal_1.start_telnet=0
--C bp.terminal_2.start_telnet=0
--C bp.terminal_3.start_telnet=0
 EOF
 fi
 

script/gen_fvp_linux_yaml.sh

diff --git a/script/gen_fvp_linux_yaml.sh b/script/gen_fvp_linux_yaml.sh
index 903c48d..76a2032 100755
--- a/script/gen_fvp_linux_yaml.sh
+++ b/script/gen_fvp_linux_yaml.sh
@@ -84,6 +84,10 @@
     image: {BOOT_IMAGE_DIR}/{BOOT_IMAGE_BIN}
     version_string: {BOOT_VERSION_STRING}
     console_string: 'terminal_0: 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+)'
     timeout:
       minutes: 30
     arguments:

script/gen_fvp_tftf_yaml.sh

diff --git a/script/gen_fvp_tftf_yaml.sh b/script/gen_fvp_tftf_yaml.sh
index e5a0c72..b74c20f 100755
--- a/script/gen_fvp_tftf_yaml.sh
+++ b/script/gen_fvp_tftf_yaml.sh
@@ -87,9 +87,10 @@
     image: {BOOT_IMAGE_DIR}/{BOOT_IMAGE_BIN}
     version_string: {BOOT_VERSION_STRING}
     console_string: 'terminal_0: Listening for serial connection on port (?P<PORT>\d+)'
-    timeout:
-      minutes: 30
-
+    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+)'
     arguments:
 {BOOT_ARGUMENTS}