From 5ef3aec33c457d535ae1cce8ff617d0c1cf52a90 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Wed, 16 Nov 2022 14:45:29 +1100 Subject: [PATCH] stm32/Makefile: Set MPY_CROSS_FLAGS based on MCU type. Previously it was hardcoded to armv7m, which would have failed on M0/M0+. Signed-off-by: Jim Mussared --- ports/stm32/Makefile | 2 +- ports/stm32/stm32.mk | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile index 07d366bfea..418562f7cb 100644 --- a/ports/stm32/Makefile +++ b/ports/stm32/Makefile @@ -164,7 +164,7 @@ LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))" endif # Options for mpy-cross -MPY_CROSS_FLAGS += -march=armv7m +MPY_CROSS_FLAGS += -march=$(MPY_CROSS_MCU_ARCH_$(MCU_SERIES)) SHARED_SRC_C += $(addprefix shared/,\ libc/string0.c \ diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk index b4f73a67f3..ae267a5995 100644 --- a/ports/stm32/stm32.mk +++ b/ports/stm32/stm32.mk @@ -69,3 +69,15 @@ CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7 CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 CFLAGS_MCU_wl = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 + +MPY_CROSS_MCU_ARCH_f0 = armv6m +MPY_CROSS_MCU_ARCH_f4 = armv7m +MPY_CROSS_MCU_ARCH_f7 = armv7m +MPY_CROSS_MCU_ARCH_g0 = armv6m +MPY_CROSS_MCU_ARCH_g4 = armv7m +MPY_CROSS_MCU_ARCH_l0 = armv6m +MPY_CROSS_MCU_ARCH_l1 = armv7m +MPY_CROSS_MCU_ARCH_l4 = armv7m +MPY_CROSS_MCU_ARCH_h7 = armv7m +MPY_CROSS_MCU_ARCH_wb = armv7m +MPY_CROSS_MCU_ARCH_wl = armv7m