commit 9f8ec58b1f5c7864431bc897f04422889291d5c3
author Jackson Cooper-Driver <jackson.cooper-driver@arm.com> Thu Jun 13 11:15:27 2024 +0100
committer Jackson Cooper-Driver <jackson.cooper-driver@arm.com> Mon Jun 24 10:24:21 2024 +0100
tree d9f0087a2a2435707c0e49fee771ba349060d1e1
parent 0d1086110182433fb140bfea3e8687358feadddd

RSE: TC: Rename TC->TC2

RSE TC platform support has been modified to create a common TC
directory and move the TC2 specific code into its own directory. This
change clarifies the TC platform in the CI by renaming it to TC2 and
also updates the platform path in the TF-M directory.

Change-Id: I72dc65c7b89e121c9ac37c340b983cc44e39942a
Signed-off-by: Jackson Cooper-Driver <jackson.cooper-driver@arm.com>

build_helper/build_helper_config_maps.py

diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index 74c44b8..6a3aab9 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -25,7 +25,7 @@
     "arm/corstone1000"                   : "corstone1000",
     "arm/mps4/corstone315"               : "corstone315",
     "arm/mps3/corstone310/fvp"           : "corstone310",
-    "arm/rse/tc"                         : "RSE_TC",
+    "arm/rse/tc/tc2"                     : "RSE_TC2",
     "arm/rse/rdfremont"                  : "RSE_RDFremont",
     "arm/rse/automotive_rd/rd1ae"        : "RSE_RD1AE",
     "cypress/psoc64"                     : "psoc64",

build_helper/build_helper_configs.py

diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index f501ac7..01f482d 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -115,7 +115,7 @@
                                     "-o %(ci_build_root_dir)s/"
                                     "spe/bin/tfm.hex -Intel; "
                                     "fi;"),
-                    "arm/rse/tc": ("srec_cat "
+                    "arm/rse/tc/tc2": ("srec_cat "
                                    "%(ci_build_root_dir)s/spe/bin/bl1_1.bin -Binary -offset 0x0 "
                                    "%(ci_build_root_dir)s/spe/bin/rom_dma_ics.bin -Binary -offset 0x1F000 "
                                    "-o %(ci_build_root_dir)s/spe/bin/rom.bin -Binary;"
@@ -225,7 +225,7 @@
                            "bl2.bin",
                            "%(ci_build_root_dir)s/spe/bin/"
                            "tfm_sign.bin"],
-                           "arm/rse/tc": [
+                           "arm/rse/tc/tc2": [
                            "%(ci_build_root_dir)s/spe/bin/rom.bin",
                            "%(ci_build_root_dir)s/spe/bin/encrypted_cm_provisioning_bundle_0.bin",
                            "%(ci_build_root_dir)s/spe/bin/encrypted_dm_provisioning_bundle_0.bin",
@@ -346,8 +346,8 @@
                     # MUSCA_S1_GCC_1_RegBL2_RegS_RegNS_Release_BL2_CC_DRIVER_PSA
                     ("arm/musca_s1", "GCC_10_3", "1",
                      "RegBL2, RegS, RegNS", "OFF", "Release", True, "", "CC_DRIVER_PSA"),
-                    # RSE_TC_GCC_2_RegS_RegNS_Debug_BL2
-                    ("arm/rse/tc", "GCC_10_3", "2",
+                    # RSE_TC2_GCC_2_RegS_RegNS_Debug_BL2
+                    ("arm/rse/tc/tc2", "GCC_10_3", "2",
                      "RegS, RegNS", "OFF", "Debug", True, "", ""),
                     # RSE_RDFremont_GCC_2_Release_BL2_NSOFF_CFG0
                     ("arm/rse/rdfremont", "GCC_10_3", "2",
@@ -892,7 +892,7 @@
                 }
 
 config_rse = {"seed_params": {
-                "tfm_platform":     ["arm/rse/tc"],
+                "tfm_platform":     ["arm/rse/tc/tc2"],
                 "compiler":         ["GCC_10_3"],
                 "isolation_level":  ["1", "2"],
                 "test_regression":  ["OFF", "RegS, RegNS"],
@@ -905,7 +905,7 @@
                 "common_params": _common_tfm_builder_cfg,
                 "invalid": _common_tfm_invalid_configs + [
                     # BL2 is too large for RSE in Debug builds with tests
-                    ("arm/rse/tc", "GCC_10_3", "*", "RegBL2, RegS, RegNS", "*",
+                    ("arm/rse/tc/tc2", "GCC_10_3", "*", "RegBL2, RegS, RegNS", "*",
                      "Debug", True, "*", "*"),
                 ]
                 }