From ece4e21a55609163466d96875c60bb7f1556c468 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 28 Oct 2019 13:48:51 +1100
Subject: [PATCH] stm32/Makefile: Only enable hardware sqrt on parts that
 support it.

Not enough to detect f7/h7, need to use the specific parts.

Follow-up to 580a2656d10cc7c1fc93e094d7eb71f04d99c329.
---
 ports/stm32/Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 30d4d9b48f..fca92f841e 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -64,13 +64,18 @@ INC += -Ilwip_inc
 CFLAGS_CORTEX_M = -mthumb
 
 # Select hardware floating-point support
+SUPPORTS_HARDWARE_FP_SINGLE = 0
+SUPPORTS_HARDWARE_FP_DOUBLE = 0
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32F765xx STM32F767xx STM32F769xx STM32H743xx))
 CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard
+SUPPORTS_HARDWARE_FP_SINGLE = 1
+SUPPORTS_HARDWARE_FP_DOUBLE = 1
 else
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 l0))
 CFLAGS_CORTEX_M += -msoft-float
 else
 CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+SUPPORTS_HARDWARE_FP_SINGLE = 1
 endif
 endif
 
@@ -180,7 +185,7 @@ SRC_LIBM = $(addprefix lib/libm_dbl/,\
 	tgamma.c \
 	trunc.c \
 	)
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f7 h7))
+ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
 SRC_LIBM += lib/libm_dbl/thumb_vfp_sqrt.c
 else
 SRC_LIBM += lib/libm_dbl/sqrt.c
@@ -213,10 +218,10 @@ SRC_LIBM = $(addprefix lib/libm/,\
 	wf_lgamma.c \
 	wf_tgamma.c \
 	)
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 l0))
-SRC_LIBM += lib/libm/ef_sqrt.c
-else
+ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
 SRC_LIBM += lib/libm/thumb_vfp_sqrtf.c
+else
+SRC_LIBM += lib/libm/ef_sqrt.c
 endif
 endif