tests: remove FVP_Foundation model support
This model has been subsumed by the FVP_Base model, which is now
available publicly. We no longer have a need to test the Foundation
model, and can shave off a few minutes of CI time by removing it.
Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: Iac6160cebe20aec5be89d9ae15c0f4b72dca655e
(cherry picked from commit 27634d6f6fbc8dec675393c988eb21cd02ee20a2)
diff --git a/expect-lava/linux-bl33.exp b/expect-lava/linux-bl33.exp
index 8224534..b7b1c23 100644
--- a/expect-lava/linux-bl33.exp
+++ b/expect-lava/linux-bl33.exp
@@ -17,5 +17,5 @@
# Check for following information to see that we actually got the right DTB.
# 1. Machine model
# 2. Command line passed via the "/chosen" node
-expect_string+=('i;Machine model: FVP (Base|Foundation)')
+expect_string+=('i;Machine model: FVP Base')
expect_string+=('i;Kernel command line: console=ttyAMA0')
diff --git a/expect/linux-bl33.exp b/expect/linux-bl33.exp
index 6ab721e..13a4d8c 100644
--- a/expect/linux-bl33.exp
+++ b/expect/linux-bl33.exp
@@ -21,7 +21,7 @@
# Check for following information to see that we actually got the right DTB.
# 1. Machine model
# 2. Command line passed via the "/chosen" node
-expect_re "Machine model: FVP (Base|Foundation)" "Linux successfully identified the machine model"
+expect_re "Machine model: FVP Base" "Linux successfully identified the machine model"
expect_string "Kernel command line: console=ttyAMA0" "Linux received the correct command line"
exit_uart 0
diff --git a/fvp_utils.sh b/fvp_utils.sh
index a9c850e..403a81d 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -52,7 +52,6 @@
fvp_base_revc_2xaemva="fvp:fvp_base_revc-2xaemva_${model_version}_${model_build};/opt/model/Base_RevC_AEMvA_pkg/models/${model_flavour}"
fvp_base_aemv8a_gic600ae="fvp:fvp_base_aemv8a-gic600ae_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_Base_AEMv8A-GIC600AE_pkg/models/${model_flavour_11_17}"
fvp_base_aemv8a_aemv8a_aemv8a_aemv8a_ccn502="fvp:fvp_base_aemv8a-aemv8a-aemv8a-aemv8a-ccn502_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502_pkg/models/${model_flavour_11_17}"
-foundation_platform="fvp:foundation_platform_${model_version}_${model_build};/opt/model/Foundation_Platformpkg/models/${model_flavour}"
fvp_base_aemv8r="fvp:fvp_base_aemv8r_${model_version}_${model_build};/opt/model/AEMv8R_base_pkg/models/${model_flavour}"
# CSS model list
@@ -74,7 +73,6 @@
[base-aemv8a-latest-revb]="${fvp_arm_std_library};FVP_Base_AEMvA-AEMvA"
[base-aemva]="${fvp_base_aemva};FVP_Base_AEMvA"
[base-aemv8a-gic600ae]="${fvp_base_aemv8a_gic600ae};FVP_Base_AEMv8A-GIC600AE"
-[foundationv8]="${foundation_platform};Foundation_Platform"
[base-aemv8a]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
[cortex-a32x4]="${fvp_arm_std_library};FVP_Base_Cortex-A32x4"
[cortex-a35x4]="${fvp_arm_std_library};FVP_Base_Cortex-A35x4"
diff --git a/group/qa-fvp-pre-release/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug b/group/qa-fvp-pre-release/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/qa-fvp-pre-release/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/qa-fvp-pre-release/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug b/group/qa-fvp-pre-release/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/qa-fvp-pre-release/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/qa-fvp-pre-release/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug b/group/qa-fvp-pre-release/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/qa-fvp-pre-release/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-boot-tests-foundation/fvp-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8 b/group/tf-l1-boot-tests-foundation/fvp-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l1-boot-tests-foundation/fvp-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-boot-tests-foundation/fvp-mtpmu-disable-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8 b/group/tf-l1-boot-tests-foundation/fvp-mtpmu-disable-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8
deleted file mode 100644
index dc36574..0000000
--- a/group/tf-l1-boot-tests-foundation/fvp-mtpmu-disable-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-boot-tests-foundation/fvp-pie-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8 b/group/tf-l1-boot-tests-foundation/fvp-pie-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8
deleted file mode 100644
index dc36574..0000000
--- a/group/tf-l1-boot-tests-foundation/fvp-pie-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-boot-tests-foundation/fvp-tspd-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8 b/group/tf-l1-boot-tests-foundation/fvp-tspd-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l1-boot-tests-foundation/fvp-tspd-aarch64-only:fvp-linux-dtb.foundation-fip.uboot-foundationv8
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-boot-tests-misc/fvp-linux-as-bl33-aarch64-only:fvp-linux.bl33-dtb.foundation-foundationv8.linux.bl33-debug b/group/tf-l1-boot-tests-misc/fvp-linux-as-bl33-aarch64-only:fvp-linux.bl33-dtb.foundation-foundationv8.linux.bl33-debug
deleted file mode 100644
index 45065d8..0000000
--- a/group/tf-l1-boot-tests-misc/fvp-linux-as-bl33-aarch64-only:fvp-linux.bl33-dtb.foundation-foundationv8.linux.bl33-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-boot-tests-foundation/fvp-aarch64-only:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug b/group/tf-l2-boot-tests-foundation/fvp-aarch64-only:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-foundation/fvp-aarch64-only:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_0-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_0-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_0-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_1-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_1-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_1-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_2-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_2-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_2-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_3-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_3-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_3-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_4-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_4-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_4-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-boot-tests-foundation/fvp-opteed-aarch64-only:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8 b/group/tf-l2-boot-tests-foundation/fvp-opteed-aarch64-only:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-foundation/fvp-opteed-aarch64-only:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-boot-tests-foundation/fvp-opteed-aarch64-only:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug b/group/tf-l2-boot-tests-foundation/fvp-opteed-aarch64-only:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-foundation/fvp-opteed-aarch64-only:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-boot-tests-foundation/fvp-tspd-aarch64-only:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug b/group/tf-l2-boot-tests-foundation/fvp-tspd-aarch64-only:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-foundation/fvp-tspd-aarch64-only:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l3-boot-tests-spm-mm/fvp-spm-mm-aarch64-only,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug b/group/tf-l3-boot-tests-spm-mm/fvp-spm-mm-aarch64-only,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
deleted file mode 100644
index 0a342ff..0000000
--- a/group/tf-l3-boot-tests-spm-mm/fvp-spm-mm-aarch64-only,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tftf-l1-fvp/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-l1-fvp/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l1-fvp/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l1-fvp/fvp-tspd-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd b/group/tftf-l1-fvp/fvp-tspd-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l1-fvp/fvp-tspd-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-aarch64-only,fvp-extensive:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-l2-extensive-tests-fvp/fvp-aarch64-only,fvp-extensive:fvp-tftf-fip.tftf-foundationv8
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-extensive-tests-fvp/fvp-aarch64-only,fvp-extensive:fvp-tftf-fip.tftf-foundationv8
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-tspd-aarch64-only,fvp-extensive:fvp-tftf-fip.tftf-foundationv8-tspd b/group/tftf-l2-extensive-tests-fvp/fvp-tspd-aarch64-only,fvp-extensive:fvp-tftf-fip.tftf-foundationv8-tspd
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-extensive-tests-fvp/fvp-tspd-aarch64-only,fvp-extensive:fvp-tftf-fip.tftf-foundationv8-tspd
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-opteed-aarch64-only,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8 b/group/tftf-l2-fvp-auxiliary/fvp-opteed-aarch64-only,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp-auxiliary/fvp-opteed-aarch64-only,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug b/group/tftf-l2-fvp/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-enable-runtime-instr-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp/fvp-enable-runtime-instr-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-hcx-aarch64-only,fvp-hcx:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-l2-fvp/fvp-hcx-aarch64-only,fvp-hcx:fvp-tftf-fip.tftf-foundationv8
deleted file mode 100644
index d80ee2e..0000000
--- a/group/tftf-l2-fvp/fvp-hcx-aarch64-only,fvp-hcx:fvp-tftf-fip.tftf-foundationv8
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tftf-l2-fvp/fvp-mtpmu-disable-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug b/group/tftf-l2-fvp/fvp-mtpmu-disable-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
deleted file mode 100644
index dc36574..0000000
--- a/group/tftf-l2-fvp/fvp-mtpmu-disable-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-tspd-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug b/group/tftf-l2-fvp/fvp-tspd-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp/fvp-tspd-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-unstable/fvp-aarch64-only,fvp-unstable:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-unstable/fvp-aarch64-only,fvp-unstable:fvp-tftf-fip.tftf-foundationv8
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-unstable/fvp-aarch64-only,fvp-unstable:fvp-tftf-fip.tftf-foundationv8
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/model/foundationv8.sh b/model/foundationv8.sh
deleted file mode 100644
index 32da226..0000000
--- a/model/foundationv8.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 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/Foundation_Platform"
-
-default_var ncores 4
-default_var quantum 1000
-
-cat <<EOF >"$model_param_file"
-
---no-visualization
---data=$bl1_bin@$bl1_addr
-${fip_bin+--data=$fip_bin@$fip_addr}
-${dtb_bin+--data=$dtb_bin@$dtb_addr}
-${kernel_bin+--data=$kernel_bin@$kernel_addr}
-${initrd_bin+--data=$initrd_bin@$initrd_addr}
-${rootfs_bin+--block-device=$rootfs_bin}
---cores=$ncores
---secure-memory
---gicv3
---quantum=$quantum
-${arch_version+--arm-v$arch_version}
-${bmcov_plugin+--plugin=$bmcov_plugin_path}
-${wait_debugger+--cadi-server}
-EOF
diff --git a/run_config/fvp-dtb.foundation b/run_config/fvp-dtb.foundation
deleted file mode 100644
index ce35a2f..0000000
--- a/run_config/fvp-dtb.foundation
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
- dtb_type="fvp-foundation-gicv3-psci" get_dtb
- update_fip_hw_config
-}
diff --git a/run_config/fvp-foundationv8 b/run_config/fvp-foundationv8
deleted file mode 100644
index 4a08a94..0000000
--- a/run_config/fvp-foundationv8
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="foundationv8"
-
- uart="0" set_expect_variable "num_cpus" "4"
-
- model="$model" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-foundationv8.8_0 b/run_config/fvp-foundationv8.8_0
deleted file mode 100644
index c2159cb..0000000
--- a/run_config/fvp-foundationv8.8_0
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="foundationv8"
-
- uart="0" set_expect_variable "num_cpus" "4"
-
- model="$model" arch_version="8.0" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-foundationv8.8_1 b/run_config/fvp-foundationv8.8_1
deleted file mode 100644
index c75b36a..0000000
--- a/run_config/fvp-foundationv8.8_1
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="foundationv8"
-
- uart="0" set_expect_variable "num_cpus" "4"
-
- model="$model" arch_version="8.1" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-foundationv8.8_2 b/run_config/fvp-foundationv8.8_2
deleted file mode 100644
index 768c2e1..0000000
--- a/run_config/fvp-foundationv8.8_2
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="foundationv8"
-
- uart="0" set_expect_variable "num_cpus" "4"
-
- model="$model" arch_version="8.2" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-foundationv8.8_3 b/run_config/fvp-foundationv8.8_3
deleted file mode 100644
index 708a086..0000000
--- a/run_config/fvp-foundationv8.8_3
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="foundationv8"
-
- uart="0" set_expect_variable "num_cpus" "4"
-
- model="$model" arch_version="8.3" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-foundationv8.8_4 b/run_config/fvp-foundationv8.8_4
deleted file mode 100644
index 01b0b59..0000000
--- a/run_config/fvp-foundationv8.8_4
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="foundationv8"
-
- uart="0" set_expect_variable "num_cpus" "4"
-
- model="$model" arch_version="8.4" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-foundationv8.bmcov b/run_config/fvp-foundationv8.bmcov
deleted file mode 100644
index 0774d42..0000000
--- a/run_config/fvp-foundationv8.bmcov
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="foundationv8"
-
- uart="0" set_expect_variable "num_cpus" "4"
-
- model="$model" bmcov_plugin="1" \
- bmcov_plugin_path="${coverage_trace_plugin}" \
- gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-foundationv8.linux.bl33 b/run_config/fvp-foundationv8.linux.bl33
deleted file mode 100644
index 6f8493f..0000000
--- a/run_config/fvp-foundationv8.linux.bl33
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_build() {
- # Build FIP without any BL33 image (it is preloaded)
- build_fip
-}
-
-generate_lava_job() {
- local model="foundationv8"
-
- uart="0" set_expect_variable "num_cpus" "4"
-
- model="$model" \
- dtb_addr="0x80070000" \
- kernel_addr="0x80080000" \
- gen_model_params
-
- model="model" gen_fvp_yaml
-}