run_config: Enable LAVA job generation for fvp-spm related run configs
These configs, fvp-spm, fvp-spm.linux, fvp-spm.optee, fvp-spm.optee.sp
and fvp-rstbl31, should generate a LAVA job definition (and be tested
by LAVA), thus prepare the corresponding run config fragments with
right values and then call the template generation function.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: I9582413683b0a0cd43be496302ad36f7bdaa3b13
diff --git a/run_config/fvp-spm b/run_config/fvp-spm
index 5b607dd..c87641e 100644
--- a/run_config/fvp-spm
+++ b/run_config/fvp-spm
@@ -13,6 +13,9 @@
# Expect scripts
uart="0" file="tftf.exp" track_expect
uart="2" file="spm-uart2.exp" track_expect
+
+ payload_type="tftf" gen_fvp_yaml_template
+
}
post_fetch_tf_resource() {
diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index 23f0c76..8cd3dd9 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -10,15 +10,17 @@
}
fetch_tf_resource() {
- url="$tfa_downloads/spm/02-05-2021/initrd.img" fetch_file
+ url="$tfa_downloads/spm/02-05-2021/initrd.img" saveas="initrd.bin" fetch_file
url="$tfa_downloads/spm/02-05-2021/manifest.dtb" fetch_file
- archive_file "initrd.img"
+ archive_file "initrd.bin"
archive_file "manifest.dtb"
# Expect scripts
uart="0" file="spm-linux-uart0.exp" track_expect
uart="2" file="spm-uart2.exp" track_expect
+
+ payload_type="linux" gen_fvp_yaml_template
}
post_fetch_tf_resource() {
@@ -26,9 +28,9 @@
model="$model" \
arch_version="8.4" \
- initrd_bin="initrd.img" \
+ initrd_bin="initrd.bin" \
el3_payload_bin="manifest.dtb" \
gen_model_params
- model="$model" gen_fvp_yaml
+ model="$model" model_dtb="manifest.dtb" gen_fvp_yaml
}
diff --git a/run_config/fvp-spm.optee b/run_config/fvp-spm.optee
index 1e21b66..ffa93ac 100644
--- a/run_config/fvp-spm.optee
+++ b/run_config/fvp-spm.optee
@@ -17,6 +17,8 @@
# Expect scripts
uart="0" file="tftf.exp" track_expect
uart="1" file="hold_uart.exp" track_expect
+
+ payload_type="tftf" gen_fvp_yaml_template
}
post_fetch_tf_resource() {
diff --git a/run_config/fvp-spm.optee.sp b/run_config/fvp-spm.optee.sp
index ca3981c..2cd5cea 100644
--- a/run_config/fvp-spm.optee.sp
+++ b/run_config/fvp-spm.optee.sp
@@ -27,6 +27,8 @@
# Expect scripts
uart="0" file="tftf.exp" track_expect
uart="1" file="spm-optee-sp-uart1.exp" track_expect
+
+ payload_type="tftf" gen_fvp_yaml_template
}
post_fetch_tf_resource() {
diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index fa67208..01c0b17 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -28,15 +28,17 @@
}
fetch_tf_resource() {
- url="$tfa_downloads/spm/02-05-2021/initrd.img" fetch_file
+ url="$tfa_downloads/spm/02-05-2021/initrd.img" saveas="initrd.bin" fetch_file
url="$tfa_downloads/spm/02-05-2021/manifest.dtb" fetch_file
- archive_file "initrd.img"
+ archive_file "initrd.bin"
archive_file "manifest.dtb"
# Expect scripts
uart="0" file="spm-linux-uart0.exp" track_expect
uart="2" file="spm-uart2.exp" track_expect
+
+ payload_type="linux" gen_fvp_yaml_template
}
post_fetch_tf_resource() {
@@ -52,8 +54,8 @@
sp1_pkg="cactus-primary.pkg" \
sp2_pkg="cactus-secondary.pkg" \
sp3_pkg="cactus-tertiary.pkg" \
- initrd_bin="initrd.img" \
+ initrd_bin="initrd.bin" \
el3_payload_bin="manifest.dtb" \
gen_model_params
- model="$model" gen_fvp_yaml
+ model="$model" model_dtb="manifest.dtb" gen_fvp_yaml
}