diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-06 12:10:11 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-06 12:10:11 +1000 |
| commit | 80299276b7134693a6f02fb8fa791d0a15ed1eab (patch) | |
| tree | e1824bd6b9aa27a71372f67c6a0f96b9f625abd7 /tools | |
| parent | 754d2e072b51bc43c72a37d46e22337d594f18dc (diff) | |
| parent | a35ee53d0a28cb0b6b61944a1ed698a0cef85839 (diff) | |
| download | uGFX-80299276b7134693a6f02fb8fa791d0a15ed1eab.tar.gz uGFX-80299276b7134693a6f02fb8fa791d0a15ed1eab.tar.bz2 uGFX-80299276b7134693a6f02fb8fa791d0a15ed1eab.zip | |
Merge branch 'master' into TextEdit
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gmake_scripts/cpu_stm32m4.mk | 14 | ||||
| -rw-r--r-- | tools/gmake_scripts/cpu_stm32m7.mk | 13 |
2 files changed, 11 insertions, 16 deletions
diff --git a/tools/gmake_scripts/cpu_stm32m4.mk b/tools/gmake_scripts/cpu_stm32m4.mk index 5acfe8ad..1e205eb6 100644 --- a/tools/gmake_scripts/cpu_stm32m4.mk +++ b/tools/gmake_scripts/cpu_stm32m4.mk @@ -14,11 +14,11 @@ # NONE # -#SRCFLAGS += -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant -falign-functions=16 -#LDFLAGS += -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant -falign-functions=16 -#DEFS += CORTEX_USE_FPU=TRUE -#LIBS += m -SRCFLAGS += -mcpu=cortex-m4 -falign-functions=16 -LDFLAGS += -mcpu=cortex-m4 -DEFS += CORTEX_USE_FPU=FALSE +SRCFLAGS += -mcpu=cortex-m4 -falign-functions=16 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant +LDFLAGS += -mcpu=cortex-m4 -falign-functions=16 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant +DEFS += CORTEX_USE_FPU=TRUE USE_FPU=hard +LIBS += m +#SRCFLAGS += -mcpu=cortex-m4 -falign-functions=16 +#LDFLAGS += -mcpu=cortex-m4 +#DEFS += CORTEX_USE_FPU=FALSE diff --git a/tools/gmake_scripts/cpu_stm32m7.mk b/tools/gmake_scripts/cpu_stm32m7.mk index 0a59e24f..78e1cc4e 100644 --- a/tools/gmake_scripts/cpu_stm32m7.mk +++ b/tools/gmake_scripts/cpu_stm32m7.mk @@ -13,12 +13,7 @@ # # NONE # - -#SRCFLAGS += -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant -falign-functions=16 -#LDFLAGS += -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant -falign-functions=16 -#DEFS += CORTEX_USE_FPU=TRUE -#LIBS += m -SRCFLAGS += -mcpu=cortex-m7 -falign-functions=16 -LDFLAGS += -mcpu=cortex-m7 -DEFS += CORTEX_USE_FPU=FALSE - +SRCFLAGS += -mcpu=cortex-m7 -falign-functions=16 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant +LDFLAGS += -mcpu=cortex-m7 -falign-functions=16 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant +DEFS += CORTEX_USE_FPU=TRUE USE_FPU=hard +LIBS += m
\ No newline at end of file |