commit 4fb2b5cccc45428d7a0346f0ce0720ba89b96cd9
author Xinyu Zhang <xinyu.zhang@arm.com> Tue Apr 25 11:55:19 2023 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Tue Apr 25 11:09:21 2023 +0200
tree 7e110a198eaadb30737a987af22e7379808ad701
parent d5c8c81d19a02f595ae3b68001ea56097d2a4e2a

Build: Update Corstone1000 build commands

Update build commands for Corstone1000 to support:
 -DTEST_NS=OFF
 -DTEST_S=ON -DTEST_S_IPC=OFF
 -DEXTRA_S_TEST_SUITE_PATH=corstone1000/ci_regression_tests

When built for FPGA:
 -DTEST_S_PS=OFF
 -DTEST_S_PLATFORM=OFF

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

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 c19e297..146d48a 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -79,8 +79,9 @@
                       "-DTEST_NS_CRYPTO=ON "),
     # Corstone1000 support
     "FVP"          : "-DPLATFORM_IS_FVP=True ",
-    "FPGA"         : "-DPLATFORM_IS_FVP=False ",
-    "S_PS_OFF"     : "-DTEST_S_PS=OFF ",
+    "FPGA"         : "-DPLATFORM_IS_FVP=False -DTEST_S_PS=OFF -DTEST_S_PLATFORM=OFF ",
+    "CS1K_TEST"    : ("-DTEST_BL2=ON -DTEST_S=ON -DTEST_S_IPC=OFF "
+                      "-DEXTRA_S_TEST_SUITE_PATH=%(codebase_root_dir)s/platform/ext/target/arm/corstone1000/ci_regression_tests/ "),
 
     # Extra test cases
     "TEST_CBOR"    : "-DTEST_NS_QCBOR=ON ",