commit e851f6cff0daea80c5393f0733470b2d9a052f1e
author Feder Liang <feder.liang@arm.com> Wed Jan 26 10:14:10 2022 +0800
committer David Hu <david.hu@arm.com> Wed Jan 26 09:58:12 2022 +0100
tree 8a0640f5fdfaf5e16a0fdbbd5e77fe6292cc14b8
parent 98170ff23da4aa923bd4ade45171d2abe1889e6b

Build: Correcrt CONFIG_TFM_FP cmake parameter

Fix wrong cmake parameter CONFIG_TFM_SPE_FP as CONFIG_TFM_FP.

Signed-off-by: Feder Liang <feder.liang@arm.com>
Change-Id: Iacd7f426c863deef79be27ab4afd868f8a46d50a

toolchain_GNUARM.cmake

diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
index 7645f58..654d5bb 100644
--- a/toolchain_GNUARM.cmake
+++ b/toolchain_GNUARM.cmake
@@ -76,8 +76,8 @@
             endif()
         endif()
         if(GCC_VERSION VERSION_GREATER_EQUAL "8.0.0")
-            if (DEFINED CONFIG_TFM_SPE_FP)
-                if(CONFIG_TFM_SPE_FP STREQUAL "0" AND
+            if (DEFINED CONFIG_TFM_FP)
+                if(CONFIG_TFM_FP STREQUAL "0" AND
                    NOT TFM_SYSTEM_ARCHITECTURE STREQUAL "armv6-m")
                     string(APPEND CMAKE_SYSTEM_PROCESSOR "+nofp")
                 endif()

tools/config_impl.cmake.template

diff --git a/tools/config_impl.cmake.template b/tools/config_impl.cmake.template
index 59a327c..4c9dbcc 100644
--- a/tools/config_impl.cmake.template
+++ b/tools/config_impl.cmake.template
@@ -33,7 +33,7 @@
     message(FATAL_ERROR "Invalid partition number input, check configurations.")
 {% endif %}
 
-    if((CONFIG_TFM_SPE_FP GREATER 0) AND CONFIG_TFM_SPM_BACKEND_SFN)
+    if((CONFIG_TFM_FP GREATER 0) AND CONFIG_TFM_SPM_BACKEND_SFN)
         message(FATAL_ERROR "FP is not supported for SFN model.")
     endif()
 endif()