ci: remove the fvp-aemv8a.ctx and fvp-spm.ctx run configs
The all configs are identical and have more features enabled.
Use them instead to reduce maintenance.
Also run the SPM at el2 for completeness.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: Ie4ff1baa30adcd7ac0103a77eac1a8d583d4e8f5
diff --git a/group/spm-l2-boot-tests/fvp-default,fvp-context-mgmt-spm,fvp-context-mgmt:fvp-spm.ctx b/group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-context-mgmt:fvp-spm.all
similarity index 100%
rename from group/spm-l2-boot-tests/fvp-default,fvp-context-mgmt-spm,fvp-context-mgmt:fvp-spm.ctx
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-context-mgmt:fvp-spm.all
diff --git a/group/tftf-l2-fvp/fvp-tspd-aarch64-only,fvp-context-mgmt:fvp-tftf-fip.tftf-aemv8a.ctx-tspd b/group/tftf-l2-fvp/fvp-tspd-aarch64-only,fvp-context-mgmt:fvp-tftf-fip.tftf-aemv8a.all-tspd
similarity index 100%
rename from group/tftf-l2-fvp/fvp-tspd-aarch64-only,fvp-context-mgmt:fvp-tftf-fip.tftf-aemv8a.ctx-tspd
rename to group/tftf-l2-fvp/fvp-tspd-aarch64-only,fvp-context-mgmt:fvp-tftf-fip.tftf-aemv8a.all-tspd
diff --git a/run_config/fvp-aemv8a.ctx b/run_config/fvp-aemv8a.ctx
deleted file mode 100644
index cc31189..0000000
--- a/run_config/fvp-aemv8a.ctx
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2024-2025, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="base-aemv8a"
-
- uart="0" file="tftf.exp" track_expect
- uart="1" file="hold_uart.exp" track_expect
-
- model="$model" \
- arch_version="8.9" \
- accelerator_support_level="1" \
- has_ete="1" \
- etm_plugin="1" \
- etm_present="1" \
- has_csv2_2="1" \
- has_sve="1" \
- has_s1pie="1" \
- has_s1poe="1" \
- has_s2poe="1" \
- has_tcr2="1" \
- has_gcs="1" \
- has_v8_9_debug_extension="1" \
- memory_tagging_support_level="3" \
- supports_trace_buffer_control_regs="1" \
- supports_trace_filter_regs="2" \
- supports_system_trace_filter_regs="1" \
- gen_model_params
-
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-spm.ctx b/run_config/fvp-spm.ctx
deleted file mode 100644
index 4e4d17c..0000000
--- a/run_config/fvp-spm.ctx
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2024, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tftf_build() {
- targets="tftf cactus ivy" set_tftf_build_targets
-}
-
-post_tf_build() {
- build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin"
-}
-
-generate_lava_job_template() {
- payload_type="tftf" gen_yaml_template
-}
-
-generate_lava_job() {
- local model="base-aemv8a"
-
- uart="0" file="tftf.exp" track_expect
- uart="1" file="hold_uart.exp" track_expect
-
- # SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
- # enabled to help with stage-2 translation and virtualization of
- # upstream peripheral devices. Hence, enable the SMMUv3 IP in FVP
- # by configuring the appropriate parameters of the SMMUv3 AEM.
-
- # FEAT_FGT, FEAT_VHE, FEAT_RAS, FEAT_RASv1p1, FEAT_NV2, FEAT_TRF and
- # FEAT_HCX are enabled implicitly due to the architecture version
- # being set to ARMv9.3.
-
- model="$model" \
- arch_version="9.3" \
- has_branch_target_exception="1" \
- has_smmuv3_params="1" \
- memory_tagging_support_level="2" \
- amu_present="1" \
- has_fgt2="1" \
- has_ecv="1" \
- has_csv2_2="1" \
- has_s1pie="1" \
- has_s2pie="1" \
- has_s1poe="1" \
- has_gcs="1" \
- has_mpam="1" \
- gicd_are_fixed_one="1" \
- gicv3_ext_interrupt_range="1" \
- gicd_ext_ppi_count="64" \
- gicd_ext_spi_count="1024" \
- gen_model_params
-
- model="$model" gen_fvp_yaml
-}
diff --git a/tf_config/fvp-context-mgmt-spm b/tf_config/fvp-context-mgmt-spm
deleted file mode 100644
index 4a7837d..0000000
--- a/tf_config/fvp-context-mgmt-spm
+++ /dev/null
@@ -1,12 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-CTX_INCLUDE_AARCH32_REGS=0
-PLAT=fvp
-SPD=spmd
-SPMD_SPM_AT_SEL2=1
-ARM_ARCH_MAJOR=8
-ARM_ARCH_MINOR=5
-BRANCH_PROTECTION=1
-ENABLE_FEAT_MTE2=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
-GIC_EXT_INTID=1
-PLAT_TEST_SPM=1