feat: drop spm-uart2.exp
The first cactus SP doesn't own an UART device.
As such, its logs will be mixed with tftf and the other
partitions.
The spm-uart2.exp was only checking that first cactus has booted.
This was when it was assigned with its own uart device.
For validating that the SP1 was booted, we have the use of
FFA_PARTITION_INFO_GET to check it's present in the running
system. This is done by TFTF at most SPM-related tests that need
to interact with the SP.
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: Ifb8433c7438498f6346e89d89a85bcbfb998da31
diff --git a/expect-lava/spm-uart2.exp b/expect-lava/spm-uart2.exp
deleted file mode 100644
index 5bee324..0000000
--- a/expect-lava/spm-uart2.exp
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2021, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-# Handled by ../expect-post/spm-uart2.exp
diff --git a/expect/spm-uart2.exp b/expect/spm-uart2.exp
deleted file mode 100644
index fac256e..0000000
--- a/expect/spm-uart2.exp
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-source [file join [file dirname [info script]] handle-arguments.inc]
-
-expect {
- "Booting Secure Partition" {
- message "SP entry"
- }
-}
-
-# UART2 captures prints from SP0. If we exit from here, expect script will stop
-# capturing the output from telnet process spawned for tracking uart2 console.
-# Hence, we need to hold the uart such that the expect script captures the
-# outputs to uart log. We do this by configuring timeout to never expire and
-# expecting an unexpected string such as "FOOBAR". Refer uart-hold.inc
-
-source [file join [file dirname [info script]] uart-hold.inc]
diff --git a/run_config/fvp-spm b/run_config/fvp-spm
index 3ffc784..37bff0a 100644
--- a/run_config/fvp-spm
+++ b/run_config/fvp-spm
@@ -17,7 +17,6 @@
local model="base-aemv8a"
uart="0" file="tftf.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
# SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
# enabled to help with stage-2 translation and virtualization of
diff --git a/run_config/fvp-spm+romlib b/run_config/fvp-spm+romlib
index 9cb2283..3b56f9a 100644
--- a/run_config/fvp-spm+romlib
+++ b/run_config/fvp-spm+romlib
@@ -22,7 +22,6 @@
local model="base-aemv8a"
uart="0" file="tftf.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
# SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
# enabled to help with stage-2 translation and virtualization of
diff --git a/run_config/fvp-spm+romlib.bmcov b/run_config/fvp-spm+romlib.bmcov
index 38417ac..ffe1574 100644
--- a/run_config/fvp-spm+romlib.bmcov
+++ b/run_config/fvp-spm+romlib.bmcov
@@ -22,7 +22,6 @@
local model="base-aemv8a"
uart="0" file="tftf.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
# SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
# enabled to help with stage-2 translation and virtualization of
diff --git a/run_config/fvp-spm.48bit_pa b/run_config/fvp-spm.48bit_pa
index 6debe68..9701b06 100644
--- a/run_config/fvp-spm.48bit_pa
+++ b/run_config/fvp-spm.48bit_pa
@@ -17,7 +17,6 @@
local model="base-aemv8a"
uart="0" file="tftf.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
# SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
# enabled to help with stage-2 translation and virtualization of
diff --git a/run_config/fvp-spm.48bit_pa.bmcov b/run_config/fvp-spm.48bit_pa.bmcov
index 8a5d58d..7bec824 100644
--- a/run_config/fvp-spm.48bit_pa.bmcov
+++ b/run_config/fvp-spm.48bit_pa.bmcov
@@ -17,7 +17,6 @@
local model="base-aemv8a"
uart="0" file="tftf.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
# SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
# enabled to help with stage-2 translation and virtualization of
diff --git a/run_config/fvp-spm.bmcov b/run_config/fvp-spm.bmcov
index 009688e..f6d9990 100644
--- a/run_config/fvp-spm.bmcov
+++ b/run_config/fvp-spm.bmcov
@@ -17,7 +17,6 @@
local model="base-aemv8a"
uart="0" file="tftf.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
# SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
# enabled to help with stage-2 translation and virtualization of
diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index cd06dee..28b2c8a 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -30,7 +30,6 @@
local model="base-aemv8a"
uart="0" file="spm-linux-uart0.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
model="$model" \
arch_version="8.5" \
diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index 3fe1ddf..6c769eb 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -50,7 +50,6 @@
local model="base-aemv8a"
uart="0" file="spm-linux-uart0.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
model="$model" \
arch_version="8.5" \
diff --git a/run_config/fvp-spm.sve+amu b/run_config/fvp-spm.sve+amu
index a121bc3..8d759f9 100644
--- a/run_config/fvp-spm.sve+amu
+++ b/run_config/fvp-spm.sve+amu
@@ -18,7 +18,6 @@
uart="0" file="tftf.exp" track_expect
uart="1" file="hold_uart.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
# SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
# enabled to help with stage-2 translation and virtualization of
diff --git a/run_config/fvp-spm.sve+amu.bmcov b/run_config/fvp-spm.sve+amu.bmcov
index c6f04aa..d7cbaac 100644
--- a/run_config/fvp-spm.sve+amu.bmcov
+++ b/run_config/fvp-spm.sve+amu.bmcov
@@ -18,7 +18,6 @@
uart="0" file="tftf.exp" track_expect
uart="1" file="hold_uart.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
# SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
# enabled to help with stage-2 translation and virtualization of
diff --git a/run_config/fvp-tc.spm.tftf b/run_config/fvp-tc.spm.tftf
index 102ca80..178dd82 100644
--- a/run_config/fvp-tc.spm.tftf
+++ b/run_config/fvp-tc.spm.tftf
@@ -34,7 +34,7 @@
generate_lava_job_template() {
uart="0" port="5002" set_primary="1" file="tftf-non-primary.exp" track_expect
- uart="1" port="5003" file="spm-cactus-sp-uart1.exp" track_expect
+ uart="1" port="5000" file="spm-cactus-sp-uart1.exp" track_expect
set_uart_port "${archive:?}" 2 5000
set_uart_port "${archive:?}" 3 5001