fvp: cleanup neoverse_e1 model usage
Model option 'gicd_virtual_lpi' is not been used by neoverse_e1 FVP
model, so remove the unused option which is not been set by run_config
and remove duplicated model files.
This patch is direct outcome from code review comments from here:
https://review.trustedfirmware.org/c/ci/tf-a-ci-scripts/+/29474/3?tab=comments
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
Change-Id: I69c2b19a72232c4d2a1bc7134f4381f1142b783d
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 219d28f..e273319 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -91,9 +91,7 @@
[cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78C"
[cortex-x2]="${fvp_arm_std_library};FVP_Base_Cortex-X2"
[cortex-a710]="${fvp_arm_std_library};FVP_Base_Cortex-A710"
-[neoverse_e1x1]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
-[neoverse_e1x2]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
-[neoverse_e1x4]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
+[neoverse_e1]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
[neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1"
[neoverse_n2]="${fvp_arm_std_library};FVP_Base_Neoverse-N2"
[neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
diff --git a/model/neoverse_e1.sh b/model/neoverse_e1.sh
new file mode 100644
index 0000000..c1858d8
--- /dev/null
+++ b/model/neoverse_e1.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2020-2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Neoverse-E1"
+
+source "$ci_root/model/fvp_common.sh"
+
+cat <<EOF >>"${model_param_file}"
+-C bp.terminal_0.start_port=5000
+-C bp.terminal_1.start_port=5001
+-C bp.terminal_2.start_port=5002
+-C bp.terminal_3.start_port=5003
+EOF
diff --git a/model/neoverse_e1x1.sh b/model/neoverse_e1x1.sh
deleted file mode 100644
index 4cce9ac..0000000
--- a/model/neoverse_e1x1.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Neoverse-E1"
-
-source "$ci_root/model/fvp_common.sh"
-
-cat <<EOF >>"${model_param_file}"
--C bp.terminal_0.start_port=5000
--C bp.terminal_1.start_port=5001
--C bp.terminal_2.start_port=5002
--C bp.terminal_3.start_port=5003
-EOF
-
-# Base address for each redistributor
-if [ "$gicd_virtual_lpi" = "1" ]; then
- cat <<EOF >>"$model_param_file"
--C gic_distributor.reg-base-per-redistributor=0.0.0.0=0x2f100000,0.0.0.1=0x2f140000
--C gic_distributor.print-memory-map=1
-EOF
-fi
diff --git a/model/neoverse_e1x2.sh b/model/neoverse_e1x2.sh
deleted file mode 100644
index 4404190..0000000
--- a/model/neoverse_e1x2.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Neoverse-E1"
-
-source "$ci_root/model/fvp_common.sh"
-
-cat <<EOF >>"${model_param_file}"
--C bp.terminal_0.start_port=5000
--C bp.terminal_1.start_port=5001
--C bp.terminal_2.start_port=5002
--C bp.terminal_3.start_port=5003
-EOF
-
-# Base address for each redistributor
-if [ "$gicd_virtual_lpi" = "1" ]; then
- cat <<EOF >>"$model_param_file"
--C gic_distributor.reg-base-per-redistributor=0.0.0.0=0x2f100000,0.0.0.1=0x2f140000,0.0.1.0=0x2f180000,0.0.1.1=0x2f1c0000
--C gic_distributor.print-memory-map=1
-EOF
-fi
diff --git a/model/neoverse_e1x4.sh b/model/neoverse_e1x4.sh
deleted file mode 100644
index 253c058..0000000
--- a/model/neoverse_e1x4.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Neoverse-E1"
-
-source "$ci_root/model/fvp_common.sh"
-
-cat <<EOF >>"${model_param_file}"
--C bp.terminal_0.start_port=5000
--C bp.terminal_1.start_port=5001
--C bp.terminal_2.start_port=5002
--C bp.terminal_3.start_port=5003
-EOF
-
-# Base address for each redistributor
-if [ "$gicd_virtual_lpi" = "1" ]; then
- cat <<EOF >>"$model_param_file"
--C gic_distributor.reg-base-per-redistributor=0.0.0.0=0x2f100000,0.0.0.1=0x2f140000,0.0.1.0=0x2f180000,0.0.1.1=0x2f1c0000,0.0.2.0=0x2f200000,0.0.2.1=0x2f240000,0.0.3.0=0x2f280000,0.0.3.1=0x2f2c0000
--C gic_distributor.print-memory-map=1
-EOF
-fi
diff --git a/run_config/fvp-neoverse_e1x1 b/run_config/fvp-neoverse_e1x1
index cf4131f..c0b801b 100644
--- a/run_config/fvp-neoverse_e1x1
+++ b/run_config/fvp-neoverse_e1x1
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
generate_lava_job() {
- local model="neoverse_e1x1"
+ local model="neoverse_e1"
uart="0" set_expect_variable "num_cpus" "2"
diff --git a/run_config/fvp-neoverse_e1x2 b/run_config/fvp-neoverse_e1x2
index 6e04c0e..aa5d27c 100644
--- a/run_config/fvp-neoverse_e1x2
+++ b/run_config/fvp-neoverse_e1x2
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
generate_lava_job() {
- local model="neoverse_e1x2"
+ local model="neoverse_e1"
uart="0" set_expect_variable "num_cpus" "4"
diff --git a/run_config/fvp-neoverse_e1x4 b/run_config/fvp-neoverse_e1x4
index 5ac8ccf..08b2960 100644
--- a/run_config/fvp-neoverse_e1x4
+++ b/run_config/fvp-neoverse_e1x4
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
generate_lava_job() {
- local model="neoverse_e1x4"
+ local model="neoverse_e1"
uart="0" set_expect_variable "num_cpus" "8"