Revert "Revert "FVP Linux and TFTF YAML Support""
This reverts commit a2946b2b5d0b3b9daa7ede0780ee4c535f637122.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: I44c9b346b5548cc961f88eb40ce723943e66f2d0
diff --git a/run_config/fvp-cortexa35x4 b/run_config/fvp-cortexa35x4
index 0e33a77..10daf78 100644
--- a/run_config/fvp-cortexa35x4
+++ b/run_config/fvp-cortexa35x4
@@ -6,6 +6,14 @@
#
post_fetch_tf_resource() {
- model="cortex-a35x4" gen_model_params
+ local model="cortex-a35x4"
+ model="$model" gen_model_params
uart="0" set_expect_variable "num_cpus" "4"
+
+ model="$model" \
+ dtb="fvp-base-gicv3-psci.dtb" \
+ container_name="fvp:fvp_base_cortex-a35x124_11.11_34" \
+ container_model_params="$archive/model_params" \
+ container_entrypoint="/opt/model/FVP_Base_Cortex-A35x124/models/Linux64_GCC-6.4/FVP_Base_Cortex-A35x4" \
+ gen_fvp_yaml
}
diff --git a/run_config/fvp-linux b/run_config/fvp-linux
index ec823c6..426df4f 100644
--- a/run_config/fvp-linux
+++ b/run_config/fvp-linux
@@ -9,4 +9,6 @@
kernel_type="fvp-busybox-uboot" get_kernel
initrd_type="default" get_initrd
uart="0" file="linux-rd-busybox.exp" track_expect
+
+ payload_type="linux" gen_fvp_yaml_template
}
diff --git a/run_config/fvp-tftf b/run_config/fvp-tftf
index cbf5086..3d53188 100644
--- a/run_config/fvp-tftf
+++ b/run_config/fvp-tftf
@@ -8,4 +8,6 @@
fetch_tf_resource() {
uart="0" file="tftf.exp" track_expect
uart="1" file="hold_uart.exp" track_expect
+
+ payload_type="tftf" gen_fvp_yaml_template
}