commit 373187e1ee3e13780d7155e5e9a7be1c3d4fab79
author Antonio de Angelis <antonio.deangelis@arm.com> Sat Jan 11 22:09:30 2025 +0000
committer Antonio de Angelis <antonio.deangelis@arm.com> Sat Jan 11 22:09:32 2025 +0000
tree ba9d1b38a645c57728b50f9c2b60332d7654a02c
parent 80d840ee77a452d14909b73bb7df62ecbfde9d56

Build: Update RD-V3 to updated structure for neoverse_rd

RD-V3 is now a platform available under the neoverse_rd. Add
support for RD-V3-Cfg1 and RD-V3-Cfg2 through setting the
value of TFM_PLATFORM_VARIANT in case it is required.

Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: I4cf6423e1b1921ebaa5c6406092dedf459473ee9

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 be2c374..ca7670a 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -5,7 +5,7 @@
 
 __copyright__ = """
 /*
- * Copyright (c) 2022-2024, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2025, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -27,7 +27,7 @@
     "arm/mps4/corstone320"               : "corstone320",
     "arm/mps3/corstone310/fvp"           : "corstone310",
     "arm/rse/tc/tc3"                     : "RSE_TC3",
-    "arm/rse/rdv3"                       : "RSE_RDV3",
+    "arm/rse/neoverse_rd/rdv3"           : "RSE_RDV3",
     "arm/rse/automotive_rd/rd1ae"        : "RSE_RD1AE",
     "cypress/psoc64"                     : "psoc64",
     "lairdconnectivity/bl5340_dvk_cpuapp": "BL5340",
@@ -109,8 +109,10 @@
     "PACBTI_STD"   : "-DCONFIG_TFM_BRANCH_PROTECTION_FEAT=BRANCH_PROTECTION_STANDARD",
     "PACBTI_NONE"  : "-DCONFIG_TFM_BRANCH_PROTECTION_FEAT=BRANCH_PROTECTION_NONE",
 
-    # Platform Variants Support
+    # Platform Variants Support for RSE_RDV3
     "CFG0"         : "-DTFM_PLATFORM_VARIANT=0",
+    "CFG1"         : "-DTFM_PLATFORM_VARIANT=1",
+    "CFG2"         : "-DTFM_PLATFORM_VARIANT=2",
 
     # Extra test cases
     "TEST_CBOR"    : "-DTEST_NS_QCBOR=ON ",

build_helper/build_helper_configs.py

diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 721ceae..4918b38 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -8,7 +8,7 @@
 
 __copyright__ = """
 /*
- * Copyright (c) 2018-2024, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2025, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -367,7 +367,7 @@
                     ("arm/rse/tc/tc3", "GCC_10_3", "2",
                      "OFF", "OFF", "Release", True, "", "ATTESTATION_SCHEME_CCA"),
                     # RSE_RDV3_GCC_2_Release_BL2_NSOFF_CFG0
-                    ("arm/rse/rdv3", "GCC_10_3", "2",
+                    ("arm/rse/neoverse_rd/rdv3", "GCC_10_3", "2",
                      "OFF", "OFF", "Release", True, "", "NSOFF, CFG0"),
                     # RSE_RD1AE_GCC_2_Release_BL2_NSOFF
                     ("arm/rse/automotive_rd/rd1ae", "GCC_10_3", "2",
@@ -961,7 +961,7 @@
                 }
 
 config_rse_rdv3 = {"seed_params": {
-                "tfm_platform":     ["arm/rse/rdv3"],
+                "tfm_platform":     ["arm/rse/neoverse_rd/rdv3"],
                 "compiler":         ["GCC_10_3"],
                 "isolation_level":  ["1", "2", "3"],
                 "test_regression":  ["OFF"],