commit 608e92f98a79c5684e8dcf4cb5caa906bd39513f
author Gabor Toth <gabor.toth@arm.com> Tue Sep 06 12:41:41 2022 +0200
committer Gabor Toth <gabor.toth@arm.com> Tue Sep 06 12:41:41 2022 +0200
tree 0c176d50f9c99350d04bfc989b33c4b26d64f4d3
parent f0634da7100eeb4921723dcddb1356342e28df4f

[Build] Change CONFIG_TFM_FP to CONFIG_TFM_FLOAT_ABI

Signed-off-by: Gabor Toth <gabor.toth@arm.com>
Change-Id: I089f05025b6fe46606621b442b439303cbbaf05c

app/main_ns.c

diff --git a/app/main_ns.c b/app/main_ns.c
index 19224e5..9537487 100644
--- a/app/main_ns.c
+++ b/app/main_ns.c
@@ -22,7 +22,7 @@
 #endif
 #include "tfm_log.h"
 #include "uart_stdout.h"
-#if (CONFIG_TFM_FP >= 1)
+#if (CONFIG_TFM_FLOAT_ABI >= 1)
 #include "cmsis.h"
 #endif
 
@@ -129,7 +129,7 @@
 
 __WEAK int32_t tfm_ns_cp_init(void)
 {
-#if (CONFIG_TFM_FP >= 1)
+#if (CONFIG_TFM_FLOAT_ABI >= 1)
 #ifdef __GNUC__
     /* Enable NSPE privileged and unprivilged access to the FP Extension */
     SCB->CPACR |= (3U << 10U*2U)     /* enable CP10 full access */

test/config/check_config.cmake

diff --git a/test/config/check_config.cmake b/test/config/check_config.cmake
index 851a77d..41ea8c7 100644
--- a/test/config/check_config.cmake
+++ b/test/config/check_config.cmake
@@ -56,7 +56,7 @@
 tfm_invalid_config((TEST_NS_IPC OR TEST_S_IPC OR TEST_NS_CORE) AND CONFIG_TFM_SPM_BACKEND_SFN)
 tfm_invalid_config(TEST_S_SFN_BACKEND AND CONFIG_TFM_SPM_BACKEND_IPC)
 
-tfm_invalid_config(CONFIG_TFM_FP STREQUAL "soft" AND (TEST_S_FPU OR TEST_NS_FPU))
+tfm_invalid_config(CONFIG_TFM_FLOAT_ABI STREQUAL "soft" AND (TEST_S_FPU OR TEST_NS_FPU))
 tfm_invalid_config(TFM_LIB_MODEL AND (TEST_S_FPU OR TEST_NS_FPU OR TEST_S_SFN_BACKEND))
 tfm_invalid_config((NOT TFM_MULTI_CORE_TOPOLOGY) AND TEST_NS_MULTI_CORE)
 tfm_invalid_config(TEST_NS_T_COSE AND SYMMETRIC_INITIAL_ATTESTATION)

test/config/set_config.cmake

diff --git a/test/config/set_config.cmake b/test/config/set_config.cmake
index d1a97de..4f563bb 100644
--- a/test/config/set_config.cmake
+++ b/test/config/set_config.cmake
@@ -59,7 +59,7 @@
     set(TEST_NS_MANAGE_NSID     OFF        CACHE BOOL      "Whether to build NS regression NSID management tests")
 endif()
 
-if (CONFIG_TFM_FP STREQUAL "soft")
+if (CONFIG_TFM_FLOAT_ABI STREQUAL "soft")
     set(TEST_S_FPU                       OFF        CACHE BOOL      "Whether to build S regression FPU tests")
     set(TEST_NS_FPU                      OFF        CACHE BOOL      "Whether to build NS regression FPU tests")
 endif()