chore(2.7): update FVP version for v2.7 release
Updates common FVP model version from 11.16/16 to 11.17/21
Note: model build based on Linux64_GCC-9.3 instead of Linux64_GCC-6.4.
Signed-off-by: Maksims Svecovs <maksims.svecovs@arm.com>
Change-Id: Iec26571966bfc8c07ad2131aac4316ced41d21a6
diff --git a/run_config/fvp-aemv8a.aarch32.gicv2 b/run_config/fvp-aemv8a.aarch32.gicv2
index 67ca943..ddddcab 100644
--- a/run_config/fvp-aemv8a.aarch32.gicv2
+++ b/run_config/fvp-aemv8a.aarch32.gicv2
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -10,6 +10,7 @@
model_version="0.0" \
model_build="6557" \
+ model_flavour="Linux64_GCC-6.4" \
mpidr_layout="0" \
supports_multi_threading="0" \
gicv3_gicv2_only="1" cache_state_modelled=0 model="$model" aarch32="1" gen_model_params
@@ -17,5 +18,6 @@
#ToDo: switch to aarch32.gicv2 based RevC model once it is available publicly
model_version="11.14" \
model_build="21" \
+ model_flavour="Linux64_GCC-6.4" \
model="base-aemv8a-revb" gen_fvp_yaml
}
diff --git a/run_config/fvp-aemva.ete_trace_ext b/run_config/fvp-aemva.ete_trace_ext
index a910998..5e96207 100644
--- a/run_config/fvp-aemva.ete_trace_ext
+++ b/run_config/fvp-aemva.ete_trace_ext
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -10,6 +10,7 @@
model_version="0.0" \
model_build="6684" \
+ model_flavour="Linux64_GCC-6.4" \
etm_present="1" \
ete_plugin="1" \
supports_trace_buffer_control_regs="1" \
diff --git a/run_config/fvp-aemva.ete_trace_ext.bl31_panic b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
index eae33e8..48d2de9 100644
--- a/run_config/fvp-aemva.ete_trace_ext.bl31_panic
+++ b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -10,6 +10,7 @@
model_version="0.0" \
model_build="6684" \
+ model_flavour="Linux64_GCC-6.4" \
etm_present="1" \
ete_plugin="1" \
supports_trace_buffer_control_regs="1" \
diff --git a/run_config/fvp-cortexa32x4 b/run_config/fvp-cortexa32x4
index 13abfef..42a9a65 100644
--- a/run_config/fvp-cortexa32x4
+++ b/run_config/fvp-cortexa32x4
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -9,8 +9,6 @@
local model="cortex-a32x4"
model="$model" \
- model_version="11.12" \
- model_build="38" \
gen_model_params
uart="0" set_expect_variable "num_cpus" "4"
diff --git a/run_config/fvp-cortexa32x4.rstspmin b/run_config/fvp-cortexa32x4.rstspmin
index 0e973c5..0455cb0 100644
--- a/run_config/fvp-cortexa32x4.rstspmin
+++ b/run_config/fvp-cortexa32x4.rstspmin
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -10,9 +10,8 @@
reset_to_spmin="1" \
model="$model" \
- model_version="11.12" \
- model_build="38" \
gen_model_params
uart="0" set_expect_variable "num_cpus" "4"
+
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-morello b/run_config/fvp-morello
index ad81c51..1c8ad96 100644
--- a/run_config/fvp-morello
+++ b/run_config/fvp-morello
@@ -15,6 +15,7 @@
model="morello" \
model_version="0.11" \
model_build="33" \
+ model_flavour="Linux64_GCC-6.4" \
gen_model_params
set_run_env "ports_script" "$ci_root/model/morello-ports.awk"
set_run_env "num_uarts" "3"
diff --git a/run_config/fvp-neoverse_n2x4 b/run_config/fvp-neoverse_n2x4
index ffdeaa0..a435b07 100644
--- a/run_config/fvp-neoverse_n2x4
+++ b/run_config/fvp-neoverse_n2x4
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020 Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -9,8 +9,6 @@
local model="neoverse_n2"
model="$model" \
- model_version="11.12" \
- model_build="38" \
cache_state_modelled="0" \
gen_model_params
uart="0" set_expect_variable "num_cpus" "4"