commit 7c8d3378395c6fcdd0802119e5c7a29176609877
author Xinyu Zhang <xinyu.zhang@arm.com> Wed Dec 22 11:15:42 2021 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Wed Dec 22 13:53:57 2021 +0800
tree 07b45c7401cc3a48ee3fc96f97982c23ad73e49b
parent 3bb01af027f6bb2db0fa606fe6538e414fccf387

Build: Update ST configs

Two configs are needed on ST board:
1. Crypto test ON and other tests off
2. Crypto test OFF and other tests on
Update ST related configs to satisfy this requirement.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I69b5cab8415e3fa31f56dbf6467a6a904e012cee

build_helper/build_helper_configs.py

diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index aaa4905..ac2d6d2 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -410,7 +410,7 @@
                                      "toolchain_ARMCLANG.cmake"],
                 "lib_model":        [True, False],
                 "isolation_level":  ["1", "2", "3"],
-                "test_regression":  [True],
+                "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
                 "with_otp":         ["off"],
@@ -420,10 +420,17 @@
                 "partition_ps":     ["ON"],
                 "fp":               ["0"],
                 "lazy":             ["OFF"],
-                "extra_params":     ["CRYPTO_OFF", "NS_ATTEST_ON"]
+                "extra_params":     ["CRYPTO_OFF", "CRYPTO_ON"]
                 },
                 "common_params": _common_tfm_builder_cfg,
-                "invalid": _common_tfm_invalid_configs + []
+                "invalid": _common_tfm_invalid_configs + [
+                    # all other tests are off when CRYPTO is ON
+                    ("stm/stm32l562e_dk", "*", "*", "*", True, "*", "*", "*",
+                     "*", "*", "*", "*", "*", "*", "CRYPTO_ON"),
+                    # all other tests are ON when CRYPTO is OFF
+                    ("stm/stm32l562e_dk", "*", "*", "*", False, "*", "*", "*",
+                     "*", "*", "*", "*", "*", "*", "CRYPTO_OFF"),
+                ]
                 }
 
 config_LPCXPRESSO55S69 = {"seed_params": {
@@ -1148,8 +1155,8 @@
                      "off", True, True, "", "ON", "0", "OFF", "CRYPTO_OFF"),
                     # stm32l562e_dk_GNUARM_IPC_2_REG_Release_BL2_NS
                     ("stm/stm32l562e_dk", "toolchain_GNUARM.cmake",
-                     False, "2", True, "OFF", "Release",
-                     "off", True, True, "", "ON", "0", "OFF", "NS_ATTEST_ON"),
+                     False, "2", False, "OFF", "Release",
+                     "off", True, True, "", "ON", "0", "OFF", "CRYPTO_ON"),
                     # stm32l562e_dk_GNUARM_IPC_3_REG_Release_BL2_NS
                     ("stm/stm32l562e_dk", "toolchain_GNUARM.cmake",
                      False, "3", True, "OFF", "Release",