refactor(fvp): remove sve plugin usage
From 11.26 Model onwards SVE plugin loading is not needed and sve
needs to be just enabled using a model option.
Manually resolved conflicts:
model/base-aemv8a.sh
model/base-aemva-common.sh
run_config/fvp-spm.sve+amu
run_config/fvp-spm.sve+amu.bmcov
Change-Id: Id4082321ca91e5114a99588772b172576f1d44f4
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
(cherry picked from commit 700a3df75d3170f37863f67b5e9ed9d4c9a266d5)
diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index 344f882..dee114b 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -9,7 +9,8 @@
if is_arm_jenkins_env || upon "$local_ci"; then
set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA"
- default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
+ default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
+ default_var ete_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/libete-plugin.so"
else
# OpenCI enviroment
source "$ci_root/fvp_utils.sh"
@@ -20,7 +21,8 @@
set_model_path "$models_dir"
# ScalableVectorExtension is located at /opt/model/*/plugins/${model_flavour}
- default_var sve_plugin_path "${models_dir/models/plugins}/ScalableVectorExtension.so"
+ default_var etm_plugin_path "${models_dir/models/plugins}/ETMv4ExamplePlugin.so"
+ default_var ete_plugin_path "${models_dir/models/plugins}/libete-plugin.so"
fi
default_var is_dual_cluster 1