Build: Turn off TEST_BL2 & TEST_S_PS for corstone1000

With the new changes on corstone1000, we don't have enough RAM to run
both TEST_BL2 and TEST_S_PS. Turning off these tests so that corstone1000 can
build the tfm test configuration in the CI.

Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
Change-Id: I441336e3b8f34b21b4e139202a94bae5fa896ee1
diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index 91429ba..58fed95 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -87,8 +87,8 @@
                       "-DTEST_NS_CRYPTO=ON "),
     # Corstone1000 support
     "FVP"          : "-DPLATFORM_IS_FVP=True ",
-    "FPGA"         : "-DPLATFORM_IS_FVP=False -DTEST_S_PS=OFF -DTEST_S_PLATFORM=OFF ",
-    "CS1K_TEST"    : ("-DTEST_S_IPC=OFF "
+    "FPGA"         : "-DPLATFORM_IS_FVP=False -DTEST_S_PLATFORM=OFF ",
+    "CS1K_TEST"    : ("-DTEST_S_PS=OFF "
                       "-DEXTRA_S_TEST_SUITE_PATH=%(codebase_root_dir)s/platform/ext/target/arm/corstone1000/ci_regression_tests/ "),
 
     # Extra test cases