Remove MUSCA_A from CI
TF-M has deprecated MUSCA_A board.
Remove this board from CI.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Ie94314c8d5bce0cb2c9c2bebf762f7a30d2393ad
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index b87fcf2..00e3325 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -74,17 +74,6 @@
# ALL commands will be executed for every build.
# Other keys will append extra commands when matching target_platform
"build_cmds": {"all": ["cmake --build ./ -- install"],
- "musca_a": [("srec_cat "
- "%(_tbm_build_dir_)s/bin/"
- "bl2.bin "
- "-Binary -offset 0x200000 "
- "-fill 0xFF 0x200000 0x220000 "
- "%(_tbm_build_dir_)s/bin/"
- "tfm_s_ns_signed.bin "
- "-Binary -offset 0x220000 "
- "-fill 0xFF 0x220000 0xA00000 "
- "-o %(_tbm_build_dir_)s/bin/"
- "tfm.hex -Intel")],
"musca_b1/sse_200": [("srec_cat "
"%(_tbm_build_dir_)s/bin/"
"bl2.bin "
@@ -115,13 +104,6 @@
"tfm_s.bin",
"%(_tbm_build_dir_)s/bin/"
"tfm_ns.bin"],
- "musca_a": [
- "%(_tbm_build_dir_)s/bin/"
- "tfm.hex",
- "%(_tbm_build_dir_)s/bin/"
- "bl2.bin",
- "%(_tbm_build_dir_)s/bin/"
- "tfm_sign.bin"],
"musca_b1/sse_200": [
"%(_tbm_build_dir_)s/bin/"
"tfm.hex",
@@ -170,7 +152,6 @@
("*", "*", "*", "3", "*", "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "3", "*", "INTERNAL_TRUSTED_STORAGE", "*", "*", "*", "*", "*", "*"),
# Musca requires BL2
- ("musca_a", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*"),
("musca_b1/sse_200", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*"),
("musca_s1", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*"),
# psoc64 cannot use BL2
@@ -213,7 +194,6 @@
# Only AN521 and MUSCA_B1 support Isolation Level 3
("mps2/an519", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*"),
("mps3/an524", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("musca_a", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*"),
("musca_s1", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*"),
("cypress/psoc64", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*"),
("musca_b1/secure_enclave", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*"),
@@ -381,7 +361,7 @@
}
config_IPC = {"seed_params": {
- "tfm_platform": ["mps2/an521", "mps2/an519", "musca_a",
+ "tfm_platform": ["mps2/an521", "mps2/an519",
"musca_b1/sse_200"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
@@ -402,7 +382,7 @@
config_full = {"seed_params": {
"tfm_platform": ["mps2/an521", "mps2/an519",
- "musca_a", "musca_b1/sse_200",
+ "musca_b1/sse_200",
"mps3/an524", "cypress/psoc64",
"musca_b1/secure_enclave"],
"toolchain_file": ["toolchain_GNUARM.cmake",
@@ -428,8 +408,6 @@
"*", "*", "RelWithDebInfo", "*", "*", "*", "*", "*"),
("mps2/an519", "*", "*", "*",
"*", "*", "RelWithDebInfo", "*", "*", "*", "*", "*"),
- ("musca_a", "*", "*", "*",
- "*", "*", "RelWithDebInfo", "*", "*", "*", "*", "*"),
("musca_b1/sse_200", "*", "*", "*",
"*", "*", "RelWithDebInfo", "*", "*", "*", "*", "*"),
("mps3/an524", "*", "*", "*",
@@ -438,7 +416,7 @@
}
config_tfm_test = {"seed_params": {
- "tfm_platform": ["mps2/an521", "musca_a",
+ "tfm_platform": ["mps2/an521",
"musca_b1/sse_200", "musca_s1"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
@@ -526,25 +504,6 @@
"invalid": _common_tfm_invalid_configs + []
}
-config_MUSCA_A = {"seed_params": {
- "tfm_platform": ["musca_a"],
- "toolchain_file": ["toolchain_ARMCLANG.cmake",
- "toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
- "isolation_level": ["1", "2"],
- "test_regression": [True, False],
- "test_psa_api": ["OFF"],
- "cmake_build_type": ["Debug", "Release"],
- "with_otp": ["off"],
- "with_bl2": [True],
- "with_ns": [True, False],
- "profile": [""],
- "partition_ps": ["ON"],
- },
- "common_params": _common_tfm_builder_cfg,
- "invalid": _common_tfm_invalid_configs + []
- }
-
config_MUSCA_B1 = {"seed_params": {
"tfm_platform": ["musca_b1/sse_200"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
@@ -604,7 +563,7 @@
config_release = {"seed_params": {
"tfm_platform": ["mps2/an521", "mps2/an519",
- "musca_a", "musca_b1/sse_200", "musca_s1",
+ "musca_b1/sse_200", "musca_s1",
"mps3/an524"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
@@ -679,7 +638,7 @@
config_nightly = {"seed_params": {
"tfm_platform": ["mps2/an521", "mps2/an519",
- "musca_a", "musca_b1/sse_200", "musca_s1",
+ "musca_b1/sse_200", "musca_s1",
"mps3/an524", "cypress/psoc64",
"musca_b1/secure_enclave"],
"toolchain_file": ["toolchain_GNUARM.cmake",
@@ -707,8 +666,6 @@
"*", "*", "RelWithDebInfo", "*", "*", "*", "*", "*"),
("mps2/an519", "*", "*", "*",
"*", "*", "RelWithDebInfo", "*", "*", "*", "*", "*"),
- ("musca_a", "*", "*", "*",
- "*", "*", "RelWithDebInfo", "*", "*", "*", "*", "*"),
("musca_b1/sse_200", "*", "*", "*",
"*", "*", "RelWithDebInfo", "*", "*", "*", "*", "*"),
("musca_s1", "*", "*", "*",
@@ -1033,7 +990,6 @@
"an521_psa_api": config_AN521_PSA_API,
"an521_psa_ipc": config_AN521_PSA_IPC,
"an519": config_AN519,
- "musca_a": config_MUSCA_A,
"musca_b1": config_MUSCA_B1,
"musca_b1_se": config_MUSCA_B1_SE,
"musca_s1": config_MUSCA_S1,
diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index e67eeae..8131326 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -16,7 +16,6 @@
"mps2/an539": "AN539",
"mps2/sse-200_aws": "SSE-200_AWS",
"mps3/an524": "AN524",
- "musca_a": "MUSCA_A",
"musca_b1/sse_200": "MUSCA_B1",
"musca_b1/secure_enclave": "MUSCA_B1_SE",
"musca_s1": "MUSCA_S1"]
diff --git a/script/tf-coverity/cov-makefile b/script/tf-coverity/cov-makefile
index 04316f5..79f34ea 100644
--- a/script/tf-coverity/cov-makefile
+++ b/script/tf-coverity/cov-makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2021, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -16,7 +16,7 @@
target_platforms := cypress/psoc64 \
mps2/an519 mps2/an521 \
mps3/an524 \
- musca_a musca_b1/sse_200 musca_s1
+ musca_b1/sse_200 musca_s1
tf_m := trusted-firmware-m
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index a1c7c45..105825f 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -8,7 +8,7 @@
__copyright__ = """
/*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -37,7 +37,6 @@
"mps2/an539": "AN539",
"mps2/sse-200_aws": "SSE-200_AWS",
"mps3/an524": "AN524",
- "musca_a": "MUSCA_A",
"musca_b1/sse_200": "MUSCA_B1",
"musca_b1/secure_enclave": "MUSCA_B1_SE",
"musca_s1": "MUSCA_S1"}