diff --git a/toolchain_ARMCLANG.cmake b/toolchain_ARMCLANG.cmake
index 6d2d53c..01d1423 100644
--- a/toolchain_ARMCLANG.cmake
+++ b/toolchain_ARMCLANG.cmake
@@ -45,8 +45,8 @@
         $<$<COMPILE_LANGUAGE:C>:-masm=auto>
         $<$<COMPILE_LANGUAGE:C>:-nostdlib>
         $<$<COMPILE_LANGUAGE:C>:-std=c99>
-        $<$<AND:$<COMPILE_LANGUAGE:C>,$<NOT:$<BOOL:${TFM_SYSTEM_FP}>>>:-mfpu=none>
-        $<$<AND:$<COMPILE_LANGUAGE:ASM>,$<NOT:$<BOOL:${TFM_SYSTEM_FP}>>>:--fpu=none>
+        $<$<COMPILE_LANGUAGE:C>:-mfpu=none>
+        $<$<COMPILE_LANGUAGE:ASM>:--fpu=none>
         $<$<COMPILE_LANGUAGE:ASM>:--cpu=${CMAKE_ASM_CPU_FLAG}>
         $<$<AND:$<COMPILE_LANGUAGE:C>,$<BOOL:${TFM_DEBUG_SYMBOLS}>>:-g>
     )
@@ -78,7 +78,7 @@
         --diag_suppress=6304
         # Pattern only matches removed unused sections.
         --diag_suppress=6329
-        $<$<NOT:$<BOOL:${TFM_SYSTEM_FP}>>:--fpu=softvfp>
+        --fpu=softvfp
     )
 endmacro()
 
@@ -92,12 +92,6 @@
             endif()
         endif()
 
-        if (DEFINED TFM_SYSTEM_FP)
-            if(NOT TFM_SYSTEM_FP)
-                string(APPEND CMAKE_SYSTEM_PROCESSOR "+nofp")
-            endif()
-        endif()
-
         if (DEFINED TFM_SYSTEM_DSP)
             if(NOT TFM_SYSTEM_DSP)
                 string(APPEND CMAKE_SYSTEM_PROCESSOR "+nodsp")
@@ -119,10 +113,6 @@
             if (TFM_SYSTEM_MVE)
                 string(APPEND CMAKE_ASM_CPU_FLAG ".mve")
             endif()
-
-            if (TFM_SYSTEM_FP)
-                string(APPEND CMAKE_ASM_CPU_FLAG ".fp")
-            endif()
         endif()
     endif()
 
@@ -145,12 +135,6 @@
         endif()
     endif()
 
-    if (DEFINED TFM_SYSTEM_FP)
-        if(NOT TFM_SYSTEM_FP)
-            string(APPEND CMAKE_SYSTEM_ARCH "+nofp")
-        endif()
-    endif()
-
     if (DEFINED TFM_SYSTEM_DSP)
         if(NOT TFM_SYSTEM_DSP)
             string(APPEND CMAKE_SYSTEM_ARCH "+nodsp")