diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs
index 3ffcfda9d9a..2c22b739134 100644
--- a/arch/arm/src/armv8-m/Toolchain.defs
+++ b/arch/arm/src/armv8-m/Toolchain.defs
@@ -96,7 +96,7 @@ else ifeq ($(CONFIG_ARCH_CORTEXM35P),y)
 else ifeq ($(CONFIG_ARCH_CORTEXM55),y)
   TOOLCHAIN_MCPU     := -mcpu=cortex-m55
   ifeq ($(CONFIG_ARCH_FPU),y)
-    TOOLCHAIN_MFLOAT := -mfpu=fpv5-d16 -mfloat-abi=hard
+    TOOLCHAIN_MFLOAT := -mfpu=auto -mfloat-abi=hard
   else
     TOOLCHAIN_MFLOAT := -mfloat-abi=soft
   endif