aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George2017-06-28 15:42:40 +1000
committerDamien George2017-06-28 15:42:40 +1000
commit703370ebc5419af918754a402f4b0122c3e0a3c0 (patch)
tree1b3ef593ef033bc724aba8805a6c674e9ea0cf06
parent4d47e6c0db8254a07a66cde4518a49cc1cf28404 (diff)
stmhal/Makefile: Rename FLOAT_IMPL to MICROPY_FLOAT_IMPL to match C name
The name used in py/mpconfig.h is MICROPY_FLOAT_IMPL so rename this Makefile variable to mirror that.
-rw-r--r--stmhal/Makefile4
-rw-r--r--stmhal/boards/NUCLEO_F767ZI/mpconfigboard.mk2
-rw-r--r--stmhal/boards/STM32F769DISC/mpconfigboard.mk2
3 files changed, 4 insertions, 4 deletions
diff --git a/stmhal/Makefile b/stmhal/Makefile
index b7226c463..78de62ff1 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -70,7 +70,7 @@ CFLAGS += $(COPT)
CFLAGS += -Iboards/$(BOARD)
CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES)xx_hal.h>'
-ifeq ($(FLOAT_IMPL),double)
+ifeq ($(MICROPY_FLOAT_IMPL),double)
CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
else
CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
@@ -104,7 +104,7 @@ SRC_LIB = $(addprefix lib/,\
utils/sys_stdio_mphal.c \
)
-ifeq ($(FLOAT_IMPL),double)
+ifeq ($(MICROPY_FLOAT_IMPL),double)
SRC_LIBM = $(addprefix lib/libm_dbl/,\
__cos.c \
__expo2.c \
diff --git a/stmhal/boards/NUCLEO_F767ZI/mpconfigboard.mk b/stmhal/boards/NUCLEO_F767ZI/mpconfigboard.mk
index b685a6fe0..ba28a16e1 100644
--- a/stmhal/boards/NUCLEO_F767ZI/mpconfigboard.mk
+++ b/stmhal/boards/NUCLEO_F767ZI/mpconfigboard.mk
@@ -1,5 +1,5 @@
MCU_SERIES = f7
CMSIS_MCU = STM32F767xx
-FLOAT_IMPL = double
+MICROPY_FLOAT_IMPL = double
AF_FILE = boards/stm32f767_af.csv
LD_FILE = boards/stm32f767.ld
diff --git a/stmhal/boards/STM32F769DISC/mpconfigboard.mk b/stmhal/boards/STM32F769DISC/mpconfigboard.mk
index c25c0b79e..99234e4cf 100644
--- a/stmhal/boards/STM32F769DISC/mpconfigboard.mk
+++ b/stmhal/boards/STM32F769DISC/mpconfigboard.mk
@@ -1,5 +1,5 @@
MCU_SERIES = f7
CMSIS_MCU = STM32F769xx
-FLOAT_IMPL = double
+MICROPY_FLOAT_IMPL = double
AF_FILE = boards/stm32f767_af.csv
LD_FILE = boards/stm32f769.ld