fix: use `generate_lava_job_template` where appropriate
These run configurations were missed when this function was introduced.
Change-Id: Ib5cdc3f3fa103672611bbf5d1a658e2d5211db4c
Signed-off-by: Chris Kay <chris.kay@arm.com>
diff --git a/run_config/fvp-aemv8a.8_5+bti+qarma3 b/run_config/fvp-aemv8a.8_5+bti+qarma3
index afe4e5d..de05f7a 100644
--- a/run_config/fvp-aemv8a.8_5+bti+qarma3
+++ b/run_config/fvp-aemv8a.8_5+bti+qarma3
@@ -1,18 +1,18 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
+# Copyright (c) 2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-post_fetch_tf_resource() {
- model="base-aemv8a" \
- arch_version="8.5" \
- has_branch_target_exception="1" \
- has_pacqarma3="1" \
+generate_lava_job() {
+ local model="base-aemv8a"
+
+ model="${model}" \
+ arch_version="8.5" \
+ has_branch_target_exception="1" \
+ has_pacqarma3="1" \
gen_model_params
- model="base-aemv8a" \
- model_bin="FVP_Base_RevC-2xAEMvA" \
- gen_fvp_yaml
+ model="${model}" model_bin="FVP_Base_RevC-2xAEMvA" gen_fvp_yaml
}
diff --git a/run_config/fvp-aemv8a.8_6+bti b/run_config/fvp-aemv8a.8_6+bti
index 2134dda..571bedd 100644
--- a/run_config/fvp-aemv8a.8_6+bti
+++ b/run_config/fvp-aemv8a.8_6+bti
@@ -1,20 +1,21 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
+# Copyright (c) 2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-post_fetch_tf_resource() {
- model="base-aemv8a"
-
- model="$model" \
- arch_version="8.6" \
- has_branch_target_exception="1" \
- gen_model_params
+generate_lava_job() {
+ local model="base-aemv8a"
uart="0" set_expect_variable "num_cpus" "4"
+
model="$model" \
- model_bin="FVP_Base_RevC-2xAEMvA" \
+ arch_version="8.6" \
+ has_branch_target_exception="1" \
+ gen_model_params
+
+ model="$model" \
+ model_bin="FVP_Base_RevC-2xAEMvA" \
gen_fvp_yaml
}
diff --git a/run_config/fvp-linux.rootfs+drtm b/run_config/fvp-linux.rootfs+drtm
index e7d1884..ee22e5e 100644
--- a/run_config/fvp-linux.rootfs+drtm
+++ b/run_config/fvp-linux.rootfs+drtm
@@ -11,7 +11,9 @@
rootfs_url="$tfa_downloads/drtm/test-disk.img" get_rootfs
url="$edk_url" saveas="edk2.bin" fetch_file
archive_file "edk2.bin"
+}
+generate_lava_job_template() {
# Configure the uarts for tracking.
uart="0" file="hold_uart.exp" track_expect
uart="1" set_primary="1" timeout="700" file="tf-a-drtm.exp" track_expect
diff --git a/run_config/fvp-tftf.sgi b/run_config/fvp-tftf.sgi
index 3e71521..9cfaa29 100644
--- a/run_config/fvp-tftf.sgi
+++ b/run_config/fvp-tftf.sgi
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
+# Copyright (c) 2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-fetch_tf_resource() {
+generate_lava_job_template() {
uart="1" timeout="1200" set_primary="1" file="tftf-sgi.exp" track_expect
uart="0" file="hold_uart.exp" track_expect