refactor(mte): replace mte with mte2
With below in TF-A:
https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/27122/
MTE and MTE_PERM are removed and not handled anymore,
So use MTE2 to test the features.
Change-Id: I1d0f372823dd5be048af1551f6cb5b3c464b6112
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/tf_config/fvp-mte-tsp b/tf_config/fvp-mte-tsp
index 4b6b985..0137ba7 100644
--- a/tf_config/fvp-mte-tsp
+++ b/tf_config/fvp-mte-tsp
@@ -1,5 +1,4 @@
CROSS_COMPILE=aarch64-none-elf-
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
PLAT=fvp
SPD=tspd
diff --git a/tf_config/fvp-ras-ffh-spmd-lsp b/tf_config/fvp-ras-ffh-spmd-lsp
index caab81c..bc947c7 100644
--- a/tf_config/fvp-ras-ffh-spmd-lsp
+++ b/tf_config/fvp-ras-ffh-spmd-lsp
@@ -4,7 +4,6 @@
ENABLE_SPMD_LP=1
ARM_ARCH_MINOR=5
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm b/tf_config/fvp-spm
index e240d99..fdb544f 100644
--- a/tf_config/fvp-spm
+++ b/tf_config/fvp-spm
@@ -5,7 +5,6 @@
CTX_INCLUDE_EL2_REGS=1
ARM_ARCH_MINOR=5
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-hyp b/tf_config/fvp-spm-hyp
index 81110ba..5e16c1e 100644
--- a/tf_config/fvp-spm-hyp
+++ b/tf_config/fvp-spm-hyp
@@ -7,7 +7,6 @@
CTX_INCLUDE_EL2_REGS=1
ARM_ARCH_MINOR=5
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-measured-boot b/tf_config/fvp-spm-measured-boot
index 2887cdb..df36444 100644
--- a/tf_config/fvp-spm-measured-boot
+++ b/tf_config/fvp-spm-measured-boot
@@ -5,7 +5,6 @@
CTX_INCLUDE_EL2_REGS=1
ARM_ARCH_MINOR=5
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-optee-sp b/tf_config/fvp-spm-optee-sp
index 8ca9a49..d4b76bd 100644
--- a/tf_config/fvp-spm-optee-sp
+++ b/tf_config/fvp-spm-optee-sp
@@ -1,6 +1,5 @@
ARM_ARCH_MINOR=5
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
ARM_SPMC_MANIFEST_DTS=plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts
diff --git a/tf_config/fvp-spm-report-ctx-mem-use b/tf_config/fvp-spm-report-ctx-mem-use
index ca6e472..886956c 100644
--- a/tf_config/fvp-spm-report-ctx-mem-use
+++ b/tf_config/fvp-spm-report-ctx-mem-use
@@ -5,7 +5,6 @@
CTX_INCLUDE_EL2_REGS=1
ARM_ARCH_MINOR=5
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-rme b/tf_config/fvp-spm-rme
index ab7c1b6..3b71fba 100644
--- a/tf_config/fvp-spm-rme
+++ b/tf_config/fvp-spm-rme
@@ -6,7 +6,6 @@
SPMD_SPM_AT_SEL2=1
BRANCH_PROTECTION=1
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
GIC_EXT_INTID=1
diff --git a/tf_config/fvp-spm-rst-bl31 b/tf_config/fvp-spm-rst-bl31
index cf7723d..418b4c5 100644
--- a/tf_config/fvp-spm-rst-bl31
+++ b/tf_config/fvp-spm-rst-bl31
@@ -9,7 +9,6 @@
CTX_INCLUDE_EL2_REGS=1
ARM_ARCH_MINOR=5
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-spmd-lsp b/tf_config/fvp-spm-spmd-lsp
index 83c1c66..1d8f20f 100644
--- a/tf_config/fvp-spm-spmd-lsp
+++ b/tf_config/fvp-spm-spmd-lsp
@@ -4,7 +4,6 @@
ENABLE_SPMD_LP=1
ARM_ARCH_MINOR=5
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-sve b/tf_config/fvp-spm-sve
index 1ff1655..02f4373 100644
--- a/tf_config/fvp-spm-sve
+++ b/tf_config/fvp-spm-sve
@@ -4,7 +4,6 @@
BRANCH_PROTECTION=1
CTX_INCLUDE_EL2_REGS=1
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
ENABLE_SVE_FOR_NS=1
ENABLE_SVE_FOR_SWD=1
diff --git a/tf_config/fvp-spm-tbb b/tf_config/fvp-spm-tbb
index f60d616..5539141 100644
--- a/tf_config/fvp-spm-tbb
+++ b/tf_config/fvp-spm-tbb
@@ -5,7 +5,6 @@
CTX_INCLUDE_EL2_REGS=1
ARM_ARCH_MINOR=5
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-tbb-dualroot b/tf_config/fvp-spm-tbb-dualroot
index b601ab1..dc80aa3 100644
--- a/tf_config/fvp-spm-tbb-dualroot
+++ b/tf_config/fvp-spm-tbb-dualroot
@@ -5,7 +5,6 @@
CTX_INCLUDE_EL2_REGS=1
ARM_ARCH_MINOR=5
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-tbb-mbedtls-mb-spm-rme b/tf_config/fvp-tbb-mbedtls-mb-spm-rme
index 5294293..27c72ba 100644
--- a/tf_config/fvp-tbb-mbedtls-mb-spm-rme
+++ b/tf_config/fvp-tbb-mbedtls-mb-spm-rme
@@ -1,7 +1,6 @@
ARM_ROTPK_LOCATION=devel_rsa
BRANCH_PROTECTION=1
CROSS_COMPILE=aarch64-none-elf-
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
CTX_INCLUDE_PAUTH_REGS=1
ENABLE_RME=1
diff --git a/tf_config/fvp-tc2-spm b/tf_config/fvp-tc2-spm
index edef88b..18341f6 100644
--- a/tf_config/fvp-tc2-spm
+++ b/tf_config/fvp-tc2-spm
@@ -3,7 +3,6 @@
BRANCH_PROTECTION=1
CROSS_COMPILE=aarch64-none-elf-
CTX_INCLUDE_PAUTH_REGS=1
-ENABLE_FEAT_MTE=1
ENABLE_FEAT_MTE2=1
ENABLE_SVE_FOR_SWD=1
PLAT=tc