feat(cpu): add Cortex X2 run config
This patch adds a run config for Cortex X2 along with other supporting
changes.
Signed-off-by: John Powell <john.powell@arm.com>
Change-Id: I5b0d0efbe899a50334d318ed447a5674031eff04
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 546bfba..5365d3d 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -82,6 +82,7 @@
[cortex-a76x4]="${fvp_arm_std_library};FVP_Base_Cortex-A76x4"
[cortex-a77x4]="${fvp_arm_std_library};FVP_Base_Cortex-A77x4"
[cortex-a78x4]="${fvp_arm_std_library};FVP_Base_Cortex-A78x4"
+[cortex-x2]="${fvp_arm_std_library};FVP_Base_Cortex-X2x4"
[neoverse_e1x1]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x1"
[neoverse_e1x2]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x2"
[neoverse_e1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x4"
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexx2-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexx2-debug
new file mode 100644
index 0000000..26a92d1
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexx2-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2022, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/model/cortex-x2.sh b/model/cortex-x2.sh
new file mode 100644
index 0000000..8d4bda9
--- /dev/null
+++ b/model/cortex-x2.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2022, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-X2x4"
+
+source "$ci_root/model/fvp_common.sh"
diff --git a/run_config/fvp-cortexx2 b/run_config/fvp-cortexx2
new file mode 100644
index 0000000..5a4c504
--- /dev/null
+++ b/run_config/fvp-cortexx2
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+post_fetch_tf_resource() {
+ local model="cortex-x2"
+
+ model="$model" \
+ cache_state_modelled="0" \
+ gen_model_params
+ uart="0" set_expect_variable "num_cpus" "4"
+ model="$model" gen_fvp_yaml
+}