summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur She <arthur.she@linaro.org>2023-03-29 13:16:55 -0700
committerArthur She <arthur.she@linaro.org>2023-05-03 19:15:20 -0700
commit985ae5a3423fe18186d30827bca3f7644eb35aa7 (patch)
tree8b234f39a9b8c7effd44282a7caae7864423a497
parente21819c0fb4be648e234ed058c8208e1e0d7dfbb (diff)
Remove some configs to reduce build time
Signed-off-by: Arthur She <arthur.she@linaro.org>
-rw-r--r--group/tf-l1-build-plat/a3700-default:nil54
-rw-r--r--group/tf-l1-build-plat/a5ds:nil6
-rw-r--r--group/tf-l1-build-plat/a70x0-default:nil31
-rw-r--r--group/tf-l1-build-plat/a70x0_amc-default:nil31
-rw-r--r--group/tf-l1-build-plat/a80x0-default:nil31
-rw-r--r--group/tf-l1-build-plat/a80x0_mcbin-default:nil31
-rw-r--r--group/tf-l1-build-plat/agilex-default:nil6
-rw-r--r--group/tf-l1-build-plat/axg-atos:nil5
-rw-r--r--group/tf-l1-build-plat/axg-default:nil5
-rw-r--r--group/tf-l1-build-plat/axg-opteed:nil5
-rw-r--r--group/tf-l1-build-plat/corstone1000-fpga-default:nil6
-rw-r--r--group/tf-l1-build-plat/corstone1000-fvp-default:nil6
-rw-r--r--group/tf-l1-build-plat/corstone700-fpga-default:nil6
-rw-r--r--group/tf-l1-build-plat/corstone700-fvp-default:nil6
-rw-r--r--group/tf-l1-build-plat/fvp-el3-spmc-tsp:nil6
-rw-r--r--group/tf-l1-build-plat/fvp-morello-tbb:nil6
-rw-r--r--group/tf-l1-build-plat/fvp-rme:nil5
-rw-r--r--group/tf-l1-build-plat/fvp-tc0-tbb:nil6
-rw-r--r--group/tf-l1-build-plat/fvp-tc1-tbb:nil5
-rw-r--r--group/tf-l1-build-plat/fvp-tc2-tbb:nil5
-rw-r--r--group/tf-l1-build-plat/fvp_ve-a5:nil6
-rw-r--r--group/tf-l1-build-plat/fvp_ve-a7:nil6
-rw-r--r--group/tf-l1-build-plat/g12a-default:nil6
-rw-r--r--group/tf-l1-build-plat/gxbb-default:nil6
-rw-r--r--group/tf-l1-build-plat/gxl-default:nil6
-rw-r--r--group/tf-l1-build-plat/hikey-default:nil6
-rw-r--r--group/tf-l1-build-plat/hikey-enable-pmf:nil6
-rw-r--r--group/tf-l1-build-plat/hikey-opteed:nil6
-rw-r--r--group/tf-l1-build-plat/hikey960-default:nil6
-rw-r--r--group/tf-l1-build-plat/hikey960-opteed:nil6
-rw-r--r--group/tf-l1-build-plat/imx8mm-default:nil6
-rw-r--r--group/tf-l1-build-plat/imx8mm-mb_hash256-tbb-embedtls-debug:nil5
-rw-r--r--group/tf-l1-build-plat/imx8mn-sdei:nil5
-rw-r--r--group/tf-l1-build-plat/imx8qm-default:nil6
-rw-r--r--group/tf-l1-build-plat/imx8qx-default:nil6
-rw-r--r--group/tf-l1-build-plat/k3-default:nil6
-rw-r--r--group/tf-l1-build-plat/k3-j784s4-default:nil6
-rw-r--r--group/tf-l1-build-plat/ls1028ardb-default:nil6
-rw-r--r--group/tf-l1-build-plat/ls1043ardb-default:nil6
-rw-r--r--group/tf-l1-build-plat/ls1046afrwy-default:nil5
-rw-r--r--group/tf-l1-build-plat/ls1046aqds-default:nil5
-rw-r--r--group/tf-l1-build-plat/ls1046ardb-default:nil5
-rw-r--r--group/tf-l1-build-plat/ls1088aqds-default:nil5
-rw-r--r--group/tf-l1-build-plat/ls1088ardb-default:nil5
-rw-r--r--group/tf-l1-build-plat/lx2160aqds-default:nil6
-rw-r--r--group/tf-l1-build-plat/lx2160ardb-default:nil6
-rw-r--r--group/tf-l1-build-plat/lx2162aqds-default:nil6
-rw-r--r--group/tf-l1-build-plat/lx2162aqds-tbb:nil6
-rw-r--r--group/tf-l1-build-plat/morello-tbb:nil6
-rw-r--r--group/tf-l1-build-plat/n1sdp-tbb-optee-spmc:nil5
-rw-r--r--group/tf-l1-build-plat/n1sdp-tbb:nil5
-rw-r--r--group/tf-l1-build-plat/n5x-default:nil5
-rw-r--r--group/tf-l1-build-plat/poplar-default:nil6
-rw-r--r--group/tf-l1-build-plat/px30-default:nil6
-rw-r--r--group/tf-l1-build-plat/qemu-aarch32-opteed:nil6
-rw-r--r--group/tf-l1-build-plat/qemu-default:nil6
-rw-r--r--group/tf-l1-build-plat/qemu-gicv3:nil6
-rw-r--r--group/tf-l1-build-plat/qemu-mb_hash256:nil5
-rw-r--r--group/tf-l1-build-plat/qemu-opteed-tbb-enc:norun-fip.dummy5
-rw-r--r--group/tf-l1-build-plat/qemu-tbb:norun-fip.dummy5
-rw-r--r--group/tf-l1-build-plat/qemu_sbsa-default:nil6
-rw-r--r--group/tf-l1-build-plat/qemu_sbsa-spm-mm-sme:nil5
-rw-r--r--group/tf-l1-build-plat/qemu_sbsa-stack-protector-rndcanary:nil6
-rw-r--r--group/tf-l1-build-plat/qemu_sbsa-stack-protector:nil6
-rw-r--r--group/tf-l1-build-plat/rcar-auto-opteed:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-d3-draak:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-h3n-opteed:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil10
-rw-r--r--group/tf-l1-build-plat/rcar-v3m-eagle:nil10
-rw-r--r--group/tf-l1-build-plat/rk3288-default:nil10
-rw-r--r--group/tf-l1-build-plat/rk3328-coreboot:nil6
-rw-r--r--group/tf-l1-build-plat/rk3328-default:nil12
-rw-r--r--group/tf-l1-build-plat/rk3368-coreboot:nil6
-rw-r--r--group/tf-l1-build-plat/rk3368-default:nil12
-rw-r--r--group/tf-l1-build-plat/rk3399-coreboot:nil6
-rw-r--r--group/tf-l1-build-plat/rk3399-default:nil12
-rw-r--r--group/tf-l1-build-plat/rzg-hihope-rzg2m:nil10
-rw-r--r--group/tf-l1-build-plat/stingray-default:nil6
-rw-r--r--group/tf-l1-build-plat/stingray-tbb:nil5
-rw-r--r--group/tf-l1-build-plat/stratix10-default:nil6
-rw-r--r--group/tf-l1-build-plat/sun50i_a64-default:nil6
-rw-r--r--group/tf-l1-build-plat/sun50i_h6-default:nil6
-rw-r--r--group/tf-l1-build-plat/sun50i_h616-default:nil6
-rw-r--r--group/tf-l1-build-plat/sun50i_r329-default:nil6
-rw-r--r--group/tf-l1-build-plat/synquacer-default:nil6
-rw-r--r--group/tf-l1-build-plat/synquacer-spm:nil6
-rw-r--r--group/tf-l1-build-plat/t9130-default:nil31
-rw-r--r--group/tf-l1-build-plat/tegra-t186-trusty:nil6
-rw-r--r--group/tf-l1-build-plat/tegra-t194-default:nil6
-rw-r--r--group/tf-l1-build-plat/tegra-t210-tlkd:nil6
-rw-r--r--group/tf-l1-build-plat/tegra-t210-trusty:nil6
-rw-r--r--group/tf-l1-build-plat/uniphier-default:nil6
-rw-r--r--group/tf-l1-build-plat/uniphier-tbb-gzip:nil6
-rw-r--r--group/tf-l1-build-plat/uniphier-tbb:nil6
-rw-r--r--group/tf-l1-build-plat/uniphier-tsp:nil6
-rw-r--r--group/tf-l1-build-plat/versal-console:nil5
-rw-r--r--group/tf-l1-build-plat/versal-crcchk:nil5
-rw-r--r--group/tf-l1-build-plat/versal-ddr:nil5
-rw-r--r--group/tf-l1-build-plat/versal-debug:nil5
-rw-r--r--group/tf-l1-build-plat/versal-default:nil6
-rw-r--r--group/tf-l1-build-plat/versal-opteed:nil5
-rw-r--r--group/tf-l1-build-plat/versal-virt:nil6
-rw-r--r--group/tf-l1-build-plat/versal_net-console:nil6
-rw-r--r--group/tf-l1-build-plat/versal_net-default:nil6
-rw-r--r--group/tf-l1-build-plat/versal_net-no-pm:nil6
-rw-r--r--group/tf-l1-build-plat/warp7-default:nil6
-rw-r--r--group/tf-l1-build-plat/zynqmp-console:nil6
-rw-r--r--group/tf-l1-build-plat/zynqmp-ddr:nil6
-rw-r--r--group/tf-l1-build-plat/zynqmp-debug:nil6
-rw-r--r--group/tf-l1-build-plat/zynqmp-default:nil6
-rw-r--r--group/tf-l1-build-plat/zynqmp-opteed-secure-efuses:nil6
-rw-r--r--group/tf-l1-build-plat/zynqmp-opteed:nil6
-rw-r--r--group/tf-l1-build-plat/zynqmp-pncd:nil6
-rw-r--r--group/tf-l1-build-plat/zynqmp-tspd-tdram:nil6
-rw-r--r--group/tf-l1-build-plat/zynqmp-tspd:nil6
-rw-r--r--group/tf-l1-build-plat/zynqmp-wdtrestart:nil6
123 files changed, 0 insertions, 959 deletions
diff --git a/group/tf-l1-build-plat/a3700-default:nil b/group/tf-l1-build-plat/a3700-default:nil
deleted file mode 100644
index 06f4a3f5..00000000
--- a/group/tf-l1-build-plat/a3700-default:nil
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="all mrvl_flash mrvl_uart" set_tf_build_targets
-
- pushd "$workspace"
-
- if [ ! -d "A3700-utils-marvell" ]; then
- saveas="A3700-utils-marvell.tar.gz" \
- url="$tfa_downloads/A3700-utils-marvell/A3700-utils-marvell-f014428f4bf7feafec1dcc4c37506d847718649a.tar.gz" \
- fetch_file
-
- tar -xzf "A3700-utils-marvell.tar.gz"
- fi
-
- echo "Set WTP to $workspace/A3700-utils-marvell"
- set_hook_var "WTP" "$workspace/A3700-utils-marvell"
-
- if [ ! -d "mv-ddr-marvell" ]; then
- saveas="mv-ddr-marvell.tar.gz" \
- url="$tfa_downloads/mv-ddr-marvell/mv-ddr-marvell-5d41a995637de1dbc93f193db6ef0c8954cab316.tar.gz" \
- fetch_file
-
- tar -xzf "mv-ddr-marvell.tar.gz"
- fi
-
- echo "Set MV_DDR_PATH to $workspace/mv-ddr-marvell"
- set_hook_var "MV_DDR_PATH" "$workspace/mv-ddr-marvell"
-
- if [ ! -d "cryptopp" ]; then
- saveas="cryptopp.zip" \
- url="$tfa_downloads/cryptopp/cryptopp870.zip" \
- fetch_file
-
- unzip -d cryptopp "cryptopp.zip"
- fi
-
- echo "Set CRYPTOPP_PATH to $workspace/cryptopp"
- set_hook_var "CRYPTOPP_PATH" "$workspace/cryptopp"
-
- popd "$workspace"
-}
-
-post_tf_build() {
- # Remove files in uart-images subdirectory as these files have same names as files in upper directory.
- # Currently CI is not able to successfully finish all tests if there are two directories with same file names.
- if [ -d "${tf_build_root}/${plat}/${mode}/uart-images" ];then
- rm -rf ${tf_build_root}/${plat}/${mode}/uart-images
- fi
-}
diff --git a/group/tf-l1-build-plat/a5ds:nil b/group/tf-l1-build-plat/a5ds:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/a5ds:nil
+++ /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-build-plat/a70x0-default:nil b/group/tf-l1-build-plat/a70x0-default:nil
deleted file mode 100644
index d63ca7e9..00000000
--- a/group/tf-l1-build-plat/a70x0-default:nil
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-test_setup() {
- # Parallel builds are broken for this config; so choose serial.
- echo "Choosing serial build."
- set_hook_var "make_j" "1"
-}
-
-pre_tf_build() {
- targets="all mrvl_flash" set_tf_build_targets
-
- pushd "$workspace"
-
- if [ ! -d "mv-ddr-marvell" ]; then
- saveas="mv-ddr-marvell.tar.gz" \
- url="$tfa_downloads/mv-ddr-marvell/mv-ddr-marvell-5d41a995637de1dbc93f193db6ef0c8954cab316.tar.gz" \
- fetch_file
-
- tar -xzf "mv-ddr-marvell.tar.gz"
- fi
-
- echo "Set MV_DDR_PATH to $workspace/mv-ddr-marvell"
- set_hook_var "MV_DDR_PATH" "$workspace/mv-ddr-marvell"
-
- popd "$workspace"
-}
diff --git a/group/tf-l1-build-plat/a70x0_amc-default:nil b/group/tf-l1-build-plat/a70x0_amc-default:nil
deleted file mode 100644
index d63ca7e9..00000000
--- a/group/tf-l1-build-plat/a70x0_amc-default:nil
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-test_setup() {
- # Parallel builds are broken for this config; so choose serial.
- echo "Choosing serial build."
- set_hook_var "make_j" "1"
-}
-
-pre_tf_build() {
- targets="all mrvl_flash" set_tf_build_targets
-
- pushd "$workspace"
-
- if [ ! -d "mv-ddr-marvell" ]; then
- saveas="mv-ddr-marvell.tar.gz" \
- url="$tfa_downloads/mv-ddr-marvell/mv-ddr-marvell-5d41a995637de1dbc93f193db6ef0c8954cab316.tar.gz" \
- fetch_file
-
- tar -xzf "mv-ddr-marvell.tar.gz"
- fi
-
- echo "Set MV_DDR_PATH to $workspace/mv-ddr-marvell"
- set_hook_var "MV_DDR_PATH" "$workspace/mv-ddr-marvell"
-
- popd "$workspace"
-}
diff --git a/group/tf-l1-build-plat/a80x0-default:nil b/group/tf-l1-build-plat/a80x0-default:nil
deleted file mode 100644
index d63ca7e9..00000000
--- a/group/tf-l1-build-plat/a80x0-default:nil
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-test_setup() {
- # Parallel builds are broken for this config; so choose serial.
- echo "Choosing serial build."
- set_hook_var "make_j" "1"
-}
-
-pre_tf_build() {
- targets="all mrvl_flash" set_tf_build_targets
-
- pushd "$workspace"
-
- if [ ! -d "mv-ddr-marvell" ]; then
- saveas="mv-ddr-marvell.tar.gz" \
- url="$tfa_downloads/mv-ddr-marvell/mv-ddr-marvell-5d41a995637de1dbc93f193db6ef0c8954cab316.tar.gz" \
- fetch_file
-
- tar -xzf "mv-ddr-marvell.tar.gz"
- fi
-
- echo "Set MV_DDR_PATH to $workspace/mv-ddr-marvell"
- set_hook_var "MV_DDR_PATH" "$workspace/mv-ddr-marvell"
-
- popd "$workspace"
-}
diff --git a/group/tf-l1-build-plat/a80x0_mcbin-default:nil b/group/tf-l1-build-plat/a80x0_mcbin-default:nil
deleted file mode 100644
index d63ca7e9..00000000
--- a/group/tf-l1-build-plat/a80x0_mcbin-default:nil
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-test_setup() {
- # Parallel builds are broken for this config; so choose serial.
- echo "Choosing serial build."
- set_hook_var "make_j" "1"
-}
-
-pre_tf_build() {
- targets="all mrvl_flash" set_tf_build_targets
-
- pushd "$workspace"
-
- if [ ! -d "mv-ddr-marvell" ]; then
- saveas="mv-ddr-marvell.tar.gz" \
- url="$tfa_downloads/mv-ddr-marvell/mv-ddr-marvell-5d41a995637de1dbc93f193db6ef0c8954cab316.tar.gz" \
- fetch_file
-
- tar -xzf "mv-ddr-marvell.tar.gz"
- fi
-
- echo "Set MV_DDR_PATH to $workspace/mv-ddr-marvell"
- set_hook_var "MV_DDR_PATH" "$workspace/mv-ddr-marvell"
-
- popd "$workspace"
-}
diff --git a/group/tf-l1-build-plat/agilex-default:nil b/group/tf-l1-build-plat/agilex-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/agilex-default:nil
+++ /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-build-plat/axg-atos:nil b/group/tf-l1-build-plat/axg-atos:nil
deleted file mode 100644
index 0a342ff2..00000000
--- a/group/tf-l1-build-plat/axg-atos:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/axg-default:nil b/group/tf-l1-build-plat/axg-default:nil
deleted file mode 100644
index 0a342ff2..00000000
--- a/group/tf-l1-build-plat/axg-default:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/axg-opteed:nil b/group/tf-l1-build-plat/axg-opteed:nil
deleted file mode 100644
index 0a342ff2..00000000
--- a/group/tf-l1-build-plat/axg-opteed:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/corstone1000-fpga-default:nil b/group/tf-l1-build-plat/corstone1000-fpga-default:nil
deleted file mode 100644
index 45065d86..00000000
--- a/group/tf-l1-build-plat/corstone1000-fpga-default:nil
+++ /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-l1-build-plat/corstone1000-fvp-default:nil b/group/tf-l1-build-plat/corstone1000-fvp-default:nil
deleted file mode 100644
index 45065d86..00000000
--- a/group/tf-l1-build-plat/corstone1000-fvp-default:nil
+++ /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-l1-build-plat/corstone700-fpga-default:nil b/group/tf-l1-build-plat/corstone700-fpga-default:nil
deleted file mode 100644
index d52947dc..00000000
--- a/group/tf-l1-build-plat/corstone700-fpga-default:nil
+++ /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-build-plat/corstone700-fvp-default:nil b/group/tf-l1-build-plat/corstone700-fvp-default:nil
deleted file mode 100644
index d52947dc..00000000
--- a/group/tf-l1-build-plat/corstone700-fvp-default:nil
+++ /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-build-plat/fvp-el3-spmc-tsp:nil b/group/tf-l1-build-plat/fvp-el3-spmc-tsp:nil
deleted file mode 100644
index 5ad96337..00000000
--- a/group/tf-l1-build-plat/fvp-el3-spmc-tsp:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/fvp-morello-tbb:nil b/group/tf-l1-build-plat/fvp-morello-tbb:nil
deleted file mode 100644
index 33f3ae7f..00000000
--- a/group/tf-l1-build-plat/fvp-morello-tbb:nil
+++ /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-l1-build-plat/fvp-rme:nil b/group/tf-l1-build-plat/fvp-rme:nil
deleted file mode 100644
index b8939c8b..00000000
--- a/group/tf-l1-build-plat/fvp-rme:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/fvp-tc0-tbb:nil b/group/tf-l1-build-plat/fvp-tc0-tbb:nil
deleted file mode 100644
index d52947dc..00000000
--- a/group/tf-l1-build-plat/fvp-tc0-tbb:nil
+++ /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-build-plat/fvp-tc1-tbb:nil b/group/tf-l1-build-plat/fvp-tc1-tbb:nil
deleted file mode 100644
index aa575402..00000000
--- a/group/tf-l1-build-plat/fvp-tc1-tbb:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2021, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/fvp-tc2-tbb:nil b/group/tf-l1-build-plat/fvp-tc2-tbb:nil
deleted file mode 100644
index b8939c8b..00000000
--- a/group/tf-l1-build-plat/fvp-tc2-tbb:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/fvp_ve-a5:nil b/group/tf-l1-build-plat/fvp_ve-a5:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/fvp_ve-a5:nil
+++ /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-build-plat/fvp_ve-a7:nil b/group/tf-l1-build-plat/fvp_ve-a7:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/fvp_ve-a7:nil
+++ /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-build-plat/g12a-default:nil b/group/tf-l1-build-plat/g12a-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/g12a-default:nil
+++ /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-build-plat/gxbb-default:nil b/group/tf-l1-build-plat/gxbb-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/gxbb-default:nil
+++ /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-build-plat/gxl-default:nil b/group/tf-l1-build-plat/gxl-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/gxl-default:nil
+++ /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-build-plat/hikey-default:nil b/group/tf-l1-build-plat/hikey-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/hikey-default:nil
+++ /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-build-plat/hikey-enable-pmf:nil b/group/tf-l1-build-plat/hikey-enable-pmf:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/hikey-enable-pmf:nil
+++ /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-build-plat/hikey-opteed:nil b/group/tf-l1-build-plat/hikey-opteed:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/hikey-opteed:nil
+++ /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-build-plat/hikey960-default:nil b/group/tf-l1-build-plat/hikey960-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/hikey960-default:nil
+++ /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-build-plat/hikey960-opteed:nil b/group/tf-l1-build-plat/hikey960-opteed:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/hikey960-opteed:nil
+++ /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-build-plat/imx8mm-default:nil b/group/tf-l1-build-plat/imx8mm-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/imx8mm-default:nil
+++ /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-build-plat/imx8mm-mb_hash256-tbb-embedtls-debug:nil b/group/tf-l1-build-plat/imx8mm-mb_hash256-tbb-embedtls-debug:nil
deleted file mode 100644
index b8939c8b..00000000
--- a/group/tf-l1-build-plat/imx8mm-mb_hash256-tbb-embedtls-debug:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/imx8mn-sdei:nil b/group/tf-l1-build-plat/imx8mn-sdei:nil
deleted file mode 100644
index 0a342ff2..00000000
--- a/group/tf-l1-build-plat/imx8mn-sdei:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/imx8qm-default:nil b/group/tf-l1-build-plat/imx8qm-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/imx8qm-default:nil
+++ /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-build-plat/imx8qx-default:nil b/group/tf-l1-build-plat/imx8qx-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/imx8qx-default:nil
+++ /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-build-plat/k3-default:nil b/group/tf-l1-build-plat/k3-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/k3-default:nil
+++ /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-build-plat/k3-j784s4-default:nil b/group/tf-l1-build-plat/k3-j784s4-default:nil
deleted file mode 100644
index 0849ee7f..00000000
--- a/group/tf-l1-build-plat/k3-j784s4-default:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/ls1028ardb-default:nil b/group/tf-l1-build-plat/ls1028ardb-default:nil
deleted file mode 100644
index 45065d86..00000000
--- a/group/tf-l1-build-plat/ls1028ardb-default:nil
+++ /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-l1-build-plat/ls1043ardb-default:nil b/group/tf-l1-build-plat/ls1043ardb-default:nil
deleted file mode 100644
index 3f7598ae..00000000
--- a/group/tf-l1-build-plat/ls1043ardb-default:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/ls1046afrwy-default:nil b/group/tf-l1-build-plat/ls1046afrwy-default:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/ls1046afrwy-default:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/ls1046aqds-default:nil b/group/tf-l1-build-plat/ls1046aqds-default:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/ls1046aqds-default:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/ls1046ardb-default:nil b/group/tf-l1-build-plat/ls1046ardb-default:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/ls1046ardb-default:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/ls1088aqds-default:nil b/group/tf-l1-build-plat/ls1088aqds-default:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/ls1088aqds-default:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/ls1088ardb-default:nil b/group/tf-l1-build-plat/ls1088ardb-default:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/ls1088ardb-default:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/lx2160aqds-default:nil b/group/tf-l1-build-plat/lx2160aqds-default:nil
deleted file mode 100644
index 45065d86..00000000
--- a/group/tf-l1-build-plat/lx2160aqds-default:nil
+++ /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-l1-build-plat/lx2160ardb-default:nil b/group/tf-l1-build-plat/lx2160ardb-default:nil
deleted file mode 100644
index 45065d86..00000000
--- a/group/tf-l1-build-plat/lx2160ardb-default:nil
+++ /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-l1-build-plat/lx2162aqds-default:nil b/group/tf-l1-build-plat/lx2162aqds-default:nil
deleted file mode 100644
index 45065d86..00000000
--- a/group/tf-l1-build-plat/lx2162aqds-default:nil
+++ /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-l1-build-plat/lx2162aqds-tbb:nil b/group/tf-l1-build-plat/lx2162aqds-tbb:nil
deleted file mode 100644
index 5515958f..00000000
--- a/group/tf-l1-build-plat/lx2162aqds-tbb:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/morello-tbb:nil b/group/tf-l1-build-plat/morello-tbb:nil
deleted file mode 100644
index 33f3ae7f..00000000
--- a/group/tf-l1-build-plat/morello-tbb:nil
+++ /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-l1-build-plat/n1sdp-tbb-optee-spmc:nil b/group/tf-l1-build-plat/n1sdp-tbb-optee-spmc:nil
deleted file mode 100644
index b8939c8b..00000000
--- a/group/tf-l1-build-plat/n1sdp-tbb-optee-spmc:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/n1sdp-tbb:nil b/group/tf-l1-build-plat/n1sdp-tbb:nil
deleted file mode 100644
index b8939c8b..00000000
--- a/group/tf-l1-build-plat/n1sdp-tbb:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/n5x-default:nil b/group/tf-l1-build-plat/n5x-default:nil
deleted file mode 100644
index 75f5f1d1..00000000
--- a/group/tf-l1-build-plat/n5x-default:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2020-2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/poplar-default:nil b/group/tf-l1-build-plat/poplar-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/poplar-default:nil
+++ /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-build-plat/px30-default:nil b/group/tf-l1-build-plat/px30-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/px30-default:nil
+++ /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-build-plat/qemu-aarch32-opteed:nil b/group/tf-l1-build-plat/qemu-aarch32-opteed:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/qemu-aarch32-opteed:nil
+++ /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-build-plat/qemu-default:nil b/group/tf-l1-build-plat/qemu-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/qemu-default:nil
+++ /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-build-plat/qemu-gicv3:nil b/group/tf-l1-build-plat/qemu-gicv3:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/qemu-gicv3:nil
+++ /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-build-plat/qemu-mb_hash256:nil b/group/tf-l1-build-plat/qemu-mb_hash256:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/qemu-mb_hash256:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/qemu-opteed-tbb-enc:norun-fip.dummy b/group/tf-l1-build-plat/qemu-opteed-tbb-enc:norun-fip.dummy
deleted file mode 100644
index 0a342ff2..00000000
--- a/group/tf-l1-build-plat/qemu-opteed-tbb-enc:norun-fip.dummy
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/qemu-tbb:norun-fip.dummy b/group/tf-l1-build-plat/qemu-tbb:norun-fip.dummy
deleted file mode 100644
index 0a342ff2..00000000
--- a/group/tf-l1-build-plat/qemu-tbb:norun-fip.dummy
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/qemu_sbsa-default:nil b/group/tf-l1-build-plat/qemu_sbsa-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/qemu_sbsa-default:nil
+++ /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-build-plat/qemu_sbsa-spm-mm-sme:nil b/group/tf-l1-build-plat/qemu_sbsa-spm-mm-sme:nil
deleted file mode 100644
index b452bbf5..00000000
--- a/group/tf-l1-build-plat/qemu_sbsa-spm-mm-sme:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/qemu_sbsa-stack-protector-rndcanary:nil b/group/tf-l1-build-plat/qemu_sbsa-stack-protector-rndcanary:nil
deleted file mode 100644
index 45065d86..00000000
--- a/group/tf-l1-build-plat/qemu_sbsa-stack-protector-rndcanary:nil
+++ /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-l1-build-plat/qemu_sbsa-stack-protector:nil b/group/tf-l1-build-plat/qemu_sbsa-stack-protector:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/qemu_sbsa-stack-protector:nil
+++ /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-build-plat/rcar-auto-opteed:nil b/group/tf-l1-build-plat/rcar-auto-opteed:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-auto-opteed:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-d3-draak:nil b/group/tf-l1-build-plat/rcar-d3-draak:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-d3-draak:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil b/group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil b/group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil b/group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil b/group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-h3n-opteed:nil b/group/tf-l1-build-plat/rcar-h3n-opteed:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-h3n-opteed:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil b/group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil b/group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil b/group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil b/group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rcar-v3m-eagle:nil b/group/tf-l1-build-plat/rcar-v3m-eagle:nil
deleted file mode 100644
index a0afb7e8..00000000
--- a/group/tf-l1-build-plat/rcar-v3m-eagle:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rcar" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rk3288-default:nil b/group/tf-l1-build-plat/rk3288-default:nil
deleted file mode 100644
index f20bfc9b..00000000
--- a/group/tf-l1-build-plat/rk3288-default:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl32" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/rk3328-coreboot:nil b/group/tf-l1-build-plat/rk3328-coreboot:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/rk3328-coreboot:nil
+++ /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-build-plat/rk3328-default:nil b/group/tf-l1-build-plat/rk3328-default:nil
deleted file mode 100644
index eb54cfe7..00000000
--- a/group/tf-l1-build-plat/rk3328-default:nil
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_archive() {
- echo "Removing bl31.bin"
- rm -f "$archive/bl31.bin"
- touch "$archive/bl31.bin.deleted"
-}
diff --git a/group/tf-l1-build-plat/rk3368-coreboot:nil b/group/tf-l1-build-plat/rk3368-coreboot:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/rk3368-coreboot:nil
+++ /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-build-plat/rk3368-default:nil b/group/tf-l1-build-plat/rk3368-default:nil
deleted file mode 100644
index eb54cfe7..00000000
--- a/group/tf-l1-build-plat/rk3368-default:nil
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_archive() {
- echo "Removing bl31.bin"
- rm -f "$archive/bl31.bin"
- touch "$archive/bl31.bin.deleted"
-}
diff --git a/group/tf-l1-build-plat/rk3399-coreboot:nil b/group/tf-l1-build-plat/rk3399-coreboot:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/rk3399-coreboot:nil
+++ /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-build-plat/rk3399-default:nil b/group/tf-l1-build-plat/rk3399-default:nil
deleted file mode 100644
index eb54cfe7..00000000
--- a/group/tf-l1-build-plat/rk3399-default:nil
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_archive() {
- echo "Removing bl31.bin"
- rm -f "$archive/bl31.bin"
- touch "$archive/bl31.bin.deleted"
-}
diff --git a/group/tf-l1-build-plat/rzg-hihope-rzg2m:nil b/group/tf-l1-build-plat/rzg-hihope-rzg2m:nil
deleted file mode 100644
index c156d65e..00000000
--- a/group/tf-l1-build-plat/rzg-hihope-rzg2m:nil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-pre_tf_build() {
- targets="bl2 bl31 rzg" set_tf_build_targets
-}
diff --git a/group/tf-l1-build-plat/stingray-default:nil b/group/tf-l1-build-plat/stingray-default:nil
deleted file mode 100644
index d52947dc..00000000
--- a/group/tf-l1-build-plat/stingray-default:nil
+++ /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-build-plat/stingray-tbb:nil b/group/tf-l1-build-plat/stingray-tbb:nil
deleted file mode 100644
index b8939c8b..00000000
--- a/group/tf-l1-build-plat/stingray-tbb:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/stratix10-default:nil b/group/tf-l1-build-plat/stratix10-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/stratix10-default:nil
+++ /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-build-plat/sun50i_a64-default:nil b/group/tf-l1-build-plat/sun50i_a64-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/sun50i_a64-default:nil
+++ /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-build-plat/sun50i_h6-default:nil b/group/tf-l1-build-plat/sun50i_h6-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/sun50i_h6-default:nil
+++ /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-build-plat/sun50i_h616-default:nil b/group/tf-l1-build-plat/sun50i_h616-default:nil
deleted file mode 100644
index 45065d86..00000000
--- a/group/tf-l1-build-plat/sun50i_h616-default:nil
+++ /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-l1-build-plat/sun50i_r329-default:nil b/group/tf-l1-build-plat/sun50i_r329-default:nil
deleted file mode 100644
index 45065d86..00000000
--- a/group/tf-l1-build-plat/sun50i_r329-default:nil
+++ /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-l1-build-plat/synquacer-default:nil b/group/tf-l1-build-plat/synquacer-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/synquacer-default:nil
+++ /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-build-plat/synquacer-spm:nil b/group/tf-l1-build-plat/synquacer-spm:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/synquacer-spm:nil
+++ /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-build-plat/t9130-default:nil b/group/tf-l1-build-plat/t9130-default:nil
deleted file mode 100644
index 73b6fa82..00000000
--- a/group/tf-l1-build-plat/t9130-default:nil
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-test_setup() {
- # Parallel builds are broken for this config; so choose serial.
- echo "Choosing serial build."
- set_hook_var "make_j" "1"
-}
-
-pre_tf_build() {
- targets="all mrvl_flash" set_tf_build_targets
-
- pushd "$workspace"
-
- if [ ! -d "mv-ddr-marvell" ]; then
- saveas="mv-ddr-marvell.tar.gz" \
- url="$tfa_downloads/mv-ddr-marvell/mv-ddr-marvell-5d41a995637de1dbc93f193db6ef0c8954cab316.tar.gz" \
- fetch_file
-
- tar -xzf "mv-ddr-marvell.tar.gz"
- fi
-
- echo "Set MV_DDR_PATH to $workspace/mv-ddr-marvell"
- set_hook_var "MV_DDR_PATH" "$workspace/mv-ddr-marvell"
-
- popd "$workspace"
-}
diff --git a/group/tf-l1-build-plat/tegra-t186-trusty:nil b/group/tf-l1-build-plat/tegra-t186-trusty:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/tegra-t186-trusty:nil
+++ /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-build-plat/tegra-t194-default:nil b/group/tf-l1-build-plat/tegra-t194-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/tegra-t194-default:nil
+++ /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-build-plat/tegra-t210-tlkd:nil b/group/tf-l1-build-plat/tegra-t210-tlkd:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/tegra-t210-tlkd:nil
+++ /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-build-plat/tegra-t210-trusty:nil b/group/tf-l1-build-plat/tegra-t210-trusty:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/tegra-t210-trusty:nil
+++ /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-build-plat/uniphier-default:nil b/group/tf-l1-build-plat/uniphier-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/uniphier-default:nil
+++ /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-build-plat/uniphier-tbb-gzip:nil b/group/tf-l1-build-plat/uniphier-tbb-gzip:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/uniphier-tbb-gzip:nil
+++ /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-build-plat/uniphier-tbb:nil b/group/tf-l1-build-plat/uniphier-tbb:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/uniphier-tbb:nil
+++ /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-build-plat/uniphier-tsp:nil b/group/tf-l1-build-plat/uniphier-tsp:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/uniphier-tsp:nil
+++ /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-build-plat/versal-console:nil b/group/tf-l1-build-plat/versal-console:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/versal-console:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/versal-crcchk:nil b/group/tf-l1-build-plat/versal-crcchk:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/versal-crcchk:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/versal-ddr:nil b/group/tf-l1-build-plat/versal-ddr:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/versal-ddr:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/versal-debug:nil b/group/tf-l1-build-plat/versal-debug:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/versal-debug:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/versal-default:nil b/group/tf-l1-build-plat/versal-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/versal-default:nil
+++ /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-build-plat/versal-opteed:nil b/group/tf-l1-build-plat/versal-opteed:nil
deleted file mode 100644
index 35f87134..00000000
--- a/group/tf-l1-build-plat/versal-opteed:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/versal-virt:nil b/group/tf-l1-build-plat/versal-virt:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/versal-virt:nil
+++ /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-build-plat/versal_net-console:nil b/group/tf-l1-build-plat/versal_net-console:nil
deleted file mode 100644
index aae05f43..00000000
--- a/group/tf-l1-build-plat/versal_net-console:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (C) 2022, Advanced Micro Devices, Inc. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/versal_net-default:nil b/group/tf-l1-build-plat/versal_net-default:nil
deleted file mode 100644
index aae05f43..00000000
--- a/group/tf-l1-build-plat/versal_net-default:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (C) 2022, Advanced Micro Devices, Inc. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/versal_net-no-pm:nil b/group/tf-l1-build-plat/versal_net-no-pm:nil
deleted file mode 100644
index aae05f43..00000000
--- a/group/tf-l1-build-plat/versal_net-no-pm:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (C) 2022, Advanced Micro Devices, Inc. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/warp7-default:nil b/group/tf-l1-build-plat/warp7-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/warp7-default:nil
+++ /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-build-plat/zynqmp-console:nil b/group/tf-l1-build-plat/zynqmp-console:nil
deleted file mode 100644
index 0849ee7f..00000000
--- a/group/tf-l1-build-plat/zynqmp-console:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/zynqmp-ddr:nil b/group/tf-l1-build-plat/zynqmp-ddr:nil
deleted file mode 100644
index 9d5d68e7..00000000
--- a/group/tf-l1-build-plat/zynqmp-ddr:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-# Copyright (c) 2022-2023, Advanced Micro Devices, Inc. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/zynqmp-debug:nil b/group/tf-l1-build-plat/zynqmp-debug:nil
deleted file mode 100644
index 9d5d68e7..00000000
--- a/group/tf-l1-build-plat/zynqmp-debug:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-# Copyright (c) 2022-2023, Advanced Micro Devices, Inc. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/zynqmp-default:nil b/group/tf-l1-build-plat/zynqmp-default:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/zynqmp-default:nil
+++ /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-build-plat/zynqmp-opteed-secure-efuses:nil b/group/tf-l1-build-plat/zynqmp-opteed-secure-efuses:nil
deleted file mode 100644
index 0849ee7f..00000000
--- a/group/tf-l1-build-plat/zynqmp-opteed-secure-efuses:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/zynqmp-opteed:nil b/group/tf-l1-build-plat/zynqmp-opteed:nil
deleted file mode 100644
index 0849ee7f..00000000
--- a/group/tf-l1-build-plat/zynqmp-opteed:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/zynqmp-pncd:nil b/group/tf-l1-build-plat/zynqmp-pncd:nil
deleted file mode 100644
index 476c6e0d..00000000
--- a/group/tf-l1-build-plat/zynqmp-pncd:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022, ProvenRun S.A.S. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/zynqmp-tspd-tdram:nil b/group/tf-l1-build-plat/zynqmp-tspd-tdram:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/zynqmp-tspd-tdram:nil
+++ /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-build-plat/zynqmp-tspd:nil b/group/tf-l1-build-plat/zynqmp-tspd:nil
deleted file mode 100644
index aab47968..00000000
--- a/group/tf-l1-build-plat/zynqmp-tspd:nil
+++ /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-build-plat/zynqmp-wdtrestart:nil b/group/tf-l1-build-plat/zynqmp-wdtrestart:nil
deleted file mode 100644
index 0849ee7f..00000000
--- a/group/tf-l1-build-plat/zynqmp-wdtrestart:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-