ci: expect all boot debug logs on UART0 and crash logs on UART1
Following the modification in commit 0d2228c04e, anticipate that
all boot logs from BL31 will now be directed to the UART0 console.
Additionally, crash logs will continue to be output to the UART1
terminal as usual. Consequently, the corresponding expect scripts
have been updated to align with these adjustments.
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
Change-Id: I319a29596dd6ecd5479fa54e82da3ed0d8b9f799
diff --git a/expect-lava/pmf-tfa-bl31-boot-exit.exp b/expect-lava/pmf-tfa-bl31-boot-exit.exp
deleted file mode 100644
index 68b36d9..0000000
--- a/expect-lava/pmf-tfa-bl31-boot-exit.exp
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Expect script for Trusted Firmware Test Framework
-#
-
-prompt='PMF:cpu 0 tid 5'
-expect_string+=("i;${prompt}")
\ No newline at end of file
diff --git a/expect-lava/pmf-tfa-boot.exp b/expect-lava/pmf-tfa-boot.exp
index c60ade0..1388877 100644
--- a/expect-lava/pmf-tfa-boot.exp
+++ b/expect-lava/pmf-tfa-boot.exp
@@ -20,3 +20,6 @@
prompt='PMF:cpu 0 tid 4'
expect_string+=("i;${prompt}")
+
+prompt='PMF:cpu 0 tid 5'
+expect_string+=("i;${prompt}")
diff --git a/expect/pmf-tfa-bl31-boot-exit.exp b/expect/pmf-tfa-bl31-boot-exit.exp
deleted file mode 100644
index c7c29f6..0000000
--- a/expect/pmf-tfa-bl31-boot-exit.exp
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Expect script for Trusted Firmware Test Framework
-#
-
-source [file join [file dirname [info script]] handle-arguments.inc]
-
-expect_string "PMF:cpu 0 tid 5"
\ No newline at end of file
diff --git a/expect/pmf-tfa-boot.exp b/expect/pmf-tfa-boot.exp
index e859e47..1d0988f 100644
--- a/expect/pmf-tfa-boot.exp
+++ b/expect/pmf-tfa-boot.exp
@@ -13,3 +13,4 @@
expect_string "PMF:cpu 0 tid 2"
expect_string "PMF:cpu 0 tid 3"
expect_string "PMF:cpu 0 tid 4"
+expect_string "PMF:cpu 0 tid 5"
diff --git a/run_config/fvp-aemv8a.runtime_instr b/run_config/fvp-aemv8a.runtime_instr
index f21864b..3699e9d 100755
--- a/run_config/fvp-aemv8a.runtime_instr
+++ b/run_config/fvp-aemv8a.runtime_instr
@@ -9,7 +9,6 @@
local model="base-aemv8a"
uart="0" timeout="60" file="pmf-tfa-boot.exp" track_expect
- uart="1" timeout="60" file="pmf-tfa-bl31-boot-exit.exp" track_expect
model="$model" gen_model_params
model="$model" gen_fvp_yaml