refactor(sve): refine spm test config
Rename run_config/fvp-spm.sve+amu to run_config/fvp-spm.sve
Remove unnecessary tftf_config/fvp-default-sve
Rename the SPM SVE test configs accordingly.
Refine tf_config/fvp-spm-sve build options.
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I41039be6f6f513bcd9ff5db2b0dbf63153996d53
diff --git a/group/spm-l2-boot-tests/fvp-default,fvp-spm-sve,fvp-default-sve:fvp-spm.sve+amu b/group/spm-l2-boot-tests/fvp-default,fvp-spm-sve,fvp-default:fvp-spm.sve
similarity index 100%
rename from group/spm-l2-boot-tests/fvp-default,fvp-spm-sve,fvp-default-sve:fvp-spm.sve+amu
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-sve,fvp-default:fvp-spm.sve
diff --git a/group/tf-l3-code-coverage/fvp-spm-sve,fvp-default-sve,fvp-default:fvp-spm.sve+amu.bmcov-debug b/group/tf-l3-code-coverage/fvp-spm-sve,fvp-default,fvp-default:fvp-spm.sve.bmcov-debug
similarity index 100%
rename from group/tf-l3-code-coverage/fvp-spm-sve,fvp-default-sve,fvp-default:fvp-spm.sve+amu.bmcov-debug
rename to group/tf-l3-code-coverage/fvp-spm-sve,fvp-default,fvp-default:fvp-spm.sve.bmcov-debug
diff --git a/run_config/fvp-spm.sve+amu b/run_config/fvp-spm.sve
similarity index 85%
rename from run_config/fvp-spm.sve+amu
rename to run_config/fvp-spm.sve
index 15a0773..4172c4c 100644
--- a/run_config/fvp-spm.sve+amu
+++ b/run_config/fvp-spm.sve
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -22,10 +22,9 @@
# 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 confuguring the appropriate parameters of the SMMUv3 AEM.
+ # by configuring the appropriate parameters of the SMMUv3 AEM.
model="$model" \
- amu_present="1" \
arch_version="8.5" \
has_branch_target_exception="1" \
has_smmuv3_params="1" \
diff --git a/run_config/fvp-spm.sve+amu.bmcov b/run_config/fvp-spm.sve.bmcov
similarity index 89%
rename from run_config/fvp-spm.sve+amu.bmcov
rename to run_config/fvp-spm.sve.bmcov
index 4b1c467..8161a11 100644
--- a/run_config/fvp-spm.sve+amu.bmcov
+++ b/run_config/fvp-spm.sve.bmcov
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -22,7 +22,7 @@
# 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 confuguring the appropriate parameters of the SMMUv3 AEM.
+ # by configuring the appropriate parameters of the SMMUv3 AEM.
if ! is_arm_jenkins_env && not_upon "$local_ci"; then
bmcov_plugin_path="${coverage_trace_plugin}"
bmcov_plugin="1"
diff --git a/tf_config/fvp-spm-sve b/tf_config/fvp-spm-sve
index 3b6eaba..6ad8ebc 100644
--- a/tf_config/fvp-spm-sve
+++ b/tf_config/fvp-spm-sve
@@ -3,10 +3,7 @@
ARM_ARCH_MAJOR=8
ARM_ARCH_MINOR=5
BRANCH_PROTECTION=1
-CTX_INCLUDE_EL2_REGS=1
-CTX_INCLUDE_PAUTH_REGS=1
ENABLE_FEAT_MTE2=1
-ENABLE_SVE_FOR_NS=1
ENABLE_SVE_FOR_SWD=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
SPD=spmd
diff --git a/tftf_config/fvp-default-sve b/tftf_config/fvp-default-sve
deleted file mode 100644
index 4482ac8..0000000
--- a/tftf_config/fvp-default-sve
+++ /dev/null
@@ -1,3 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=fvp
-ARM_ARCH_FEATURE=sve
\ No newline at end of file