diff options
| author | Joel Challis <git@zvecr.com> | 2020-05-20 16:28:39 +0100 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2020-06-12 17:00:27 +0900 |
| commit | 73d1fa5c1f541a43c2ef2413dc40df523f951182 (patch) | |
| tree | c049dac4a0006a3e0885242c9a4b7aa3e20096de /tmk_core/chibios.mk | |
| parent | 5aa3747ec157e37e4529bf9a7cf578319a96bede (diff) | |
Fix ChibiOS FPU build logic (#9132)
Diffstat (limited to 'tmk_core/chibios.mk')
| -rw-r--r-- | tmk_core/chibios.mk | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index d0f1032acb..09aaddeef0 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -220,6 +220,18 @@ COMPILEFLAGS += -fno-common COMPILEFLAGS += -fshort-wchar COMPILEFLAGS += $(THUMBFLAGS) +# FPU options default (Cortex-M4 and Cortex-M7 single precision). +USE_FPU_OPT ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant + +# FPU-related options +USE_FPU ?= no +ifneq ($(USE_FPU),no) + COMPILEFLAGS += $(USE_FPU_OPT) + OPT_DEFS += -DCORTEX_USE_FPU=TRUE +else + OPT_DEFS += -DCORTEX_USE_FPU=FALSE +endif + CFLAGS += $(COMPILEFLAGS) ASFLAGS += $(THUMBFLAGS) @@ -241,22 +253,6 @@ OPT_DEFS += -DPORT_IGNORE_GCC_VERSION_CHECK=1 MCUFLAGS = -mcpu=$(MCU) -# FPU options default (Cortex-M4 and Cortex-M7 single precision). -ifeq ($(USE_FPU_OPT),) - USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv4-sp-d16 -fsingle-precision-constant -endif - -# FPU-related options -ifeq ($(USE_FPU),) - USE_FPU = no -endif -ifneq ($(USE_FPU),no) - OPT += $(USE_FPU_OPT) - OPT_DEFS += -DCORTEX_USE_FPU=TRUE -else - OPT_DEFS += -DCORTEX_USE_FPU=FALSE -endif - DEBUG = gdb DFU_ARGS ?= |