From b2bafa1a8cbae59232966ea90ca75bad6aaa06da Mon Sep 17 00:00:00 2001
From: Jay Blackman <blckmn@users.noreply.github.com>
Date: Sun, 19 Jan 2025 09:22:37 +1100
Subject: [PATCH] FIX: USE_STDPERIPH_DRIVER incorrectly defined for all targets
 (legacy) (#14181)

---
 Makefile                         |  1 -
 src/platform/STM32/mk/STM32F4.mk | 12 ++++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 46c822012e1..8af2116909c 100644
--- a/Makefile
+++ b/Makefile
@@ -299,7 +299,6 @@ CFLAGS     += $(ARCH_FLAGS) \
               $(TEMPORARY_FLAGS) \
               $(DEVICE_FLAGS) \
               -D_GNU_SOURCE \
-              -DUSE_STDPERIPH_DRIVER \
               -D$(TARGET) \
               $(TARGET_FLAGS) \
               -D'__FORKNAME__="$(FORKNAME)"' \
diff --git a/src/platform/STM32/mk/STM32F4.mk b/src/platform/STM32/mk/STM32F4.mk
index 28bf0fecb6a..9d1f4045578 100644
--- a/src/platform/STM32/mk/STM32F4.mk
+++ b/src/platform/STM32/mk/STM32F4.mk
@@ -42,6 +42,8 @@ STDPERIPH_SRC   = \
 VPATH       := $(VPATH):$(STDPERIPH_DIR)/src
 endif
 
+DEVICE_FLAGS = -DSTM32F4
+
 ifneq ($(TARGET_MCU),$(filter $(TARGET_MCU),STM32F411xE STM32F446xx))
 STDPERIPH_SRC += stm32f4xx_fsmc.c
 endif
@@ -141,25 +143,27 @@ INCLUDE_DIRS    := \
             $(CMSIS_DIR)/Core/Include \
             $(LIB_MAIN_DIR)/STM32F4/Drivers/CMSIS/Device/ST/STM32F4xx \
             $(TARGET_PLATFORM_DIR)/vcpf4
+
+DEVICE_FLAGS += -DUSE_STDPERIPH_DRIVER
 endif
 
 #Flags
 ARCH_FLAGS      = -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
 
 ifeq ($(TARGET_MCU),STM32F411xE)
-DEVICE_FLAGS    = -DSTM32F411xE -finline-limit=20
+DEVICE_FLAGS    += -DSTM32F411xE -finline-limit=20
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f411.ld
 STARTUP_SRC     = STM32/startup/startup_stm32f411xe.s
 MCU_FLASH_SIZE  := 512
 
 else ifeq ($(TARGET_MCU),STM32F405xx)
-DEVICE_FLAGS    = -DSTM32F40_41xxx -DSTM32F405xx
+DEVICE_FLAGS    += -DSTM32F40_41xxx -DSTM32F405xx
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f405.ld
 STARTUP_SRC     = STM32/startup/startup_stm32f40xx.s
 MCU_FLASH_SIZE  := 1024
 
 else ifeq ($(TARGET_MCU),STM32F446xx)
-DEVICE_FLAGS    = -DSTM32F446xx
+DEVICE_FLAGS    += -DSTM32F446xx
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f446.ld
 STARTUP_SRC     = STM32/startup/startup_stm32f446xx.s
 MCU_FLASH_SIZE  := 512
@@ -167,7 +171,7 @@ MCU_FLASH_SIZE  := 512
 else
 $(error Unknown MCU for F4 target)
 endif
-DEVICE_FLAGS    += -DHSE_VALUE=$(HSE_VALUE) -DSTM32
+DEVICE_FLAGS    += -DHSE_VALUE=$(HSE_VALUE)
 
 MCU_COMMON_SRC = \
             common/stm32/system.c \