commit 551c5f39a82c582de08702c206a47e09b64815af
author Nicola Mazzucato <nicola.mazzucato@arm.com> Wed Oct 02 09:43:04 2024 +0100
committer Nicola Mazzucato <nicola.mazzucato@arm.com> Mon Oct 21 11:15:02 2024 +0100
tree 852760fb65673898d6ccc8060c180caba224f911
parent abe117433fc870ad1eac18ba705a85076833c73f

build_helpers: Fix TC3 default DPE test

The default Attestation scheme for TC3 is DPE but a
reference to tf-m-extras is missing to actually run the
DPE test.

Add it with this patch.

Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com>
Change-Id: I798bab34dd2f03347eaad98437cb116c3d32b67a

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 b784a31..5c8e095 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -134,7 +134,10 @@
     "EXTRAS_EXAMPLE_DMA350_CLCD"    : "-DDEFAULT_NS_SCATTER=OFF -DPLATFORM_SVC_HANDLERS=ON ",
 
     "EXTRAS_EXAMPLE_DMA350_S"       : "-DEXTRA_S_TEST_SUITE_PATH=%(codebase_root_dir)s/../tf-m-extras/examples/corstone310_fvp_dma/dma350_s",
-    "EXTRAS_EXAMPLE_DMA350_NS"      : "-DEXTRA_NS_TEST_SUITE_PATH=%(codebase_root_dir)s/../tf-m-extras/examples/corstone310_fvp_dma/dma350_ns"
+    "EXTRAS_EXAMPLE_DMA350_NS"      : "-DEXTRA_NS_TEST_SUITE_PATH=%(codebase_root_dir)s/../tf-m-extras/examples/corstone310_fvp_dma/dma350_ns",
+
+    # Attestation scheme
+    "ATTESTATION_SCHEME_DPE"    : ("-DEXTRA_S_TEST_SUITE_PATH=%(codebase_root_dir)s/../tf-m-extras/partitions/dice_protection_environment/test/secure ")
 }
 
 mapTfmExtrasExamplePaths = {

build_helper/build_helper_configs.py

diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 06d5254..e24a4d5 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -357,9 +357,9 @@
                     # 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_TC3_GCC_3_RegS_RegNS_Debug_BL2
+                    # RSE_TC3_GCC_3_RegS_RegNS_Debug_BL2_ATTESTATION_SCHEME_DPE
                     ("arm/rse/tc/tc3", "GCC_10_3", "3",
-                     "RegS, RegNS", "OFF", "Debug", True, "", ""),
+                     "RegS, RegNS", "OFF", "Debug", True, "", "ATTESTATION_SCHEME_DPE"),
                     # RSE_TC3_GCC_2_RegBL1_1_Debug_BL2
                     ("arm/rse/tc/tc3", "GCC_10_3", "2",
                      "RegBL1_1", "OFF", "Debug", True, "", ""),
@@ -944,7 +944,7 @@
                 "cmake_build_type": ["Debug", "Release"],
                 "with_bl2":         [True],
                 "profile":          [""],
-                "extra_params":     [""]
+                "extra_params":     ["ATTESTATION_SCHEME_DPE"]
                 },
                 "common_params": _common_tfm_builder_cfg,
                 "invalid": _common_tfm_invalid_configs + [