ci: remove legacy SCP CI support
The code removed by this change represents the remaining dead remnants
of the previous SCP CI, which used to piggy-back on the TF-A to run its
testing regime. This scenario is no longer supported, so remove it.
Change-Id: If0ed5096f7e208c0865f9aac9c15ab4beddc8c6b
Signed-off-by: Chris Kay <chris.kay@arm.com>
diff --git a/arm-env.sh b/arm-env.sh
index b724a84..f45a1a5 100644
--- a/arm-env.sh
+++ b/arm-env.sh
@@ -19,11 +19,8 @@
tf_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/pdcs-platforms/ap/tf-topics.git"
tftf_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/trusted-firmware/tf-a-tests.git"
ci_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/pdswinf/ci/pdcs-platforms/platform-ci.git"
-scp_src_repo_default="${scp_src_repo_default:-https://$arm_gerrit_url/scp/firmware}"
cc_src_repo_url="${cc_src_repo_url:-https://$arm_gerrit_url/tests/lava/test-definitions.git}"
cc_src_repo_tag="${cc_src_repo_tag:-kernel-team-workflow_2019-09-20}"
-scp_tools_src_repo_url="${scp_tools_src_repo_url:-https://$arm_gerrit_url/scp/tools-non-public}"
-tf_for_scp_tools_src_repo_url="https://$arm_gerrit_url/scp/test-framework"
spm_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/trusted-firmware/spm.git"
spm_proj_ref_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/trusted-firmware/spm/project/reference.git"
spm_prebuilts_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/trusted-firmware/spm/prebuilts.git"
diff --git a/group/scp-boot-tests/juno,juno-default,juno-default:scp_juno-tftf-debug b/group/scp-boot-tests/juno,juno-default,juno-default:scp_juno-tftf-debug
deleted file mode 100644
index 0a342ff..0000000
--- a/group/scp-boot-tests/juno,juno-default,juno-default:scp_juno-tftf-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/scp-boot-tests/juno,juno-default:scp_juno-linux.uboot b/group/scp-boot-tests/juno,juno-default:scp_juno-linux.uboot
deleted file mode 100644
index 0a342ff..0000000
--- a/group/scp-boot-tests/juno,juno-default:scp_juno-linux.uboot
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/scp-boot-tests/juno-scmiv2,juno-default,nil,juno-scp-tools:juno-scmi b/group/scp-boot-tests/juno-scmiv2,juno-default,nil,juno-scp-tools:juno-scmi
deleted file mode 100644
index 1bbc737..0000000
--- a/group/scp-boot-tests/juno-scmiv2,juno-default,nil,juno-scp-tools:juno-scmi
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/scp-boot-tests/n1sdp,n1sdp-tbb:n1sdp-linux-fip.uefi-firmware b/group/scp-boot-tests/n1sdp,n1sdp-tbb:n1sdp-linux-fip.uefi-firmware
deleted file mode 100644
index 35f8713..0000000
--- a/group/scp-boot-tests/n1sdp,n1sdp-tbb:n1sdp-linux-fip.uefi-firmware
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/job/tf-worker/generate_yaml.sh b/job/tf-worker/generate_yaml.sh
index 3d7f8b9..99ab597 100755
--- a/job/tf-worker/generate_yaml.sh
+++ b/job/tf-worker/generate_yaml.sh
@@ -9,8 +9,6 @@
if echo "$RUN_CONFIG" | grep -iq 'tftf'; then
payload_type="tftf"
-elif echo "$RUN_CONFIG" | grep -iq 'scmi'; then
- payload_type="scp_tests_scmi"
else
payload_type="linux"
fi
diff --git a/job/tf-worker/is_juno_config.sh b/job/tf-worker/is_juno_config.sh
index aa0449b..3ddd7e3 100755
--- a/job/tf-worker/is_juno_config.sh
+++ b/job/tf-worker/is_juno_config.sh
@@ -16,7 +16,7 @@
# only way to have a board-accessible URL at the moment is to have build
# artefacts archived. Therefore, only for Juno do we spawn the build as a
# separate job; otherwise, we build within this job.
-if echo "$RUN_CONFIG" | grep -iqe '^juno' -iqe '^scp_juno'; then
+if echo "$RUN_CONFIG" | grep -iqe '^juno'; then
exit 0
else
exit 1
diff --git a/n1sdp_utils.sh b/n1sdp_utils.sh
index f0c196a..e79c3f2 100644
--- a/n1sdp_utils.sh
+++ b/n1sdp_utils.sh
@@ -21,22 +21,14 @@
fetch_and_archive
#Fetch pre-built SCP/MCP binaries if they haven't been built
- if [ ! -f "$archive/mcp_rom.bin" ]; then
- url="$scp_mcp_prebuilts/mcp_romfw.bin" filename="mcp_rom.bin" \
- fetch_and_archive
- fi
- if [ ! -f "$archive/scp_rom.bin" ]; then
- url="$scp_mcp_prebuilts/scp_romfw.bin" filename="scp_rom.bin" \
- fetch_and_archive
- fi
- if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_mcp_prebuilts/scp_ramfw.bin" filename="scp_ram.bin" \
- fetch_and_archive
- fi
- if [ ! -f "$archive/mcp_ram.bin" ]; then
- url="$scp_mcp_prebuilts/mcp_ramfw.bin" filename="mcp_ram.bin" \
- fetch_and_archive
- fi
+ url="$scp_mcp_prebuilts/mcp_romfw.bin" filename="mcp_rom.bin" \
+ fetch_and_archive
+ url="$scp_mcp_prebuilts/scp_romfw.bin" filename="scp_rom.bin" \
+ fetch_and_archive
+ url="$scp_mcp_prebuilts/scp_ramfw.bin" filename="scp_ram.bin" \
+ fetch_and_archive
+ url="$scp_mcp_prebuilts/mcp_ramfw.bin" filename="mcp_ram.bin" \
+ fetch_and_archive
}
gen_recovery_image() {
diff --git a/run_config/juno-scmi b/run_config/juno-scmi
deleted file mode 100644
index 379eb03..0000000
--- a/run_config/juno-scmi
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-test_setup() {
- # Only need to run on debug
- echo "Building only in DEBUG mode."
- set_hook_var "bin_mode" "debug"
-}
-
-pre_tf_build() {
- build_scmi_lib_scp_tools
-}
-
-post_tf_archive() {
- build_tf_for_scp_tools
-
- build_fip_for_scp_tools
-}
-
-post_fetch_tf_resource() {
- echo "archive.. $archive"
-
- path_bypass_rom="$scp_root/build/juno/GNU/$mode/firmware-scp_romfw_bypass/bin"
- cp "$path_bypass_rom/juno-bl1-bypass.bin" "$path_bypass_rom/scp_bl1.bin"
- archive_file "$path_bypass_rom/scp_bl1.bin"
-
- ls $archive
-
- gen_recovery_image \
- "$archive/bl1.bin" \
- "$archive/bl2.bin" \
- "$archive/bl31.bin" \
- "$archive/fip.bin" \
- "$archive/scp_bl1.bin"
-
- payload_type="scp_tests_scmi" juno_revision="juno-r0" gen_juno_yaml
-}
-
-post_package() {
- use_debug_bins
-}
diff --git a/run_config/scp_juno-linux.uboot b/run_config/scp_juno-linux.uboot
deleted file mode 100644
index 139b63b..0000000
--- a/run_config/scp_juno-linux.uboot
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-test_setup() {
- echo "Building only in RELEASE mode."
- set_hook_var "bin_mode" "release"
-}
-
-post_tf_build() {
- path_bypass_rom="$scp_root/build/juno/GNU/$mode/firmware-scp_romfw_bypass/bin"
-
- cp "$path_bypass_rom/juno-bl1-bypass.bin" "$path_bypass_rom/scp_bl1.bin"
- archive_file "$path_bypass_rom/scp_bl1.bin"
-
- path_ram="$scp_root/build/juno/GNU/$mode/firmware-scp_ramfw/bin"
-
- cp "$path_ram/juno-bl2.bin" "$path_ram/scp_ramfw.bin"
- archive_file "$path_ram/scp_ramfw.bin"
- get_ml_uboot_bin
- build_fip BL33="$archive/uboot.bin" SCP_BL2="$archive/scp_ramfw.bin"
-}
-
-post_fetch_tf_resource() {
- gen_recovery_image "$archive/bl1.bin" "$archive/fip.bin" "$archive/scp_bl1.bin"
- payload_type="linux" gen_juno_yaml
-}
diff --git a/run_config/scp_juno-tftf b/run_config/scp_juno-tftf
deleted file mode 100644
index 4ef2d9f..0000000
--- a/run_config/scp_juno-tftf
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_build() {
- path_bypass_rom="$scp_root/build/juno/GNU/$mode/firmware-scp_romfw_bypass/bin"
-
- cp "$path_bypass_rom/juno-bl1-bypass.bin" "$path_bypass_rom/scp_bl1.bin"
- archive_file "$path_bypass_rom/scp_bl1.bin"
-
- path_ram="$scp_root/build/juno/GNU/$mode/firmware-scp_ramfw/bin"
-
- cp "$path_ram/juno-bl2.bin" "$path_ram/scp_ramfw.bin"
- archive_file "$path_ram/scp_ramfw.bin"
-
- build_fip BL33="$archive/tftf.bin" SCP_BL2="$archive/scp_ramfw.bin"
-}
-
-post_fetch_tf_resource() {
- gen_recovery_image "$archive/bl1.bin" "$archive/fip.bin" "$archive/scp_bl1.bin"
- payload_type="tftf" gen_juno_yaml
-}
diff --git a/scp_config/README b/scp_config/README
deleted file mode 100644
index 0ba9c32..0000000
--- a/scp_config/README
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-Files in this directory sets System Control Processor (SCP) build options as
-they ought to appear on the build command line.
diff --git a/scp_config/juno b/scp_config/juno
deleted file mode 100644
index 9bf4e9e..0000000
--- a/scp_config/juno
+++ /dev/null
@@ -1,5 +0,0 @@
-PRODUCT=juno
-EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
-EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
-EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
-EXTRA_CONFIG_ARGS+=-DSCP_LOG_LEVEL=CRIT
\ No newline at end of file
diff --git a/scp_config/juno-scmiv2 b/scp_config/juno-scmiv2
deleted file mode 100644
index 1644c1e..0000000
--- a/scp_config/juno-scmiv2
+++ /dev/null
@@ -1,11 +0,0 @@
-PRODUCT=juno
-EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
-EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
-EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
-EXTRA_CONFIG_ARGS+=-DSCP_ENABLE_SCMI_NOTIFICATIONS=ON
-EXTRA_CONFIG_ARGS+=-DSCP_ENABLE_SCMI_PERF_FAST_CHANNELS=yes
-EXTRA_CONFIG_ARGS+=-DSCP_ENABLE_SCMI_RESET=ON
-EXTRA_CONFIG_ARGS+=-DSCP_ENABLE_DEBUG_UNIT=OFF
-EXTRA_CONFIG_ARGS+=-DSCP_ENABLE_RESOURCE_PERMISSIONS=OFF
-EXTRA_CONFIG_ARGS+=-DSCP_LOG_LEVEL=CRIT
-EXTRA_CONFIG_ARGS+=-DCMAKE_C_FLAGS_DEBUG=-Os
diff --git a/scp_config/n1sdp b/scp_config/n1sdp
deleted file mode 100644
index c260fe3..0000000
--- a/scp_config/n1sdp
+++ /dev/null
@@ -1,5 +0,0 @@
-PRODUCT=n1sdp
-EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
-EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
-EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
-EXTRA_CONFIG_ARGS+=-DSCP_LOG_LEVEL=INFO
\ No newline at end of file
diff --git a/scp_tools_config/juno-scp-tools b/scp_tools_config/juno-scp-tools
deleted file mode 100644
index 8b13789..0000000
--- a/scp_tools_config/juno-scp-tools
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/script/build_package.sh b/script/build_package.sh
index 4342d5d..825e76e 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -20,19 +20,13 @@
# Directory to where the source code e.g. for Trusted Firmware is checked out.
export tf_root="${tf_root:-$workspace/trusted_firmware}"
export tftf_root="${tftf_root:-$workspace/trusted_firmware_tf}"
-export scp_root="${scp_root:-$workspace/scp}"
-scp_tools_root="${scp_tools_root:-$workspace/scp_tools}"
cc_root="${cc_root:-$ccpathspec}"
spm_root="${spm_root:-$workspace/spm}"
rmm_root="${rmm_root:-$workspace/tf-rmm}"
-scp_tf_tools_root="$scp_tools_root/scp_tf_tools"
-
# Refspecs
tf_refspec="$TF_REFSPEC"
tftf_refspec="$TFTF_REFSPEC"
-scp_refspec="$SCP_REFSPEC"
-scp_tools_commit="${SCP_TOOLS_COMMIT:-master}"
spm_refspec="$SPM_REFSPEC"
rmm_refspec="$RMM_REFSPEC"
@@ -184,38 +178,6 @@
fi
}
-# SCP and MCP binaries are named firmware.{bin,elf}, and are placed under
-# scp/mcp_ramfw and scp/mcp_romfw directories, so can't be collected by
-# collect_build_artefacts function.
-collect_scp_artefacts() {
- to="${to:?}" \
- find "$scp_root" \( \( -name "*.bin" -o -name '*.elf' \) -and ! -name 'CMake*' \) -exec bash -c '
- for file; do
- ext="$(echo $file | awk -F. "{print \$NF}")"
- case $file in
- */firmware-scp_ramfw/bin/*|*/firmware-scp_ramfw_fvp/bin/*)
- cp $file $to/scp_ram.$ext
- ;;
- */firmware-scp_romfw/bin/*)
- cp $file $to/scp_rom.$ext
- ;;
- */firmware-mcp_ramfw/bin/*|*/firmware-mcp_ramfw_fvp/bin/*)
- cp $file $to/mcp_ram.$ext
- ;;
- */firmware-mcp_romfw/bin/*)
- cp $file $to/mcp_rom.$ext
- ;;
- */firmware-scp_romfw_bypass/bin/*)
- cp $file $to/scp_rom_bypass.$ext
- ;;
- *)
- echo "Unknown SCP binary: $file" >&2
- ;;
- esac
- done
- ' bash '{}' +
-}
-
# Collect SPM/hafnium artefacts with "secure_" appended to the files
# generated for SPM(secure hafnium).
collect_spm_artefacts() {
@@ -485,16 +447,6 @@
fi
}
-get_scp_opt() {
- (
- name="${1:?}"
- if config_valid "$scp_config_file"; then
- source "$scp_config_file"
- echo "${!name}"
- fi
- )
-}
-
get_tftf_opt() {
(
name="${1:?}"
@@ -655,212 +607,6 @@
)
}
-build_scp() {
- (
- config_file="${scp_build_config:-$scp_config_file}"
-
- source "$config_file"
-
- cd "$scp_root"
-
- # Always distclean when running on Jenkins. Skip distclean when running
- # locally and explicitly requested.
- if upon "$jenkins_run" || not_upon "$dont_clean"; then
- make -f Makefile.cmake clean &>>"$build_log" || fail_build
- fi
-
- python3 -m venv .venv
- . .venv/bin/activate
-
- # Install extra tools used by CMake build system
- pip install -r requirements.txt --timeout 30 --retries 15
-
- # Log build command line. It is left unfolded on purpose to assist
- # copying to clipboard.
- cat <<EOF | log_separator >/dev/null
-
-SCP build command line:
- make -f Makefile.cmake $(cat "$config_file" | tr '\n' ' ') \
- TOOLCHAIN=GNU \
- MODE="$mode" \
- EXTRA_CONFIG_ARGS+=-DDISABLE_CPPCHECK=true \
- V=1 &>>"$build_log"
-
-EOF
-
- # Build SCP
- make -f Makefile.cmake $(cat "$config_file" | tr '\n' ' ') \
- TOOLCHAIN=GNU \
- MODE="$mode" \
- EXTRA_CONFIG_ARGS+=-DDISABLE_CPPCHECK=true \
- V=1 &>>"$build_log" \
- || fail_build
- )
-}
-
-clone_scp_tools() {
-
- if [ ! -d "$scp_tools_root" ]; then
- echo "Cloning SCP-tools ... $scp_tools_commit" |& log_separator
-
- clone_url="${SCP_TOOLS_CHECKOUT_LOC:-$scp_tools_src_repo_url}" \
- where="$scp_tools_root" \
- refspec="${scp_tools_commit}"
- clone_repo &>>"$build_log"
- else
- echo "Already cloned SCP-tools ..." |& log_separator
- fi
-
- show_head "$scp_tools_root"
-
- cd "$scp_tools_root"
-
- echo "Updating submodules"
-
- git submodule init
-
- git submodule update
-
- lib_commit=$(grep "'scmi_lib_commit'" run_tests/settings.py | cut -d':' -f 2 | tr -d "'" | tr -d ",")
-
- cd "scmi"
- git checkout $lib_commit
-
- git show --quiet --no-color | sed 's/^/ > /g'
-}
-
-clone_tf_for_scp_tools() {
- scp_tools_arm_tf="$scp_tools_root/arm-tf"
-
- if [ ! -d "$scp_tools_arm_tf" ]; then
- echo "Cloning TF-4-SCP-tools ..." |& log_separator
-
- clone_url="$tf_for_scp_tools_src_repo_url"
- where="$scp_tools_arm_tf"
-
- git clone "$clone_url" "$where"
-
- cd "$scp_tools_arm_tf"
-
- git checkout --track origin/juno-v4.3
-
- git show --quiet --no-color | sed 's/^/ > /g'
-
- else
- echo "Already cloned TF-4-SCP-tools ..." |& log_separator
- fi
-}
-
-build_scmi_lib_scp_tools() {
- (
- cd "$scp_tools_root"
-
- cd "scmi"
-
- scp_tools_arm_tf="$scp_tools_root/arm-tf"
-
- cross_compile="$(set_cross_compile_gcc_linaro_toolchain)"
-
- std_libs="-I$scp_tools_arm_tf/include/common"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/common/tbbr"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/drivers/arm"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/lib"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/lib/aarch64"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/lib/stdlib"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/lib/stdlib/sys"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/lib/xlat_tables"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/plat/common"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/plat/arm/common"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/plat/arm/css/common"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/plat/arm/board/common"
- std_libs="$std_libs -I$scp_tools_arm_tf/include/plat/arm/soc/common"
- std_libs="$std_libs -I$scp_tools_arm_tf/plat/arm/board/juno/include"
-
- cflags="-Og -g"
- cflags="$cflags -mgeneral-regs-only"
- cflags="$cflags -mstrict-align"
- cflags="$cflags -nostdinc"
- cflags="$cflags -fno-inline"
- cflags="$cflags -ffreestanding"
- cflags="$cflags -ffunction-sections"
- cflags="$cflags -fdata-sections"
- cflags="$cflags -DAARCH64"
- cflags="$cflags -DPRId32=\"ld\""
- cflags="$cflags -DVERBOSE_LEVEL=3"
-
- cflags="$cflags $std_libs"
-
- protocols="performance,power_domain,system_power,reset"
-
- echo "Building SCMI library (SCP-tools) ..."
-
- make "CROSS_COMPILE=$cross_compile" \
- "CFLAGS=$cflags" \
- "PLAT=baremetal" \
- "PROTOCOLS=$protocols" \
- "clean" \
- "all"
- )
-}
-
-build_tf_for_scp_tools() {
-
- cd "$scp_tools_root/arm-tf"
-
- cross_compile="$(set_cross_compile_gcc_linaro_toolchain)"
-
- if [ "$1" = "release" ]; then
- echo "Build TF-4-SCP-Tools rls..."
- else
- echo "Build TF-4-SCP-Tools dbg..."
-
- make realclean
-
- make "BM_TEST=scmi" \
- "ARM_BOARD_OPTIMISE_MEM=1" \
- "BM_CSS=juno" \
- "CSS_USE_SCMI_SDS_DRIVER=1" \
- "PLAT=juno" \
- "DEBUG=1" \
- "PLATFORM=juno" \
- "CROSS_COMPILE=$cross_compile" \
- "BM_WORKSPACE=$scp_tools_root/baremetal"
-
- archive_file "build/juno/debug/bl1.bin"
-
- archive_file "build/juno/debug/bl2.bin"
-
- archive_file "build/juno/debug/bl31.bin"
- fi
-}
-
-build_fip_for_scp_tools() {
-
- cd "$scp_tools_root/arm-tf"
-
- cross_compile="$(set_cross_compile_gcc_linaro_toolchain)"
-
- if [ ! -d "$scp_root/build/juno/GNU/debug/firmware-scp_ramfw" ]; then
- make fiptool
- echo "Make FIP 4 SCP-Tools rls..."
-
- else
- make fiptool
- echo "Make FIP 4 SCP-Tools dbg..."
-
- make "PLAT=juno" \
- "all" \
- "fip" \
- "DEBUG=1" \
- "CROSS_COMPILE=$cross_compile" \
- "BL31=$scp_tools_root/arm-tf/build/juno/debug/bl31.bin" \
- "BL33=$scp_tools_root/baremetal/dummy_bl33" \
- "SCP_BL2=$scp_root/build/juno/GNU/$mode/firmware-scp_ramfw/bin/juno-bl2.bin"
-
- archive_file "$scp_tools_root/arm-tf/build/juno/debug/fip.bin"
- fi
-}
-
build_cc() {
# Building code coverage plugin
ARM_DIR=/arm
@@ -990,11 +736,6 @@
set_hook_var "tftf_build_targets" "$targets"
}
-set_scp_build_targets() {
- echo "Set build target to '${targets:?}'"
- set_hook_var "scp_build_targets" "$targets"
-}
-
set_spm_build_targets() {
echo "Set build target to '${targets:?}'"
set_hook_var "spm_build_targets" "$targets"
@@ -1227,17 +968,13 @@
tf_config="$(echo "$build_configs" | awk -F, '{print $1}')"
tftf_config="$(echo "$build_configs" | awk -F, '{print $2}')"
-scp_config="$(echo "$build_configs" | awk -F, '{print $3}')"
-scp_tools_config="$(echo "$build_configs" | awk -F, '{print $4}')"
-spm_config="$(echo "$build_configs" | awk -F, '{print $5}')"
-rmm_config="$(echo "$build_configs" | awk -F, '{print $6}')"
+spm_config="$(echo "$build_configs" | awk -F, '{print $3}')"
+rmm_config="$(echo "$build_configs" | awk -F, '{print $4}')"
test_config_file="$ci_root/group/$test_group/$test_config"
tf_config_file="$ci_root/tf_config/$tf_config"
tftf_config_file="$ci_root/tftf_config/$tftf_config"
-scp_config_file="$ci_root/scp_config/$scp_config"
-scp_tools_config_file="$ci_root/scp_tools_config/$scp_tools_config"
spm_config_file="$ci_root/spm_config/$spm_config"
rmm_config_file="$ci_root/rmm_config/$rmm_config"
@@ -1265,23 +1002,6 @@
echo
fi
-if ! config_valid "$scp_config"; then
- scp_config=
-else
- echo "SCP firmware config:"
- echo
- sort "$scp_config_file" | sed '/^\s*$/d;s/^/\t/'
- echo
-fi
-
-if ! config_valid "$scp_tools_config"; then
- scp_tools_config=
-else
- echo "SCP Tools config:"
- echo
- sort "$scp_tools_config_file" | sed '/^\s*$/d;s/^/\t/'
-fi
-
if ! config_valid "$spm_config"; then
spm_config=
else
@@ -1325,36 +1045,6 @@
show_head "$tftf_root"
fi
-if [ "$scp_config" ] && assert_can_git_clone "scp_root"; then
- # If the SCP firmware repository has already been checked out,
- # use that location. Otherwise, clone one ourselves.
- echo "Cloning SCP Firmware..."
- clone_url="${SCP_CHECKOUT_LOC:-$scp_src_repo_url}" where="$scp_root" \
- refspec="${SCP_REFSPEC-master-upstream}" clone_repo &>>"$build_log"
-
- pushd "$scp_root"
-
- # Use filer submodule as a reference if it exists
- if [ -d "$SCP_CHECKOUT_LOC/cmsis" ]; then
- cmsis_reference="--reference $SCP_CHECKOUT_LOC/cmsis"
- fi
-
- # If we don't have a reference yet, fall back to $cmsis_root if set, or
- # then to project filer if accessible.
- if [ -z "$cmsis_reference" ]; then
- cmsis_ref_repo="${cmsis_root:-$project_filer/ref-repos/cmsis}"
- if [ -d "$cmsis_ref_repo" ]; then
- cmsis_reference="--reference $cmsis_ref_repo"
- fi
- fi
-
- git submodule -q update $cmsis_reference --init
-
- popd
-
- show_head "$scp_root"
-fi
-
if [ -n "$cc_config" ] ; then
if [ "$cc_config" -eq 1 ] && assert_can_git_clone "cc_root"; then
# Copy code coverage repository
@@ -1497,51 +1187,6 @@
build_cc
fi
- # SCP build
- if config_valid "$scp_config"; then
- (
- echo "##########"
-
- # Source platform-specific utilities
- plat="$(get_scp_opt PRODUCT)"
- plat_utils="$ci_root/${plat}_utils.sh"
- if [ -f "$plat_utils" ]; then
- source "$plat_utils"
- fi
-
- archive="$build_archive"
- scp_build_root="$scp_root/build"
-
- echo "Building SCP Firmware ($mode) ..." |& log_separator
-
- build_scp
- to="$archive" collect_scp_artefacts
-
- echo "##########"
- echo
- )
- fi
-
- # SCP-tools build
- if config_valid "$scp_tools_config"; then
- (
- echo "##########"
-
- archive="$build_archive"
- scp_tools_build_root="$scp_tools_root/build"
-
- clone_scp_tools
-
- echo "##########"
- echo
-
- echo "##########"
- clone_tf_for_scp_tools
- echo "##########"
- echo
- )
- fi
-
# TFTF build
if config_valid "$tftf_config"; then
(
diff --git a/script/clone_repos.sh b/script/clone_repos.sh
index ebb1b05..e2f1042 100755
--- a/script/clone_repos.sh
+++ b/script/clone_repos.sh
@@ -228,42 +228,6 @@
popd
fi
-SCP_REFSPEC="${scp_refspec:-$SCP_REFSPEC}"
-if upon "$clone_scp"; then
- # Clone SCP Firmware repository
- # NOTE: currently scp/firmware:master is not tracking the upstream.
- # Therefore, if the url is gerrit.oss.arm.com/scp/firmware and there is
- # no ref_spec, then set the ref_spec to master-upstream.
- if [ "$scp_src_repo_url" = "$scp_src_repo_default" ]; then
- SCP_REFSPEC="${SCP_REFSPEC:-master-upstream}"
- fi
-
- url="$scp_src_repo_url" name="scp" ref="SCP_REFSPEC" \
- loc="SCP_CHECKOUT_LOC" clone_and_sync
-
- pushd "$ci_scratch/scp"
-
- # Edit the submodule URL to point to the reference repository so that
- # all submodule update pick from the reference repository instead of
- # Github.
- cmsis_ref_repo="${cmsis_root:-$project_filer/ref-repos/cmsis}"
- if [ -d "$cmsis_ref_repo" ]; then
- cmsis_reference="--reference $cmsis_ref_repo"
- fi
- git submodule -q update $cmsis_reference --init
-
- eval cmsis_dir="$(git submodule status | grep cmsis | awk 'NR==1{print $2}')"
-
- # Workaround while fixing permissions on /arm/projectscratch/ssg/trusted-fw/ref-repos/cmsis
- cd $cmsis_dir
- code_cov_emit_param "CMSIS" "URL" "$(git remote -v | grep fetch | awk '{print $2}')"
- code_cov_emit_param "CMSIS" "COMMIT" "$(git rev-parse HEAD)"
- code_cov_emit_param "CMSIS" "REFSPEC" "master"
- cd ..
- ########################################
- popd
-fi
-
SPM_REFSPEC="${spm_refspec:-$SPM_REFSPEC}"
if not_upon "$no_spm"; then
# Clone SPM repository
@@ -296,8 +260,6 @@
loc="RMM_PATH" clone_and_sync
fi
-echo "SCP_TOOLS_COMMIT=$SCP_TOOLS_COMMIT" >> "$param_file"
-
# Copy environment file to ci_scratch for sub-jobs' access
cp "$env_file" "$ci_scratch"
cp "$param_file" "$ci_scratch"
diff --git a/script/gen_test_desc.py b/script/gen_test_desc.py
index 47d7e7c..030e7c8 100755
--- a/script/gen_test_desc.py
+++ b/script/gen_test_desc.py
@@ -33,29 +33,23 @@
# Perform group-specific translation on the build config
def translate_build_config(group, config_list):
# config_list contains build configs as read from the test config
- if group.startswith("scp-"):
- # SCP configs would be specified in the following format:
- # scp_config, tf_config, tftf_config, scp_tools
- # Reshuffle them into the canonical format
- config_list = [config_list[1], config_list[2], config_list[0], config_list[3]]
-
if group.startswith("spm-"):
# SPM configs would be specified in the following format:
- # spm_config, tf_config, tftf_config, scp_config, scp_tools
+ # spm_config, tf_config, tftf_config
# Reshuffle them into the canonical format
- config_list = [config_list[1], config_list[2], config_list[3], config_list[4], config_list[0]]
+ config_list = [config_list[1], config_list[2], config_list[0]]
if group.startswith("rmm-"):
# RMM configs would be specified in the following format:
- # rmm_config, tf_config, tftf_config, spm_config, scp_config, scp_tools
+ # rmm_config, tf_config, tftf_config, spm_config
# Reshuffle them into the canonical format
- config_list = [config_list[1], config_list[2], config_list[4], config_list[5], config_list[3], config_list[0]]
+ config_list = [config_list[1], config_list[2], config_list[3], config_list[0]]
if group.startswith("tf-l3-code-coverage"):
# coverage configs would be specified in the following format:
- # tf_config, tftf_config, spm_config, scp_config, scp_tools
+ # tf_config, tftf_config, spm_config
# Reshuffle them into the canonical format
- config_list = [config_list[0], config_list[1], config_list[3], config_list[4], config_list[2]]
+ config_list = [config_list[0], config_list[1], config_list[2]]
return config_list
@@ -66,9 +60,9 @@
build_config, run_config = test.split(":")
# Test descriptors are always generated in the following order:
- # tf_config, tftf_config, scp_config, scp_tools, spm_config, rmm_config
+ # tf_config, tftf_config, spm_config, rmm_config
# Fill missing configs to the right with "nil".
- config_list = (build_config.split(",") + ["nil"] * 6)[:6]
+ config_list = (build_config.split(",") + ["nil"] * 4)[:4]
# Perform any group-specific translation on the config
config_list = translate_build_config(group, config_list)
diff --git a/script/gen_test_report.py b/script/gen_test_report.py
index d534536..299a8f5 100755
--- a/script/gen_test_report.py
+++ b/script/gen_test_report.py
@@ -69,7 +69,7 @@
REPORT_JSON = "report.json"
# Maximum depth for the tree of results, excluding status
-MAX_RESULTS_DEPTH = 8
+MAX_RESULTS_DEPTH = 6
# We'd have a minimum of 3: group, a build config, a run config.
MIN_RESULTS_DEPTH = 3
@@ -81,8 +81,6 @@
"Test Group",
"TF Build Config",
"TFTF Build Config",
- "SCP Build Config",
- "SCP tools Config",
"SPM Build Config",
"RMM Build Config",
"Run Config",
@@ -277,7 +275,6 @@
if not Level_empty[child_node.depth - 1]:
# - TF config might be "nil" for TFTF-only build configs;
# - TFTF config might not be present for non-TFTF runs;
- # - SCP config might not be present for non-SCP builds;
# - All build-only configs have runconfig as "nil";
#
# Make nil cells empty, and grey empty cells out.
@@ -441,7 +438,7 @@
test_config = desc[:-len(TEST_SUFFIX)]
build_config, run_config = test_config.split(":")
spare_commas = "," * (MAX_RESULTS_DEPTH - MIN_RESULTS_DEPTH)
- tf_config, tftf_config, scp_config, scp_tools, spm_config, rmm_config, *_ = (build_config +
+ tf_config, tftf_config, spm_config, rmm_config, *_ = (build_config +
spare_commas).split(",")
build_number = child_build_numbers[i]
@@ -456,9 +453,7 @@
group_node = results.set_child(group)
tf_node = group_node.set_child(tf_config)
tftf_node = tf_node.set_child(tftf_config)
- scp_node = tftf_node.set_child(scp_config)
- scp_tools_node = scp_node.set_child(scp_tools)
- spm_node = scp_tools_node.set_child(spm_config)
+ spm_node = tftf_node.set_child(spm_config)
rmm_node = spm_node.set_child(rmm_config)
run_node = rmm_node.set_child(run_config)
run_node.set_result(test_result, build_number)
diff --git a/script/parse_lava_job.py b/script/parse_lava_job.py
index 49d9a59..1cdc8eb 100755
--- a/script/parse_lava_job.py
+++ b/script/parse_lava_job.py
@@ -59,13 +59,6 @@
if (fail_count > 0) or (skip_count > expected_skip_count):
report_job_failure()
-def parse_scp_scmi_results():
- #
- # All protocols but sensor
- #
- all_prot_expected_skip_count = 9
- scmi_parse_phase(results, "scp-scmi-all-protocol", "", all_prot_expected_skip_count)
-
def parse_cmd_line():
parser = argparse.ArgumentParser(description="Parse results from LAVA. "
"The results must be provided as a YAML file.")
@@ -103,13 +96,6 @@
elif args.payload_type == "tftf":
session = "TFTF"
suite = "tftf"
- elif args.payload_type == "scp_tests_scmi":
- session = "SCMI"
- suite = "scp-scmi"
- parse_scp_scmi_results()
-
- print("All tests passed.")
- report_job_success()
else:
raise Exception("Payload not defined")
diff --git a/script/run_local_ci.sh b/script/run_local_ci.sh
index fe54067..56fa81c 100755
--- a/script/run_local_ci.sh
+++ b/script/run_local_ci.sh
@@ -254,20 +254,16 @@
# default the rest to nil if not present
tftf_config="${tftf_config:-nil}"
- scp_config="${scp_config:-nil}"
- scp_tools="${scp_tools:-nil}"
spm_config="${spm_config:-nil}"
run_config="${run_config:-nil}"
# construct the 'long form' so it takes into account all possible configurations
- if echo ${test_group} | grep -q '^scp-'; then
- tg=$(printf "%s/%s,%s,%s,%s:%s" "${test_group}" "${scp_config}" "${tf_config}" "${tftf_config}" "${scp_tools}" "${run_config}")
- elif echo ${test_group} | grep -q '^spm-'; then
- tg=$(printf "%s/%s,%s,%s,%s,%s:%s" "${test_group}" "${spm_config}" "${tf_config}" "${tftf_config}" "${scp_config}" "${scp_tools}" "${run_config}")
+ if echo ${test_group} | grep -q '^spm-'; then
+ tg=$(printf "%s/%s,%s,%s:%s" "${test_group}" "${spm_config}" "${tf_config}" "${tftf_config}" "${run_config}")
elif echo ${test_group} | grep -q '^rmm-'; then
- tg=$(printf "%s/%s,%s,%s,%s,%s,%s:%s" "${test_group}" "${rmm_config}" "${tf_config}" "${tftf_config}" "${spm_config}" "${scp_config}" "${scp_tools}" "${run_config}")
+ tg=$(printf "%s/%s,%s,%s,%s:%s" "${test_group}" "${rmm_config}" "${tf_config}" "${tftf_config}" "${spm_config}" "${run_config}")
else
- tg=$(printf "%s/%s,%s,%s,%s,%s:%s" "${test_group}" "${tf_config}" "${tftf_config}" "${scp_config}" "${scp_tools}" "${spm_config}" "${run_config}")
+ tg=$(printf "%s/%s,%s,%s:%s" "${test_group}" "${tf_config}" "${tftf_config}" "${spm_config}" "${run_config}")
fi
# trim any ',nil:' from it
@@ -322,15 +318,6 @@
let "++local_count"
fi
-if [ -z "$scp_root" ]; then
- in_red "NOTE: NOT using local work tree for SCP"
-else
- scp_root="$(readlink -f $scp_root)"
- scp_refspec=
- in_green "Using local work tree for SCP"
- let "++local_count"
-fi
-
if [ -n "$cc_enable" ]; then
in_green "Code Coverage enabled"
if [ -z "$TOOLCHAIN" ]; then
@@ -410,15 +397,6 @@
source "$ci_root/utils.sh"
-# SCP is not cloned by default
-export clone_scp
-export scp_root
-if not_upon "$scp_root" && upon "$clone_scp"; then
- clone_scp=1
-else
- clone_scp=0
-fi
-
# Enable of code coverage and whether there is a local plugin
if upon "$cc_enable" && not_upon "$cc_path"; then
no_cc_t=1
diff --git a/utils.sh b/utils.sh
index 364d0b6..98f9f84 100644
--- a/utils.sh
+++ b/utils.sh
@@ -594,8 +594,6 @@
ci_src_repo_url="${ci_src_repo_url:-$CI_SRC_REPO_URL}"
ci_src_repo_url="${ci_src_repo_url:-https://$tforg_gerrit_url/ci/tf-a-ci-scripts}"
tf_ci_repo_url="$ci_src_repo_url"
-scp_src_repo_url="${scp_src_repo_url:-$SCP_SRC_REPO_URL}"
-scp_src_repo_url="${scp_src_repo_url:-$scp_src_repo_default}"
spm_src_repo_url="${spm_src_repo_url:-$SPM_SRC_REPO_URL}"
spm_src_repo_url="${spm_src_repo_url:-https://$tforg_gerrit_url/hafnium/hafnium}"
rmm_src_repo_url="${rmm_src_repo_url:-$RMM_SRC_REPO_URL}"