deprecate sgm775 platform
As sgm775 platform is deprecated, remove all the scripts related with
this platform.
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
Change-Id: I3ef100d6942a34cb5bca7fe26e818b58396df319
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 4a1c733..c504d84 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -90,7 +90,6 @@
[css-rdn1edge]=";;;"
[css-rdn1edgex2]=";;;"
[css-sgi575]=";;;"
-[css-sgm775]=";;;"
[tc0]=";;;"
)
@@ -191,11 +190,6 @@
dtb_url="$tfa_downloads/quad_cluster/fvp-base-quad-cluster-gicv3-psci.dtb"
url="$dtb_url" saveas="$dtb_saveas" fetch_file
;;
- "sgm775")
- # Get the SGM775 FDT from pdsw area
- dtb_url="$sgm_prebuilts/sgm775.dtb"
- url="$dtb_url" saveas="$dtb_saveas" fetch_file
- ;;
*)
# Preprocess DTS file
${cc}gcc -E ${pp_flags} -I"$tf_root/fdts" -I"$tf_root/include" \
diff --git a/group/scp-boot-tests-coverage/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug-bmcov b/group/scp-boot-tests-coverage/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug-bmcov
deleted file mode 100644
index d52947d..0000000
--- a/group/scp-boot-tests-coverage/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug-bmcov
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/scp-boot-tests/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug b/group/scp-boot-tests/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/scp-boot-tests/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-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-build-plat/fvp-sgm775-tbb:nil b/group/tf-l1-build-plat/fvp-sgm775-tbb:nil
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l1-build-plat/fvp-sgm775-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-l2-coverity-misra-nominated/fvp-sgm775-tbb:coverity-tf-misra.diff b/group/tf-l2-coverity-misra-nominated/fvp-sgm775-tbb:coverity-tf-misra.diff
deleted file mode 100644
index d52947d..0000000
--- a/group/tf-l2-coverity-misra-nominated/fvp-sgm775-tbb:coverity-tf-misra.diff
+++ /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-l2-error-deprecated/fvp-sgm775-error-deprecated:nil b/group/tf-l2-error-deprecated/fvp-sgm775-error-deprecated:nil
deleted file mode 100644
index d52947d..0000000
--- a/group/tf-l2-error-deprecated/fvp-sgm775-error-deprecated: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-l3-boot-tests-css/fvp-sgm775-tbb-dualroot:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug b/group/tf-l3-boot-tests-css/fvp-sgm775-tbb-dualroot:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
deleted file mode 100644
index 0a342ff..0000000
--- a/group/tf-l3-boot-tests-css/fvp-sgm775-tbb-dualroot:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-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/tf-l3-boot-tests-css/fvp-sgm775-tbb:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug b/group/tf-l3-boot-tests-css/fvp-sgm775-tbb:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l3-boot-tests-css/fvp-sgm775-tbb:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-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/job/tf-worker/run_fvp_test.sh b/job/tf-worker/run_fvp_test.sh
index 48a83e4..f188155 100755
--- a/job/tf-worker/run_fvp_test.sh
+++ b/job/tf-worker/run_fvp_test.sh
@@ -42,8 +42,6 @@
export JENKINS_SOURCES_WORKSPACE="${scp_root:-$workspace}"
if grep -q "fvp-linux.sgi" <<< "$test_config"; then
export LIST_OF_BINARIES=${LIST_OF_BINARIES:-"scp_ram scp_rom mcp_rom"}
- elif grep -q "fvp-sgm775" <<< "$test_config"; then
- export LIST_OF_BINARIES=${LIST_OF_BINARIES:-"scp_ram scp_rom"}
fi
export OBJDUMP="$(which 'arm-none-eabi-objdump')"
export READELF="$(which 'arm-none-eabi-readelf')"
diff --git a/model/css-sgm775.sh b/model/css-sgm775.sh
deleted file mode 100644
index e536ad8..0000000
--- a/model/css-sgm775.sh
+++ /dev/null
@@ -1,24 +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/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_CSS_SGM-775"
-
-cat <<EOF >"$model_param_file"
-${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}
-${scp_rom_bin+-C css.scp.ROMloader.fname=$scp_rom_bin}
-${fip_bin+-C board.flashloader0.fname=$fip_bin}
-${initrd_bin+--data css.cluster0.cpu0=$initrd_bin@${initrd_addr:?}}
-${kernel_bin+--data css.cluster0.cpu0=$kernel_bin@${kernel_addr:?}}
-${dtb_bin+--data css.cluster0.cpu0=$dtb_bin@0x83000000}
-${uart0_out+-C soc.pl011_uart0.out_file=$uart0_out}
-${uart0_out+-C soc.pl011_uart0.unbuffered_output=1}
-${uart1_out+-C soc.pl011_uart1.out_file=$uart1_out}
-${uart1_out+-C soc.pl011_uart1.unbuffered_output=1}
--C config_id=0
--C displayController=2
--C css.cache_state_modelled=1
-EOF
diff --git a/run_config/fvp-dtb.sgm775 b/run_config/fvp-dtb.sgm775
deleted file mode 100644
index 39c9d98..0000000
--- a/run_config/fvp-dtb.sgm775
+++ /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
-#
-
-fetch_tf_resource() {
- dtb_type="sgm775" get_dtb
-}
diff --git a/run_config/fvp-fip.sgm b/run_config/fvp-fip.sgm
deleted file mode 100644
index d0bd4b1..0000000
--- a/run_config/fvp-fip.sgm
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_build() {
- url="$sgm_prebuilts/uboot.bin" fetch_file
- archive_file "uboot.bin"
-
- # Use SCP binary from SCP build if it exists, or fetch pre-built ones.
- if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$sgm_prebuilts/scp_ram.bin" fetch_file
- archive_file "scp_ram.bin"
- fi
-
- build_fip BL33="$archive/uboot.bin" SCP_BL2="$archive/scp_ram.bin"
-}
diff --git a/run_config/fvp-linux.sgm b/run_config/fvp-linux.sgm
deleted file mode 100644
index 7b10720..0000000
--- a/run_config/fvp-linux.sgm
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
- kernel_type="fvp-sgm-kernel" get_kernel
- initrd_type="fvp-sgm-ramdisk" get_initrd
- uart="0" file="linux-rd-busybox.exp" track_expect
-
- payload_type="linux" gen_fvp_yaml_template
-}
diff --git a/run_config/fvp-sgm775 b/run_config/fvp-sgm775
deleted file mode 100644
index cdc5baa..0000000
--- a/run_config/fvp-sgm775
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
- # Use SCP binary from SCP build if it exists, or fetch pre-built ones.
- if [ ! -f "$archive/scp_rom.bin" ]; then
- url="$sgm_prebuilts/scp_rom.bin" fetch_file
- archive_file "scp_rom.bin"
- fi
-}
-
-post_fetch_tf_resource() {
- local model="css-sgm775"
-
- model="$model" gen_model_params
- set_run_env "ports_script" "$ci_root/model/css-sgi575-ports.awk"
- set_run_env "num_uarts" "2"
- model="$model" gen_fvp_yaml
-}
diff --git a/scp_config/fvp-sgm775 b/scp_config/fvp-sgm775
deleted file mode 100644
index c5ce872..0000000
--- a/scp_config/fvp-sgm775
+++ /dev/null
@@ -1,2 +0,0 @@
-CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
-PRODUCT=sgm775
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 3c4102d..727bcd6 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -177,11 +177,6 @@
# Enable build config with RAS_EXTENSION to cover more files
make $(common_flags) PLAT=sgi575 ${ARM_TBB_OPTIONS} EL3_EXCEPTION_HANDLING=1 FAULT_INJECTION_SUPPORT=1 \
HANDLE_EA_EL3_FIRST=1 RAS_EXTENSION=1 SDEI_SUPPORT=1 SPM_MM=1 all
-#
-# System Guidance for Mobile platform SGM775
-#
-make $(common_flags) PLAT=sgm775 ${ARM_TBB_OPTIONS} SPD=tspd \
- CSS_USE_SCMI_SDS_DRIVER=1 all
#
# System Guidance for Infrastructure platform RD-N1-Edge-Dual
diff --git a/script/trusted-firmware.nomination.py b/script/trusted-firmware.nomination.py
index 36979da..cc3b1b7 100644
--- a/script/trusted-firmware.nomination.py
+++ b/script/trusted-firmware.nomination.py
@@ -28,11 +28,6 @@
"tf-l3-boot-tests-css/fvp-sgi575-tbb,fvp-sgi575-default:fvp-tftf-fip.tftf-sgi575",
"tf-l2-coverity-misra-nominated/fvp-sgi575-tbb:coverity-tf-misra.diff"],
- # Run SGM775 boot test and MISRA checks for any changes with "sgm" in the path
- "pathre:sgm":
- ["tf-l3-boot-tests-css/fvp-sgm775-tbb:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug",
- "tf-l2-coverity-misra-nominated/fvp-sgm775-tbb:coverity-tf-misra.diff"],
-
# Run Coverity MISRA checks for tc0 platform changes
"path:plat/arm/board/tc0":
["tf-l2-coverity-misra-nominated/fvp-tc0-tbb:coverity-tf-misra.diff"],
diff --git a/sgm775_utils.sh b/sgm775_utils.sh
deleted file mode 100644
index a15a892..0000000
--- a/sgm775_utils.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-source "$ci_root/fvp_utils.sh"
-
-# Pre-built SCP v2.8.0-dev release binaries
-# Files from
-# https://releases.linaro.org/members/arm/platforms/20.01/sgm775-ack-busybox-uboot.zip
-sgm_prebuilts="${sgm_prebuilts:-$css_downloads_280/sgm/sgm775}"
-
-fvp_kernels[fvp-sgm-kernel]="$sgm_prebuilts/uImage.0x80080000.mobile_bb"
-fvp_initrd_urls[fvp-sgm-ramdisk]="$sgm_prebuilts/uInitrd-busybox.0x88000000"
-
-initrd_addr=0x88000000
-scp_ram_addr=0x0bd80000
diff --git a/tf_config/fvp-sgm775 b/tf_config/fvp-sgm775
deleted file mode 100644
index 19fd765..0000000
--- a/tf_config/fvp-sgm775
+++ /dev/null
@@ -1,3 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-CSS_USE_SCMI_SDS_DRIVER=1
-PLAT=sgm775
diff --git a/tf_config/fvp-sgm775-error-deprecated b/tf_config/fvp-sgm775-error-deprecated
deleted file mode 100644
index c06629c..0000000
--- a/tf_config/fvp-sgm775-error-deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-CSS_USE_SCMI_SDS_DRIVER=1
-ERROR_DEPRECATED=1
-PLAT=sgm775
diff --git a/tf_config/fvp-sgm775-tbb b/tf_config/fvp-sgm775-tbb
deleted file mode 100644
index 3cb0c93..0000000
--- a/tf_config/fvp-sgm775-tbb
+++ /dev/null
@@ -1,9 +0,0 @@
-ARM_ROTPK_LOCATION=devel_rsa
-CREATE_KEYS=1
-CROSS_COMPILE=aarch64-none-elf-
-CSS_USE_SCMI_SDS_DRIVER=1
-GENERATE_COT=1
-PLAT=sgm775
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-SCP_BL2=/dev/null
-TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-sgm775-tbb-dualroot b/tf_config/fvp-sgm775-tbb-dualroot
deleted file mode 100644
index 5e4f47f..0000000
--- a/tf_config/fvp-sgm775-tbb-dualroot
+++ /dev/null
@@ -1,10 +0,0 @@
-ARM_ROTPK_LOCATION=devel_rsa
-COT=dualroot
-CREATE_KEYS=1
-CROSS_COMPILE=aarch64-none-elf-
-CSS_USE_SCMI_SDS_DRIVER=1
-GENERATE_COT=1
-PLAT=sgm775
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-SCP_BL2=/dev/null
-TRUSTED_BOARD_BOOT=1