Build: Update FP options

Signed-off-by: Mark Horvath <mark.horvath@arm.com>
Change-Id: I46e14eb209c9890d130a67d475072edc1e519541
diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index c161572..13e8c9a 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -63,8 +63,8 @@
     # MMIO
     "MMIO"         : "-DPSA_FRAMEWORK_HAS_MM_IOVEC=ON ",
     # FPU support
-    "FPSOFT"       : "-DCONFIG_TFM_FP=soft ",
-    "FPHARD"       : ("-DCONFIG_TFM_FP=hard "
+    "FPOFF"        : "-DCONFIG_TFM_ENABLE_FP=OFF ",
+    "FPON"         : ("-DCONFIG_TFM_ENABLE_FP=ON "
                       "-DTEST_S_FPU=ON -DTEST_NS_FPU=ON "),
     "LZOFF"        : "-DCONFIG_TFM_LAZY_STACKING=OFF ",
     # SFN