commit 0c31d7bf7eb2c8b15eb824e5c8e11187076cdc81
author Nicola Mazzucato <nicola.mazzucato@arm.com> Thu Jun 27 11:37:25 2024 +0100
committer Nicola Mazzucato <nicola.mazzucato@arm.com> Thu Jun 27 11:46:15 2024 +0100
tree cac9cd43ad6a6bfc9ed3ae4898eec40dad5e4be7
parent bde5d433b48d27330b2d72998dce192e19dfcbf1

build_helpers: Fix build config for CS310 with PACBTI in pp_test

Replace corstone300 with corstone310 for CS310 build with GCC
and PAC-BTI option.
Also amend the generated config as it appears in CI: GCC instead
of GNUARM

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

build_helper/build_helper_configs.py

diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 0f29578..db99ef8 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -325,8 +325,8 @@
                     # CS300_FVP_GNUARM_2_RegBL2_RegS_RegNS_Release_BL2
                     ("arm/mps3/corstone300/fvp", "GCC_10_3", "2",
                      "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
-                    # CS310_FVP_GNUARM_1_Debug_BL2_PACBTI_STD
-                    ("arm/mps3/corstone300/fvp", "GCC_13_2", "1",
+                    # CS310_FVP_GCC_1_Debug_BL2_PACBTI_STD
+                    ("arm/mps3/corstone310/fvp", "GCC_13_2", "1",
                      "OFF", "OFF", "Debug", True, "", "PACBTI_STD"),
                     # corstone1000_GCC_2_RegS_Debug_BL2_NSOFF_CS1K_TEST_FVP
                     ("arm/corstone1000", "GCC_10_3", "2",