Merge pull request #18064 from aabadie/pr/cpu/cortexm33_fpu

cpu/cortexm_common: enable FPU on cortexm33
RIOT-OS · May 6, 2022 · 98c6bae · 98c6bae
2 parents 7b827f4 + 6f52b90
commit 98c6bae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/cpu/cortexm_common/Kconfig b/cpu/cortexm_common/Kconfig
@@ -90,6 +90,7 @@ config CPU_CORE_CORTEX_M33
     bool
     select CPU_ARCH_ARMV8M
     select CPU_CORE_CORTEX_M
+    select HAS_CORTEXM_FPU
     #select HAS_RUST_TARGET
 
 config CPU_CORE_CORTEX_M4

diff --git a/cpu/cortexm_common/Makefile.features b/cpu/cortexm_common/Makefile.features
@@ -12,8 +12,8 @@ FEATURES_PROVIDED += puf_sram
 FEATURES_PROVIDED += picolibc
 FEATURES_PROVIDED += ssp
 
-# cortex-m4f and cortex-m7 provide FPU support
-ifneq (,$(filter $(CPU_CORE),cortex-m4f cortex-m7))
+# cortex-m33, cortex-m4f and cortex-m7 provide FPU support
+ifneq (,$(filter $(CPU_CORE),cortex-m33 cortex-m4f cortex-m7))
   FEATURES_PROVIDED += cortexm_fpu
 endif
 

diff --git a/makefiles/arch/cortexm.inc.mk b/makefiles/arch/cortexm.inc.mk
@@ -63,7 +63,7 @@ CFLAGS += -DCPU_CORE_$(call uppercase_and_underscore,$(CPU_CORE))
 
 # Add soft or hard FPU CFLAGS depending on the module
 ifneq (,$(filter cortexm_fpu,$(USEMODULE)))
-  ifeq ($(CPU_CORE),cortex-m7)
+  ifneq (,$(filter $(CPU_CORE),cortex-m33 cortex-m7))
     CFLAGS_FPU ?= -mfloat-abi=hard -mfpu=fpv5-sp-d16
   else
     CFLAGS_FPU ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16