From cfaa9a4997b0d57357631a82d1e33205d26972d4 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 9 Jun 2023 16:30:08 +0200
Subject: [PATCH] samd/Makefile: Move the math lib files from mpconfigmcu.mk to
 Makefile.

They are used by both SAMD21 and SAMD51.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/Makefile                  | 23 ++++++++++++++++++++++
 ports/samd/mcu/samd21/mpconfigmcu.mk | 29 ----------------------------
 ports/samd/mcu/samd51/mpconfigmcu.mk | 29 ----------------------------
 3 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 360cf0dd4c..e966fe2146 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -139,10 +139,33 @@ ASF4_SRC_C += $(addprefix lib/asf4/$(MCU_SERIES_LOWER)/,\
 	)
 
 LIBM_SRC_C += $(addprefix lib/libm/,\
+	acoshf.c \
+	asinfacosf.c \
+	asinhf.c \
+	atan2f.c \
+	atanf.c \
+	atanhf.c \
+	ef_rem_pio2.c \
 	ef_sqrt.c \
+	erf_lgamma.c \
 	fmodf.c \
+	kf_cos.c \
+	kf_rem_pio2.c \
+	kf_sin.c \
+	kf_tan.c \
+	log1pf.c \
 	math.c \
 	nearbyintf.c \
+	roundf.c \
+	sf_cos.c \
+	sf_erf.c \
+	sf_frexp.c \
+	sf_ldexp.c \
+	sf_modf.c \
+	sf_sin.c \
+	sf_tan.c \
+	wf_lgamma.c \
+	wf_tgamma.c \
 	)
 
 TINYUSB_SRC_C += $(addprefix lib/tinyusb/src/,\
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.mk b/ports/samd/mcu/samd21/mpconfigmcu.mk
index cce8f0e04e..35f442d869 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd21/mpconfigmcu.mk
@@ -7,32 +7,3 @@ MICROPY_HW_CODESIZE ?= 184K
 MICROPY_VFS_LFS1 ?= 1
 
 SRC_S += shared/runtime/gchelper_thumb1.s
-
-LIBM_SRC_C +=  $(addprefix lib/libm/,\
-	acoshf.c \
-	asinfacosf.c \
-	asinhf.c \
-	atan2f.c \
-	atanf.c \
-	atanhf.c \
-	ef_rem_pio2.c \
-	erf_lgamma.c \
-	fmodf.c \
-	kf_cos.c \
-	kf_rem_pio2.c \
-	kf_sin.c \
-	kf_tan.c \
-	log1pf.c \
-	math.c \
-	nearbyintf.c \
-	roundf.c \
-	sf_cos.c \
-	sf_erf.c \
-	sf_frexp.c \
-	sf_ldexp.c \
-	sf_modf.c \
-	sf_sin.c \
-	sf_tan.c \
-	wf_lgamma.c \
-	wf_tgamma.c \
-	)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index 433404fd11..0e662a1705 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -13,32 +13,3 @@ SRC_S += shared/runtime/gchelper_thumb2.s
 SRC_C += \
 	fatfs_port.c \
 	drivers/dht/dht.c \
-
-LIBM_SRC_C +=  $(addprefix lib/libm/,\
-	acoshf.c \
-	asinfacosf.c \
-	asinhf.c \
-	atan2f.c \
-	atanf.c \
-	atanhf.c \
-	ef_rem_pio2.c \
-	erf_lgamma.c \
-	fmodf.c \
-	kf_cos.c \
-	kf_rem_pio2.c \
-	kf_sin.c \
-	kf_tan.c \
-	log1pf.c \
-	math.c \
-	nearbyintf.c \
-	roundf.c \
-	sf_cos.c \
-	sf_erf.c \
-	sf_frexp.c \
-	sf_ldexp.c \
-	sf_modf.c \
-	sf_sin.c \
-	sf_tan.c \
-	wf_lgamma.c \
-	wf_tgamma.c \
-	)