1 files changed, 19 insertions, 16 deletions
diff --git a/os/hal/ports/STM32/STM32F4xx/platform.mk b/os/hal/ports/STM32/STM32F4xx/platform.mk
index 3b6566efe..336991b75 100644
--- a/os/hal/ports/STM32/STM32F4xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F4xx/platform.mk
@@ -9,28 +9,25 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
 ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/adc_lld.c
 endif
-ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/ext_lld_isr.c \
-               $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c
-endif
 ifneq ($(findstring HAL_USE_CAN TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/can_lld.c
-endif
-ifneq ($(findstring HAL_USE_MAC TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/mac_lld.c
-endif
-ifneq ($(findstring HAL_USE_SDC TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/sdc_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/CANV1/can_lld.c
 endif
 ifneq ($(findstring HAL_USE_DAC TRUE,$(HALCONF)),)
 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c
 endif
+ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/EXTIv1/ext_lld.c \
+               $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/ext_lld_isr.c
+endif
 ifneq ($(findstring HAL_USE_PAL TRUE,$(HALCONF)),)
 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c
 endif
 ifneq ($(findstring HAL_USE_I2C TRUE,$(HALCONF)),)
 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c
 endif
+ifneq ($(findstring HAL_USE_MAC TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/MACv1/mac_lld.c
+endif
 ifneq ($(findstring HAL_USE_USB TRUE,$(HALCONF)),)
 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c
 endif
@@ -40,6 +37,9 @@ endif
 ifneq ($(findstring HAL_USE_I2S TRUE,$(HALCONF)),)
 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/i2s_lld.c
 endif
+ifneq ($(findstring HAL_USE_SDC TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/SDIOv1/sdc_lld.c
+endif
 ifneq ($(findstring HAL_USE_SPI TRUE,$(HALCONF)),)
 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c
 endif
@@ -64,15 +64,15 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
                $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/hal_lld.c \
                $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/adc_lld.c \
                $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/ext_lld_isr.c \
-               $(CHIBIOS)/os/hal/ports/STM32/LLD/can_lld.c \
-               $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c \
-               $(CHIBIOS)/os/hal/ports/STM32/LLD/mac_lld.c \
-               $(CHIBIOS)/os/hal/ports/STM32/LLD/sdc_lld.c \
+               $(CHIBIOS)/os/hal/ports/STM32/LLD/CANv1/can_lld.c \
+               $(CHIBIOS)/os/hal/ports/STM32/LLD/EXTIv1/ext_lld.c \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c \
+               $(CHIBIOS)/os/hal/ports/STM32/LLD/MACv1/mac_lld.c \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2/rtc_lld.c \
+               $(CHIBIOS)/os/hal/ports/STM32/LLD/SDIOv1/sdc_lld.c \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/i2s_lld.c \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.c \
@@ -86,12 +86,15 @@ endif
 # Required include directories
 PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
                $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx \
-               $(CHIBIOS)/os/hal/ports/STM32/LLD \
+               $(CHIBIOS)/os/hal/ports/STM32/LLD/CANv1 \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1 \
+               $(CHIBIOS)/os/hal/ports/STM32/LLD/EXTIv1 \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2 \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1 \
+               $(CHIBIOS)/os/hal/ports/STM32/LLD/MACv1 \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/OTGv1 \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2 \
+               $(CHIBIOS)/os/hal/ports/STM32/LLD/SDIOv1 \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1 \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1 \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv1 \