diff --git a/boards/Makefile.include.cortex_common b/boards/Makefile.include.cortex_common
index 93965c98e87e..521638cf8b8c 100644
--- a/boards/Makefile.include.cortex_common
+++ b/boards/Makefile.include.cortex_common
@@ -5,12 +5,6 @@ include $(RIOTBOARD)/Makefile.include.gnu
 # use cortex name of CPU folder, but enable board Makefile to override
 export MCPU ?= $(CORTEX)
 
-#
-# CPU model specifics
-ifeq ($(CORTEX),cortex-m4)
-CFLAGS_FPU += -mfloat-abi=hard -mfpu=fpv4-sp-d16
-endif
-
 # define build specific options
 export CFLAGS_CPU   = -mcpu=$(MCPU) -mlittle-endian -mthumb -mno-thumb-interwork $(CFLAGS_FPU)
 export CFLAGS_STYLE = -std=gnu99 -Wall -Wstrict-prototypes
diff --git a/cpu/Makefile.include.cortex_common b/cpu/Makefile.include.cortex_common
index 1358aa985f36..af4d0d881766 100644
--- a/cpu/Makefile.include.cortex_common
+++ b/cpu/Makefile.include.cortex_common
@@ -1,6 +1,11 @@
 # This CPU implementation is using the new core/CPU interface:
 export CFLAGS += -DCOREIF_NG=1
 
+# CPU model specifics
+ifeq ($(CORTEX),cortex-m4)
+export CFLAGS_FPU += -mfloat-abi=hard -mfpu=fpv4-sp-d16
+endif
+
 # Tell the build system that the CPU depends on the Cortex-M common files:
 export USEMODULE += $(CORTEX)_common