Add test configurations for FEAT_RME
The patch makes the following changes:
* Adds test configurations for the following scenarios:
==================================================
BL32 RMM BL33 Test configuration
==================================================
SPM TRP TFTF fvp-spm.trp.tftf-tftf.rme
None TRP TFTF fvp-trp.tftf-tftf.rme
* Adds an FVP model that supports FEAT_RME
* Updates tf-cov-make with FEAT_RME build configuration
Change-Id: Ibc404c0c60022406027dba06bbcb230df3ab133e
Signed-off-by: Zelalem Aweke <zelalem.aweke@arm.com>
diff --git a/run_config/fvp-spm.trp.tftf b/run_config/fvp-spm.trp.tftf
new file mode 100644
index 0000000..21a294a
--- /dev/null
+++ b/run_config/fvp-spm.trp.tftf
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2021, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Build TF-A with tf-a-tests, TRP and Hafnium
+post_tf_build() {
+ # Stash the TRP binary
+ archive_file "${tf_root}/build/fvp/${bin_mode}/rmm.bin"
+
+ build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin" \
+ RMM="$archive/rmm.bin"
+}
diff --git a/run_config/fvp-tftf.rme b/run_config/fvp-tftf.rme
new file mode 100644
index 0000000..91aaae2
--- /dev/null
+++ b/run_config/fvp-tftf.rme
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2021, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+ # RME systems go BL1->BL2->BL31 so we must set this variable for expect
+ # scripts to work properly and not hang up waiting for BL1->BL31.
+ uart="0" set_expect_variable "skip_early_boot_msgs" "1"
+
+ # Use standard TFTF expect script on primary UART.
+ uart="0" file="tftf.exp" track_expect
+
+ # Track the rest of the UARTs to aid in debugging.
+ uart="1" file="hold_uart.exp" track_expect
+ uart="2" file="hold_uart.exp" track_expect
+ uart="3" file="hold_uart.exp" track_expect
+
+ payload_type="tftf" gen_fvp_yaml_template
+}
+
+post_fetch_tf_resource() {
+ local model="base-aemv8a"
+
+ model="$model" \
+ model_build="18" \
+ arch_version="8.6" \
+ has_branch_target_exception="1" \
+ restriction_on_speculative_execution="2" \
+ amu_present="1" \
+ has_rme="1" \
+ has_smmuv3_params="1" \
+ gen_model_params
+
+ model="$model" gen_fvp_yaml
+}
diff --git a/run_config/fvp-trp.tftf b/run_config/fvp-trp.tftf
new file mode 100644
index 0000000..0793c8f
--- /dev/null
+++ b/run_config/fvp-trp.tftf
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2021, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Build TF-A with tf-a-tests and TRP
+post_tf_build() {
+ # Stash the TRP binary
+ archive_file "${tf_root}/build/fvp/${bin_mode}/rmm.bin"
+
+ build_fip BL33="$archive/tftf.bin" RMM="$archive/rmm.bin"
+}