CLEANUP: MCU file locations (#13692)

Makefile

@@ -61,8 +61,8 @@ OBJECT_DIR      := $(ROOT)/obj/main
 BIN_DIR         := $(ROOT)/obj
 CMSIS_DIR       := $(ROOT)/lib/main/CMSIS
 INCLUDE_DIRS    := $(SRC_DIR) \
-                   $(ROOT)/src/main/target \
-                   $(ROOT)/src/main/startup
+                   $(ROOT)/src/main/target
+
 LINKER_DIR      := $(ROOT)/src/link
 MAKE_SCRIPT_DIR := $(ROOT)/mk
 

mk/mcu/AT32F4.mk

@@ -2,7 +2,7 @@
 # AT32F4 Make file include
 #
 
-CMSIS_DIR         := $(ROOT)/lib/main/AT32F43x/cmsis
+CMSIS_DIR      := $(ROOT)/lib/main/AT32F43x/cmsis
 STDPERIPH_DIR   = $(ROOT)/lib/main/AT32F43x/drivers
 MIDDLEWARES_DIR = $(ROOT)/lib/main/AT32F43x/middlewares
 STDPERIPH_SRC   = $(wildcard $(STDPERIPH_DIR)/src/*.c) \
@@ -14,14 +14,15 @@ EXCLUDES        = at32f435_437_dvp.c \
                   at32f435_437_xmc.c \
                   at32f435_437_emac
 
-
 STARTUP_SRC     = at32/startup_at32f435_437.s
 STDPERIPH_SRC   := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
 
 VPATH           := $(VPATH):$(ROOT)/lib/main/AT32F43x/cmsis/cm4/core_support:$(STDPERIPH_DIR)/src:$(STDPERIPH_DIR)/inc:$(SRC_DIR)/startup/at32
 
-VCP_SRC =          $(wildcard $(ROOT)/lib/main/AT32F43x/middlewares/usbd_class/cdc/*.c) \
-                   drivers/usb_io.c
+VCP_SRC =  \
+            $(ROOT)/lib/main/AT32F43x/middlewares/usbd_class/cdc/cdc_class.c \
+            $(ROOT)/lib/main/AT32F43x/middlewares/usbd_class/cdc/cdc_desc.c \
+            drivers/usb_io.c
 
 VCP_INCLUDES =     $(ROOT)/lib/main/AT32F43x/middlewares/usb_drivers/inc \
                    $(ROOT)/lib/main/AT32F43x/middlewares/usbd_class/cdc
@@ -31,7 +32,7 @@ DEVICE_STDPERIPH_SRC = $(STDPERIPH_SRC)
 INCLUDE_DIRS    := $(INCLUDE_DIRS) \
                    $(SRC_DIR)/startup/at32 \
                    $(SRC_DIR)/drivers \
-                   $(SRC_DIR)/drivers/at32 \
+                   $(SRC_DIR)/drivers/mcu/at32 \
                    $(STDPERIPH_DIR)/inc \
                    $(CMSIS_DIR)/cm4/core_support \
                    $(CMSIS_DIR)/cm4 \
@@ -49,18 +50,42 @@ ARCH_FLAGS      = -std=c99  -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfloat-abi=
 DEVICE_FLAGS   += -DUSE_ATBSP_DRIVER -DAT32F43x -DHSE_VALUE=$(HSE_VALUE) -DAT32 -DUSE_OTG_HOST_MODE
 
 MCU_COMMON_SRC = \
-    $(addprefix startup/at32/,$(notdir $(wildcard $(SRC_DIR)/startup/at32/*.c))) \
-    $(addprefix drivers/at32/,$(notdir $(wildcard $(SRC_DIR)/drivers/at32/*.c))) \
-    drivers/accgyro/accgyro_mpu.c \
-    drivers/dshot_bitbang_decode.c \
-    drivers/inverter.c \
-    drivers/pwm_output_dshot_shared.c \
-    $(MIDDLEWARES_DIR)/i2c_application_library/i2c_application.c \
-    drivers/bus_i2c_timing.c \
-    drivers/usb_msc_common.c \
-    msc/usbd_storage.c \
-    msc/usbd_storage_emfat.c \
-    msc/emfat.c \
-    msc/emfat_file.c
+            startup/at32/at32f435_437_clock.c \
+            startup/at32/system_at32f435_437.c \
+            drivers/mcu/at32/adc_at32f43x.c \
+            drivers/mcu/at32/bus_i2c_atbsp.c \
+            drivers/mcu/at32/bus_i2c_atbsp_init.c \
+            drivers/mcu/at32/bus_spi_at32bsp.c \
+            drivers/mcu/at32/camera_control.c \
+            drivers/mcu/at32/debug.c \
+            drivers/mcu/at32/dma_at32f43x.c \
+            drivers/mcu/at32/dma_reqmap_mcu.c \
+            drivers/mcu/at32/dshot_bitbang.c \
+            drivers/mcu/at32/dshot_bitbang_stdperiph.c \
+            drivers/mcu/at32/exti_at32.c \
+            drivers/mcu/at32/io_at32.c \
+            drivers/mcu/at32/light_ws2811strip_at32f43x.c \
+            drivers/mcu/at32/persistent_at32bsp.c \
+            drivers/mcu/at32/pwm_output_at32bsp.c \
+            drivers/mcu/at32/pwm_output_dshot.c \
+            drivers/mcu/at32/rcc_at32.c \
+            drivers/mcu/at32/serial_uart_at32bsp.c \
+            drivers/mcu/at32/serial_uart_at32f43x.c \
+            drivers/mcu/at32/serial_usb_vcp_at32f4.c \
+            drivers/mcu/at32/system_at32f43x.c \
+            drivers/mcu/at32/timer_at32bsp.c \
+            drivers/mcu/at32/timer_at32f43x.c \
+            drivers/mcu/at32/usb_msc_at32f43x.c \
+            drivers/accgyro/accgyro_mpu.c \
+            drivers/dshot_bitbang_decode.c \
+            drivers/inverter.c \
+            drivers/pwm_output_dshot_shared.c \
+            $(MIDDLEWARES_DIR)/i2c_application_library/i2c_application.c \
+            drivers/bus_i2c_timing.c \
+            drivers/usb_msc_common.c \
+            msc/usbd_storage.c \
+            msc/usbd_storage_emfat.c \
+            msc/emfat.c \
+            msc/emfat_file.c
 
 MCU_EXCLUDES =

mk/mcu/STM32F4.mk

@@ -14,36 +14,38 @@ VPATH       := $(VPATH):$(STDPERIPH_DIR)/Src
 else
 CMSIS_DIR      := $(ROOT)/lib/main/CMSIS
 STDPERIPH_DIR   = $(ROOT)/lib/main/STM32F4/Drivers/STM32F4xx_StdPeriph_Driver
-STDPERIPH_SRC   = $(notdir $(wildcard $(STDPERIPH_DIR)/src/*.c))
-EXCLUDES        = stm32f4xx_crc.c \
-                  stm32f4xx_can.c \
-                  stm32f4xx_fmc.c \
-                  stm32f4xx_sai.c \
-                  stm32f4xx_cec.c \
-                  stm32f4xx_dsi.c \
-                  stm32f4xx_flash_ramfunc.c \
-                  stm32f4xx_fmpi2c.c \
-                  stm32f4xx_lptim.c \
-                  stm32f4xx_qspi.c \
-                  stm32f4xx_spdifrx.c \
-                  stm32f4xx_cryp.c \
-                  stm32f4xx_cryp_aes.c \
-                  stm32f4xx_hash_md5.c \
-                  stm32f4xx_cryp_des.c \
-                  stm32f4xx_hash.c \
-                  stm32f4xx_dbgmcu.c \
-                  stm32f4xx_cryp_tdes.c \
-                  stm32f4xx_hash_sha1.c
+STDPERIPH_SRC   = \
+            misc.c \
+            stm32f4xx_adc.c \
+            stm32f4xx_dac.c \
+            stm32f4xx_dcmi.c \
+            stm32f4xx_dfsdm.c \
+            stm32f4xx_dma2d.c \
+            stm32f4xx_dma.c \
+            stm32f4xx_exti.c \
+            stm32f4xx_flash.c \
+            stm32f4xx_gpio.c \
+            stm32f4xx_i2c.c \
+            stm32f4xx_iwdg.c \
+            stm32f4xx_ltdc.c \
+            stm32f4xx_pwr.c \
+            stm32f4xx_rcc.c \
+            stm32f4xx_rng.c \
+            stm32f4xx_rtc.c \
+            stm32f4xx_sdio.c \
+            stm32f4xx_spi.c \
+            stm32f4xx_syscfg.c \
+            stm32f4xx_tim.c \
+            stm32f4xx_usart.c \
+            stm32f4xx_wwdg.c
 
 VPATH       := $(VPATH):$(STDPERIPH_DIR)/src
 endif
 
-ifeq ($(TARGET_MCU),$(filter $(TARGET_MCU),STM32F411xE STM32F446xx))
-EXCLUDES        += stm32f4xx_fsmc.c
+ifneq ($(TARGET_MCU),$(filter $(TARGET_MCU),STM32F411xE STM32F446xx))
+STDPERIPH_SRC += stm32f4xx_fsmc.c
 endif
 
-STDPERIPH_SRC   := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
-
 ifeq ($(PERIPH_DRIVER), HAL)
 #USB
 USBCORE_DIR = $(ROOT)/lib/main/STM32F4/Middlewares/ST/STM32_USB_Device_Library/Core
@@ -100,7 +102,8 @@ endif
 VPATH           := $(VPATH):$(CMSIS_DIR)/Core/Include:$(ROOT)/lib/main/STM32F4/Drivers/CMSIS/Device/ST/STM32F4xx
 
 INCLUDE_DIRS    := $(INCLUDE_DIRS) \
-                   $(ROOT)/src/main/drivers/stm32
+                   $(SRC_DIR)/startup/stm32 \
+                   $(SRC_DIR)/drivers/mcu/stm32
 
 ifeq ($(PERIPH_DRIVER), HAL)
 CMSIS_SRC       :=
@@ -110,7 +113,7 @@ INCLUDE_DIRS    := $(INCLUDE_DIRS) \
                    $(USBCDC_DIR)/Inc \
                    $(CMSIS_DIR)/Include \
                    $(CMSIS_DIR)/Device/ST/STM32F4xx/Include \
-                   $(ROOT)/src/main/drivers/stm32/vcp_hal
+                   $(SRC_DIR)/drivers/mcu/stm32/vcp_hal
 else
 CMSIS_SRC       := $(notdir $(wildcard $(CMSIS_DIR)/CoreSupport/*.c \
                    $(ROOT)/lib/main/STM32F4/Drivers/CMSIS/Device/ST/STM32F4xx/*.c))
@@ -124,7 +127,7 @@ INCLUDE_DIRS    := $(INCLUDE_DIRS) \
                    $(USBMSC_DIR)/inc \
                    $(CMSIS_DIR)/Core/Include \
                    $(ROOT)/lib/main/STM32F4/Drivers/CMSIS/Device/ST/STM32F4xx \
-                   $(ROOT)/src/main/drivers/stm32/vcpf4
+                   $(SRC_DIR)/drivers/mcu/stm32/vcpf4
 endif
 
 #Flags
@@ -133,19 +136,19 @@ ARCH_FLAGS      = -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfloat-abi=hard -mfpu
 ifeq ($(TARGET_MCU),STM32F411xE)
 DEVICE_FLAGS    = -DSTM32F411xE -finline-limit=20
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f411.ld
-STARTUP_SRC     = startup_stm32f411xe.s
+STARTUP_SRC     = stm32/startup_stm32f411xe.s
 MCU_FLASH_SIZE  := 512
 
 else ifeq ($(TARGET_MCU),STM32F405xx)
 DEVICE_FLAGS    = -DSTM32F40_41xxx -DSTM32F405xx
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f405.ld
-STARTUP_SRC     = startup_stm32f40xx.s
+STARTUP_SRC     = stm32/startup_stm32f40xx.s
 MCU_FLASH_SIZE  := 1024
 
 else ifeq ($(TARGET_MCU),STM32F446xx)
 DEVICE_FLAGS    = -DSTM32F446xx
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f446.ld
-STARTUP_SRC     = startup_stm32f446xx.s
+STARTUP_SRC     = stm32/startup_stm32f446xx.s
 MCU_FLASH_SIZE  := 512
 
 else
@@ -158,54 +161,54 @@ MCU_COMMON_SRC = \
             drivers/dshot_bitbang_decode.c \
             drivers/inverter.c \
             drivers/pwm_output_dshot_shared.c \
-            drivers/stm32/pwm_output_dshot.c \
-            drivers/stm32/adc_stm32f4xx.c \
-            drivers/stm32/bus_i2c_stm32f4xx.c \
-            drivers/stm32/bus_spi_stdperiph.c \
-            drivers/stm32/debug.c \
-            drivers/stm32/dma_reqmap_mcu.c \
-            drivers/stm32/dma_stm32f4xx.c \
-            drivers/stm32/dshot_bitbang.c \
-            drivers/stm32/dshot_bitbang_stdperiph.c \
-            drivers/stm32/exti.c \
-            drivers/stm32/io_stm32.c \
-            drivers/stm32/light_ws2811strip_stdperiph.c \
-            drivers/stm32/persistent.c \
-            drivers/stm32/pwm_output.c \
-            drivers/stm32/rcc_stm32.c \
-            drivers/stm32/sdio_f4xx.c \
-            drivers/stm32/serial_uart_stdperiph.c \
-            drivers/stm32/serial_uart_stm32f4xx.c \
-            drivers/stm32/system_stm32f4xx.c \
-            drivers/stm32/timer_stdperiph.c \
-            drivers/stm32/timer_stm32f4xx.c \
-            drivers/stm32/transponder_ir_io_stdperiph.c \
-            drivers/stm32/usbd_msc_desc.c \
-            drivers/stm32/camera_control.c \
-            startup/system_stm32f4xx.c
+            drivers/mcu/stm32/pwm_output_dshot.c \
+            drivers/mcu/stm32/adc_stm32f4xx.c \
+            drivers/mcu/stm32/bus_i2c_stm32f4xx.c \
+            drivers/mcu/stm32/bus_spi_stdperiph.c \
+            drivers/mcu/stm32/debug.c \
+            drivers/mcu/stm32/dma_reqmap_mcu.c \
+            drivers/mcu/stm32/dma_stm32f4xx.c \
+            drivers/mcu/stm32/dshot_bitbang.c \
+            drivers/mcu/stm32/dshot_bitbang_stdperiph.c \
+            drivers/mcu/stm32/exti.c \
+            drivers/mcu/stm32/io_stm32.c \
+            drivers/mcu/stm32/light_ws2811strip_stdperiph.c \
+            drivers/mcu/stm32/persistent.c \
+            drivers/mcu/stm32/pwm_output.c \
+            drivers/mcu/stm32/rcc_stm32.c \
+            drivers/mcu/stm32/sdio_f4xx.c \
+            drivers/mcu/stm32/serial_uart_stdperiph.c \
+            drivers/mcu/stm32/serial_uart_stm32f4xx.c \
+            drivers/mcu/stm32/system_stm32f4xx.c \
+            drivers/mcu/stm32/timer_stdperiph.c \
+            drivers/mcu/stm32/timer_stm32f4xx.c \
+            drivers/mcu/stm32/transponder_ir_io_stdperiph.c \
+            drivers/mcu/stm32/usbd_msc_desc.c \
+            drivers/mcu/stm32/camera_control.c \
+            startup/stm32/system_stm32f4xx.c
 
 ifeq ($(PERIPH_DRIVER), HAL)
 VCP_SRC = \
-            drivers/stm32/vcp_hal/usbd_desc.c \
-            drivers/stm32/vcp_hal/usbd_conf.c \
-            drivers/stm32/vcp_hal/usbd_cdc_interface.c \
-            drivers/stm32/serial_usb_vcp.c \
+            drivers/mcu/stm32/vcp_hal/usbd_desc.c \
+            drivers/mcu/stm32/vcp_hal/usbd_conf.c \
+            drivers/mcu/stm32/vcp_hal/usbd_cdc_interface.c \
+            drivers/mcu/stm32/serial_usb_vcp.c \
             drivers/usb_io.c
 else
 VCP_SRC = \
-            drivers/stm32/vcpf4/stm32f4xx_it.c \
-            drivers/stm32/vcpf4/usb_bsp.c \
-            drivers/stm32/vcpf4/usbd_desc.c \
-            drivers/stm32/vcpf4/usbd_usr.c \
-            drivers/stm32/vcpf4/usbd_cdc_vcp.c \
-            drivers/stm32/vcpf4/usb_cdc_hid.c \
-            drivers/stm32/serial_usb_vcp.c \
+            drivers/mcu/stm32/vcpf4/stm32f4xx_it.c \
+            drivers/mcu/stm32/vcpf4/usb_bsp.c \
+            drivers/mcu/stm32/vcpf4/usbd_desc.c \
+            drivers/mcu/stm32/vcpf4/usbd_usr.c \
+            drivers/mcu/stm32/vcpf4/usbd_cdc_vcp.c \
+            drivers/mcu/stm32/vcpf4/usb_cdc_hid.c \
+            drivers/mcu/stm32/serial_usb_vcp.c \
             drivers/usb_io.c
 endif
 
 MSC_SRC = \
             drivers/usb_msc_common.c \
-            drivers/stm32/usb_msc_f4xx.c \
+            drivers/mcu/stm32/usb_msc_f4xx.c \
             msc/usbd_storage.c \
             msc/usbd_storage_emfat.c \
             msc/emfat.c \

mk/mcu/STM32F7.mk

@@ -11,82 +11,65 @@ CMSIS_DIR      := $(ROOT)/lib/main/CMSIS
 
 #STDPERIPH
 STDPERIPH_DIR   = $(ROOT)/lib/main/STM32F7/Drivers/STM32F7xx_HAL_Driver
-STDPERIPH_SRC   = $(notdir $(wildcard $(STDPERIPH_DIR)/Src/*.c))
-EXCLUDES        = stm32f7xx_hal_can.c \
-                  stm32f7xx_hal_cec.c \
-                  stm32f7xx_hal_crc.c \
-                  stm32f7xx_hal_crc_ex.c \
-                  stm32f7xx_hal_cryp.c \
-                  stm32f7xx_hal_cryp_ex.c \
-                  stm32f7xx_hal_dcmi.c \
-                  stm32f7xx_hal_dcmi_ex.c \
-                  stm32f7xx_hal_dfsdm.c \
-                  stm32f7xx_hal_dma2d.c \
-                  stm32f7xx_hal_dsi.c \
-                  stm32f7xx_hal_eth.c \
-                  stm32f7xx_hal_hash.c \
-                  stm32f7xx_hal_hash_ex.c \
-                  stm32f7xx_hal_hcd.c \
-                  stm32f7xx_hal_i2s.c \
-                  stm32f7xx_hal_irda.c \
-                  stm32f7xx_hal_iwdg.c \
-                  stm32f7xx_hal_jpeg.c \
-                  stm32f7xx_hal_lptim.c \
-                  stm32f7xx_hal_ltdc.c \
-                  stm32f7xx_hal_ltdc_ex.c \
-                  stm32f7xx_hal_mdios.c \
-                  stm32f7xx_hal_mmc.c \
-                  stm32f7xx_hal_msp_template.c \
-                  stm32f7xx_hal_nand.c \
-                  stm32f7xx_hal_nor.c \
-                  stm32f7xx_hal_qspi.c \
-                  stm32f7xx_hal_rng.c \
-                  stm32f7xx_hal_sai.c \
-                  stm32f7xx_hal_sai_ex.c \
-                  stm32f7xx_hal_sd.c \
-                  stm32f7xx_hal_sdram.c \
-                  stm32f7xx_hal_smartcard.c \
-                  stm32f7xx_hal_smartcard_ex.c \
-                  stm32f7xx_hal_smbus.c \
-                  stm32f7xx_hal_spdifrx.c \
-                  stm32f7xx_hal_sram.c \
-                  stm32f7xx_hal_timebase_rtc_alarm_template.c \
-                  stm32f7xx_hal_timebase_rtc_wakeup_template.c \
-                  stm32f7xx_hal_timebase_tim_template.c \
-                  stm32f7xx_hal_wwdg.c \
-                  stm32f7xx_ll_adc.c \
-                  stm32f7xx_ll_crc.c \
-                  stm32f7xx_ll_dac.c \
-                  stm32f7xx_ll_exti.c \
-                  stm32f7xx_ll_fmc.c \
-                  stm32f7xx_ll_i2c.c \
-                  stm32f7xx_ll_lptim.c \
-                  stm32f7xx_ll_pwr.c \
-                  stm32f7xx_ll_rng.c \
-                  stm32f7xx_ll_rtc.c \
-                  stm32f7xx_ll_sdmmc.c \
-                  stm32f7xx_ll_usart.c
-
-STDPERIPH_SRC   := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
+STDPERIPH_SRC   = \
+            stm32f7xx_hal_adc.c \
+            stm32f7xx_hal_adc_ex.c \
+            stm32f7xx_hal.c \
+            stm32f7xx_hal_cortex.c \
+            stm32f7xx_hal_dac.c \
+            stm32f7xx_hal_dac_ex.c \
+            stm32f7xx_hal_dma.c \
+            stm32f7xx_hal_dma_ex.c \
+            stm32f7xx_hal_exti.c \
+            stm32f7xx_hal_flash.c \
+            stm32f7xx_hal_flash_ex.c \
+            stm32f7xx_hal_gpio.c \
+            stm32f7xx_hal_i2c.c \
+            stm32f7xx_hal_i2c_ex.c \
+            stm32f7xx_hal_pcd.c \
+            stm32f7xx_hal_pcd_ex.c \
+            stm32f7xx_hal_pwr.c \
+            stm32f7xx_hal_pwr_ex.c \
+            stm32f7xx_hal_rcc.c \
+            stm32f7xx_hal_rcc_ex.c \
+            stm32f7xx_hal_rtc.c \
+            stm32f7xx_hal_rtc_ex.c \
+            stm32f7xx_hal_spi.c \
+            stm32f7xx_hal_spi_ex.c \
+            stm32f7xx_hal_tim.c \
+            stm32f7xx_hal_tim_ex.c \
+            stm32f7xx_hal_uart.c \
+            stm32f7xx_hal_uart_ex.c \
+            stm32f7xx_hal_usart.c \
+            stm32f7xx_ll_dma2d.c \
+            stm32f7xx_ll_dma.c \
+            stm32f7xx_ll_gpio.c \
+            stm32f7xx_ll_rcc.c \
+            stm32f7xx_ll_spi.c \
+            stm32f7xx_ll_tim.c \
+            stm32f7xx_ll_usb.c \
+            stm32f7xx_ll_utils.c
 
 #USB
 USBCORE_DIR = $(ROOT)/lib/main/STM32F7/Middlewares/ST/STM32_USB_Device_Library/Core
-USBCORE_SRC = $(notdir $(wildcard $(USBCORE_DIR)/Src/*.c))
-EXCLUDES    = usbd_conf_template.c
-USBCORE_SRC := $(filter-out ${EXCLUDES}, $(USBCORE_SRC))
+USBCORE_SRC = \
+            usbd_core.c \
+            usbd_ctlreq.c \
+            usbd_ioreq.c
 
 USBCDC_DIR = $(ROOT)/lib/main/STM32F7/Middlewares/ST/STM32_USB_Device_Library/Class/CDC
-USBCDC_SRC = $(notdir $(wildcard $(USBCDC_DIR)/Src/*.c))
-EXCLUDES   = usbd_cdc_if_template.c
-USBCDC_SRC := $(filter-out ${EXCLUDES}, $(USBCDC_SRC))
+USBCDC_SRC = usbd_cdc.c
+
 
 USBHID_DIR = $(ROOT)/lib/main/STM32F7/Middlewares/ST/STM32_USB_Device_Library/Class/HID
-USBHID_SRC = $(notdir $(wildcard $(USBHID_DIR)/Src/*.c))
+USBHID_SRC = usbd_hid.c
 
 USBMSC_DIR = $(ROOT)/lib/main/STM32F7/Middlewares/ST/STM32_USB_Device_Library/Class/MSC
-USBMSC_SRC = $(notdir $(wildcard $(USBMSC_DIR)/Src/*.c))
-EXCLUDES   = usbd_msc_storage_template.c
-USBMSC_SRC := $(filter-out ${EXCLUDES}, $(USBMSC_SRC))
+USBMSC_SRC = \
+            usbd_msc_bot.c \
+            usbd_msc.c \
+            usbd_msc_data.c \
+            usbd_msc_scsi.c
 
 VPATH := $(VPATH):$(USBCDC_DIR)/Src:$(USBCORE_DIR)/Src:$(USBHID_DIR)/Src:$(USBMSC_DIR)/Src:$(STDPERIPH_DIR)/src
 
@@ -102,6 +85,7 @@ VPATH           := $(VPATH):$(STDPERIPH_DIR)/Src
 
 CMSIS_SRC       :=
 INCLUDE_DIRS    := $(INCLUDE_DIRS) \
+                   $(SRC_DIR)/startup/stm32 \
                    $(STDPERIPH_DIR)/Inc \
                    $(USBCORE_DIR)/Inc \
                    $(USBCDC_DIR)/Inc \
@@ -109,8 +93,8 @@ INCLUDE_DIRS    := $(INCLUDE_DIRS) \
                    $(USBMSC_DIR)/Inc \
                    $(CMSIS_DIR)/Core/Include \
                    $(ROOT)/lib/main/STM32F7/Drivers/CMSIS/Device/ST/STM32F7xx/Include \
-                   $(ROOT)/src/main/drivers/stm32 \
-                   $(ROOT)/src/main/drivers/stm32/vcp_hal
+                   $(SRC_DIR)/drivers/mcu/stm32 \
+                   $(SRC_DIR)/drivers/mcu/stm32/vcp_hal
 
 #Flags
 ARCH_FLAGS      = -mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -fsingle-precision-constant
@@ -121,24 +105,24 @@ DEVICE_FLAGS    = -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER
 ifeq ($(TARGET_MCU),STM32F765xx)
 DEVICE_FLAGS   += -DSTM32F765xx
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f765.ld
-STARTUP_SRC     = startup_stm32f765xx.s
+STARTUP_SRC     = stm32/startup_stm32f765xx.s
 MCU_FLASH_SIZE	:= 2048
 else ifeq ($(TARGET_MCU),STM32F745xx)
 DEVICE_FLAGS   += -DSTM32F745xx
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f74x.ld
-STARTUP_SRC     = startup_stm32f745xx.s
+STARTUP_SRC     = stm32/startup_stm32f745xx.s
 MCU_FLASH_SIZE  := 1024
 else ifeq ($(TARGET_MCU),STM32F746xx)
 DEVICE_FLAGS   += -DSTM32F746xx
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f74x.ld
-STARTUP_SRC     = startup_stm32f746xx.s
+STARTUP_SRC     = stm32/startup_stm32f746xx.s
 MCU_FLASH_SIZE  := 1024
 else ifeq ($(TARGET_MCU),STM32F722xx)
 DEVICE_FLAGS   += -DSTM32F722xx
 ifndef LD_SCRIPT
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f722.ld
 endif
-STARTUP_SRC     = startup_stm32f722xx.s
+STARTUP_SRC     = stm32/startup_stm32f722xx.s
 MCU_FLASH_SIZE  := 512
 # Override the OPTIMISE_SPEED compiler setting to save flash space on these 512KB targets.
 # Performance is only slightly affected but around 50 kB of flash are saved.
@@ -149,11 +133,11 @@ endif
 DEVICE_FLAGS    += -DHSE_VALUE=$(HSE_VALUE) -DSTM32
 
 VCP_SRC = \
-            drivers/stm32/vcp_hal/usbd_desc.c \
-            drivers/stm32/vcp_hal/usbd_conf_stm32f7xx.c \
-            drivers/stm32/vcp_hal/usbd_cdc_hid.c \
-            drivers/stm32/vcp_hal/usbd_cdc_interface.c \
-            drivers/stm32/serial_usb_vcp.c \
+            drivers/mcu/stm32/vcp_hal/usbd_desc.c \
+            drivers/mcu/stm32/vcp_hal/usbd_conf_stm32f7xx.c \
+            drivers/mcu/stm32/vcp_hal/usbd_cdc_hid.c \
+            drivers/mcu/stm32/vcp_hal/usbd_cdc_interface.c \
+            drivers/mcu/stm32/serial_usb_vcp.c \
             drivers/usb_io.c
 
 MCU_COMMON_SRC = \
@@ -161,39 +145,39 @@ MCU_COMMON_SRC = \
             drivers/bus_i2c_timing.c \
             drivers/dshot_bitbang_decode.c \
             drivers/pwm_output_dshot_shared.c \
-            drivers/stm32/adc_stm32f7xx.c \
-            drivers/stm32/audio_stm32f7xx.c \
-            drivers/stm32/bus_i2c_hal_init.c \
-            drivers/stm32/bus_i2c_hal.c \
-            drivers/stm32/bus_spi_ll.c \
-            drivers/stm32/debug.c \
-            drivers/stm32/dma_reqmap_mcu.c \
-            drivers/stm32/dma_stm32f7xx.c \
-            drivers/stm32/dshot_bitbang_ll.c \
-            drivers/stm32/dshot_bitbang.c \
-            drivers/stm32/exti.c \
-            drivers/stm32/io_stm32.c \
-            drivers/stm32/light_ws2811strip_hal.c \
-            drivers/stm32/persistent.c \
-            drivers/stm32/pwm_output.c \
-            drivers/stm32/pwm_output_dshot_hal.c \
-            drivers/stm32/rcc_stm32.c \
-            drivers/stm32/sdio_f7xx.c \
-            drivers/stm32/serial_uart_hal.c \
-            drivers/stm32/serial_uart_stm32f7xx.c \
-            drivers/stm32/system_stm32f7xx.c \
-            drivers/stm32/timer_hal.c \
-            drivers/stm32/timer_stm32f7xx.c \
-            drivers/stm32/transponder_ir_io_hal.c \
-            drivers/stm32/camera_control.c \
-            startup/system_stm32f7xx.c
+            drivers/mcu/stm32/adc_stm32f7xx.c \
+            drivers/mcu/stm32/audio_stm32f7xx.c \
+            drivers/mcu/stm32/bus_i2c_hal_init.c \
+            drivers/mcu/stm32/bus_i2c_hal.c \
+            drivers/mcu/stm32/bus_spi_ll.c \
+            drivers/mcu/stm32/debug.c \
+            drivers/mcu/stm32/dma_reqmap_mcu.c \
+            drivers/mcu/stm32/dma_stm32f7xx.c \
+            drivers/mcu/stm32/dshot_bitbang_ll.c \
+            drivers/mcu/stm32/dshot_bitbang.c \
+            drivers/mcu/stm32/exti.c \
+            drivers/mcu/stm32/io_stm32.c \
+            drivers/mcu/stm32/light_ws2811strip_hal.c \
+            drivers/mcu/stm32/persistent.c \
+            drivers/mcu/stm32/pwm_output.c \
+            drivers/mcu/stm32/pwm_output_dshot_hal.c \
+            drivers/mcu/stm32/rcc_stm32.c \
+            drivers/mcu/stm32/sdio_f7xx.c \
+            drivers/mcu/stm32/serial_uart_hal.c \
+            drivers/mcu/stm32/serial_uart_stm32f7xx.c \
+            drivers/mcu/stm32/system_stm32f7xx.c \
+            drivers/mcu/stm32/timer_hal.c \
+            drivers/mcu/stm32/timer_stm32f7xx.c \
+            drivers/mcu/stm32/transponder_ir_io_hal.c \
+            drivers/mcu/stm32/camera_control.c \
+            startup/stm32/system_stm32f7xx.c
 
 MCU_EXCLUDES = \
             drivers/bus_i2c.c
 
 MSC_SRC = \
             drivers/usb_msc_common.c \
-            drivers/stm32/usb_msc_hal.c \
+            drivers/mcu/stm32/usb_msc_hal.c \
             msc/usbd_storage.c \
             msc/usbd_storage_emfat.c \
             msc/emfat.c \

mk/mcu/STM32G4.mk

@@ -11,66 +11,37 @@ CMSIS_DIR      := $(ROOT)/lib/main/CMSIS
 
 #STDPERIPH
 STDPERIPH_DIR   = $(ROOT)/lib/main/STM32G4/Drivers/STM32G4xx_HAL_Driver
-STDPERIPH_SRC   = $(notdir $(wildcard $(STDPERIPH_DIR)/Src/*.c))
-EXCLUDES        = \
-                stm32g4xx_hal_comp.c \
-                stm32g4xx_hal_crc.c \
-                stm32g4xx_hal_crc_ex.c \
-                stm32g4xx_hal_cryp.c \
-                stm32g4xx_hal_cryp_ex.c \
-                stm32g4xx_hal_dac.c \
-                stm32g4xx_hal_dac_ex.c \
-                stm32g4xx_hal_dma_ex.c \
-                stm32g4xx_hal_flash_ramfunc.c \
-                stm33g4xx_hal_fmac.c \
-                stm32g4xx_hal_hrtim.c \
-                stm32g4xx_hal_i2s.c \
-                stm32g4xx_hal_irda.c \
-                stm32g4xx_hal_iwdg.c \
-                stm32g4xx_hal_lptim.c \
-                stm32g4xx_hal_msp_template.c \
-                stm32g4xx_hal_nand.c \
-                stm32g4xx_hal_nor.c \
-                stm32g4xx_hal_opamp.c \
-                stm32g4xx_hal_opamp_ex.c \
-                stm32g4xx_hal_qspi.c \
-                stm32g4xx_hal_rng.c \
-                stm32g4xx_hal_sai.c \
-                stm32g4xx_hal_sai_ex.c \
-                stm32g4xx_hal_smartcard.c \
-                stm32g4xx_hal_smartcard_ex.c \
-                stm32g4xx_hal_smbus.c \
-                stm32g4xx_hal_spi.c \
-                stm32g4xx_hal_spi_ex.c \
-                stm32g4xx_hal_sram.c \
-                stm32g4xx_hal_timebase_tim_template.c \
-                stm32g4xx_hal_usart.c \
-                stm32g4xx_hal_usart_ex.c \
-                stm32g4xx_hal_wwdg.c \
-                stm32g4xx_ll_adc.c \
-                stm32g4xx_ll_comp.c \
-                stm32g4xx_ll_cordic.c \
-                stm32g4xx_ll_crc.c \
-                stm32g4xx_ll_crs.c \
-                stm32g4xx_ll_dac.c \
-                stm32g4xx_ll_exti.c \
-                stm32g4xx_ll_fmac.c \
-                stm32g4xx_ll_fmc.c \
-                stm32g4xx_ll_gpio.c \
-                stm32g4xx_ll_hrtim.c \
-                stm32g4xx_ll_i2c.c \
-                stm32g4xx_ll_lptim.c \
-                stm32g4xx_ll_lpuart.c \
-                stm32g4xx_ll_opamp.c \
-                stm32g4xx_ll_pwr.c \
-                stm32g4xx_ll_rcc.c \
-                stm32g4xx_ll_rng.c \
-                stm32g4xx_ll_rtc.c \
-                stm32g4xx_ll_ucpd.c \
-                stm32g4xx_ll_usart.c \
-                stm32g4xx_ll_utils.c
-
-STDPERIPH_SRC   := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
+STDPERIPH_SRC   = \
+            stm32g4xx_hal_adc.c \
+            stm32g4xx_hal_adc_ex.c \
+            stm32g4xx_hal.c \
+            stm32g4xx_hal_cordic.c \
+            stm32g4xx_hal_cortex.c \
+            stm32g4xx_hal_dma.c \
+            stm32g4xx_hal_exti.c \
+            stm32g4xx_hal_fdcan.c \
+            stm32g4xx_hal_flash.c \
+            stm32g4xx_hal_flash_ex.c \
+            stm32g4xx_hal_fmac.c \
+            stm32g4xx_hal_gpio.c \
+            stm32g4xx_hal_i2c.c \
+            stm32g4xx_hal_i2c_ex.c \
+            stm32g4xx_hal_pcd.c \
+            stm32g4xx_hal_pcd_ex.c \
+            stm32g4xx_hal_pwr.c \
+            stm32g4xx_hal_pwr_ex.c \
+            stm32g4xx_hal_rcc.c \
+            stm32g4xx_hal_rcc_ex.c \
+            stm32g4xx_hal_rtc.c \
+            stm32g4xx_hal_rtc_ex.c \
+            stm32g4xx_hal_tim.c \
+            stm32g4xx_hal_tim_ex.c \
+            stm32g4xx_hal_uart.c \
+            stm32g4xx_hal_uart_ex.c \
+            stm32g4xx_ll_dma.c \
+            stm32g4xx_ll_spi.c \
+            stm32g4xx_ll_tim.c \
+            stm32g4xx_ll_usb.c
 
 #USB
 USBCORE_DIR = $(ROOT)/lib/main/STM32G4/Middlewares/ST/STM32_USB_Device_Library/Core
@@ -104,6 +75,7 @@ VPATH           := $(VPATH):$(CMSIS_DIR)/Include:$(CMSIS_DIR)/Device/ST/STM32G4x
 VPATH           := $(VPATH):$(STDPERIPH_DIR)/Src
 CMSIS_SRC       :=
 INCLUDE_DIRS    := $(INCLUDE_DIRS) \
+                   $(SRC_DIR)/startup/stm32 \
                    $(STDPERIPH_DIR)/Inc \
                    $(USBCORE_DIR)/Inc \
                    $(USBCDC_DIR)/Inc \
@@ -111,8 +83,8 @@ INCLUDE_DIRS    := $(INCLUDE_DIRS) \
                    $(USBMSC_DIR)/Inc \
                    $(CMSIS_DIR)/Core/Include \
                    $(ROOT)/lib/main/STM32G4/Drivers/CMSIS/Device/ST/STM32G4xx/Include \
-                   $(ROOT)/src/main/drivers/stm32 \
-                   $(ROOT)/src/main/drivers/stm32/vcp_hal
+                   $(SRC_DIR)/drivers/mcu/stm32 \
+                   $(SRC_DIR)/drivers/mcu/stm32/vcp_hal
 
 #Flags
 ARCH_FLAGS      = -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
@@ -124,7 +96,7 @@ DEVICE_FLAGS    = -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -DUSE_DMA_RAM -DMAX_MPU_
 ifeq ($(TARGET_MCU),STM32G474xx)
 DEVICE_FLAGS   += -DSTM32G474xx
 LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_g474.ld
-STARTUP_SRC     = startup_stm32g474xx.s
+STARTUP_SRC     = stm32/startup_stm32g474xx.s
 MCU_FLASH_SIZE  = 512
 # Override the OPTIMISE_SPEED compiler setting to save flash space on these 512KB targets.
 # Performance is only slightly affected but around 50 kB of flash are saved.
@@ -135,11 +107,11 @@ endif
 DEVICE_FLAGS    += -DHSE_VALUE=$(HSE_VALUE) -DSTM32
 
 VCP_SRC = \
-            drivers/stm32/vcp_hal/usbd_desc.c \
-            drivers/stm32/vcp_hal/usbd_conf_stm32g4xx.c \
-            drivers/stm32/vcp_hal/usbd_cdc_hid.c \
-            drivers/stm32/vcp_hal/usbd_cdc_interface.c \
-            drivers/stm32/serial_usb_vcp.c \
+            drivers/mcu/stm32/vcp_hal/usbd_desc.c \
+            drivers/mcu/stm32/vcp_hal/usbd_conf_stm32g4xx.c \
+            drivers/mcu/stm32/vcp_hal/usbd_cdc_hid.c \
+            drivers/mcu/stm32/vcp_hal/usbd_cdc_interface.c \
+            drivers/mcu/stm32/serial_usb_vcp.c \
             drivers/usb_io.c
 
 MCU_COMMON_SRC = \
@@ -147,32 +119,32 @@ MCU_COMMON_SRC = \
             drivers/bus_i2c_timing.c \
             drivers/dshot_bitbang_decode.c \
             drivers/pwm_output_dshot_shared.c \
-            drivers/stm32/adc_stm32g4xx.c \
-            drivers/stm32/bus_i2c_hal_init.c \
-            drivers/stm32/bus_i2c_hal.c \
-            drivers/stm32/bus_spi_ll.c \
-            drivers/stm32/debug.c \
-            drivers/stm32/dma_reqmap_mcu.c \
-            drivers/stm32/dma_stm32g4xx.c \
-            drivers/stm32/dshot_bitbang_ll.c \
-            drivers/stm32/dshot_bitbang.c \
-            drivers/stm32/exti.c \
-            drivers/stm32/io_stm32.c \
-            drivers/stm32/light_ws2811strip_hal.c \
-            drivers/stm32/memprot_hal.c \
-            drivers/stm32/memprot_stm32g4xx.c \
-            drivers/stm32/persistent.c \
-            drivers/stm32/pwm_output.c \
-            drivers/stm32/pwm_output_dshot_hal.c \
-            drivers/stm32/rcc_stm32.c \
-            drivers/stm32/serial_uart_hal.c \
-            drivers/stm32/serial_uart_stm32g4xx.c \
-            drivers/stm32/system_stm32g4xx.c \
-            drivers/stm32/timer_hal.c \
-            drivers/stm32/timer_stm32g4xx.c \
-            drivers/stm32/transponder_ir_io_hal.c \
-            drivers/stm32/camera_control.c \
-            startup/system_stm32g4xx.c
+            drivers/mcu/stm32/adc_stm32g4xx.c \
+            drivers/mcu/stm32/bus_i2c_hal_init.c \
+            drivers/mcu/stm32/bus_i2c_hal.c \
+            drivers/mcu/stm32/bus_spi_ll.c \
+            drivers/mcu/stm32/debug.c \
+            drivers/mcu/stm32/dma_reqmap_mcu.c \
+            drivers/mcu/stm32/dma_stm32g4xx.c \
+            drivers/mcu/stm32/dshot_bitbang_ll.c \
+            drivers/mcu/stm32/dshot_bitbang.c \
+            drivers/mcu/stm32/exti.c \
+            drivers/mcu/stm32/io_stm32.c \
+            drivers/mcu/stm32/light_ws2811strip_hal.c \
+            drivers/mcu/stm32/memprot_hal.c \
+            drivers/mcu/stm32/memprot_stm32g4xx.c \
+            drivers/mcu/stm32/persistent.c \
+            drivers/mcu/stm32/pwm_output.c \
+            drivers/mcu/stm32/pwm_output_dshot_hal.c \
+            drivers/mcu/stm32/rcc_stm32.c \
+            drivers/mcu/stm32/serial_uart_hal.c \
+            drivers/mcu/stm32/serial_uart_stm32g4xx.c \
+            drivers/mcu/stm32/system_stm32g4xx.c \
+            drivers/mcu/stm32/timer_hal.c \
+            drivers/mcu/stm32/timer_stm32g4xx.c \
+            drivers/mcu/stm32/transponder_ir_io_hal.c \
+            drivers/mcu/stm32/camera_control.c \
+            startup/stm32/system_stm32g4xx.c
 
 MCU_EXCLUDES = \
             drivers/bus_i2c.c
@@ -180,7 +152,7 @@ MCU_EXCLUDES = \
 # G4's MSC use the same driver layer file with F7
 MSC_SRC = \
             drivers/usb_msc_common.c \
-            drivers/stm32/usb_msc_hal.c \
+            drivers/mcu/stm32/usb_msc_hal.c \
             msc/usbd_storage.c \
             msc/usbd_storage_emfat.c \
             msc/emfat.c \

mk/mcu/STM32H5.mk

@@ -87,6 +87,7 @@ VPATH           := $(VPATH):$(CMSIS_DIR)/Include:$(CMSIS_DIR)/Device/ST/STM32H5x
 VPATH           := $(VPATH):$(STDPERIPH_DIR)/Src
 CMSIS_SRC       :=
 INCLUDE_DIRS    := $(INCLUDE_DIRS) \
+                   $(SRC_DIR)/startup/stm32 \
                    $(STDPERIPH_DIR)/Inc \
                    $(USBCORE_DIR)/Inc \
                    $(USBCDC_DIR)/Inc \
@@ -94,8 +95,8 @@ INCLUDE_DIRS    := $(INCLUDE_DIRS) \
                    $(USBMSC_DIR)/Inc \
                    $(CMSIS_DIR)/Core/Include \
                    $(ROOT)/lib/main/STM32H5/Drivers/CMSIS/Device/ST/STM32H5xx/Include \
-                   $(ROOT)/src/main/drivers/stm32 \
-                   $(ROOT)/src/main/drivers/stm32/vcp_hal
+                   $(SRC_DIR)/drivers/mcu/stm32 \
+                   $(SRC_DIR)/drivers/mcu/stm32/vcp_hal
 
 #Flags
 ARCH_FLAGS      = -mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -fsingle-precision-constant
@@ -109,7 +110,7 @@ DEVICE_FLAGS    = -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER
 ifeq ($(TARGET_MCU),STM32H563xx)
 DEVICE_FLAGS       += -DSTM32H563xx
 DEFAULT_LD_SCRIPT   = $(LINKER_DIR)/stm32_flash_h563_2m.ld
-STARTUP_SRC         = startup_stm32h563xx.s
+STARTUP_SRC         = stm32/startup_stm32h563xx.s
 MCU_FLASH_SIZE     := 2048
 DEVICE_FLAGS       += -DMAX_MPU_REGIONS=16
 
@@ -140,11 +141,11 @@ DEVICE_FLAGS    += -DHSE_VALUE=$(HSE_VALUE) -DHSE_STARTUP_TIMEOUT=1000 -DSTM32
 
 VCP_SRC =
 #VCP_SRC = \
-            drivers/stm32/vcp_hal/usbd_desc.c \
-            drivers/stm32/vcp_hal/usbd_conf_stm32h5xx.c \
-            drivers/stm32/vcp_hal/usbd_cdc_hid.c \
-            drivers/stm32/vcp_hal/usbd_cdc_interface.c \
-            drivers/stm32/serial_usb_vcp.c \
+            drivers/mcu/stm32/vcp_hal/usbd_desc.c \
+            drivers/mcu/stm32/vcp_hal/usbd_conf_stm32h5xx.c \
+            drivers/mcu/stm32/vcp_hal/usbd_cdc_hid.c \
+            drivers/mcu/stm32/vcp_hal/usbd_cdc_interface.c \
+            drivers/mcu/stm32/serial_usb_vcp.c \
             drivers/usb_io.c
 
 MCU_COMMON_SRC = \
@@ -152,42 +153,42 @@ MCU_COMMON_SRC = \
             drivers/bus_quadspi.c \
             drivers/dshot_bitbang_decode.c \
             drivers/pwm_output_dshot_shared.c \
-            drivers/stm32/bus_i2c_hal_init.c \
-            drivers/stm32/bus_i2c_hal.c \
-            drivers/stm32/bus_spi_ll.c \
-            drivers/stm32/bus_quadspi_hal.c \
-            drivers/stm32/debug.c \
-            drivers/stm32/dma_reqmap_mcu.c \
-            drivers/stm32/dshot_bitbang_ll.c \
-            drivers/stm32/dshot_bitbang.c \
-            drivers/stm32/exti.c \
-            drivers/stm32/io_stm32.c \
-            drivers/stm32/light_ws2811strip_hal.c \
-            drivers/stm32/persistent.c \
-            drivers/stm32/pwm_output.c \
-            drivers/stm32/pwm_output_dshot_hal.c \
-            drivers/stm32/rcc_stm32.c \
-            drivers/stm32/serial_uart_hal.c \
-            drivers/stm32/timer_hal.c \
-            drivers/stm32/transponder_ir_io_hal.c \
-            drivers/stm32/camera_control.c \
-            drivers/stm32/system_stm32h5xx.c \
-            startup/system_stm32h5xx.c
+            drivers/mcu/stm32/bus_i2c_hal_init.c \
+            drivers/mcu/stm32/bus_i2c_hal.c \
+            drivers/mcu/stm32/bus_spi_ll.c \
+            drivers/mcu/stm32/bus_quadspi_hal.c \
+            drivers/mcu/stm32/debug.c \
+            drivers/mcu/stm32/dma_reqmap_mcu.c \
+            drivers/mcu/stm32/dshot_bitbang_ll.c \
+            drivers/mcu/stm32/dshot_bitbang.c \
+            drivers/mcu/stm32/exti.c \
+            drivers/mcu/stm32/io_stm32.c \
+            drivers/mcu/stm32/light_ws2811strip_hal.c \
+            drivers/mcu/stm32/persistent.c \
+            drivers/mcu/stm32/pwm_output.c \
+            drivers/mcu/stm32/pwm_output_dshot_hal.c \
+            drivers/mcu/stm32/rcc_stm32.c \
+            drivers/mcu/stm32/serial_uart_hal.c \
+            drivers/mcu/stm32/timer_hal.c \
+            drivers/mcu/stm32/transponder_ir_io_hal.c \
+            drivers/mcu/stm32/camera_control.c \
+            drivers/mcu/stm32/system_stm32h5xx.c \
+            startup/stm32/system_stm32h5xx.c
 
-#            drivers/stm32/memprot_hal.c \
-#            drivers/stm32/memprot_stm32h5xx.c \
-#            drivers/stm32/serial_uart_stm32h5xx.c \
-#            drivers/stm32/sdio_h5xx.c \
-#            drivers/stm32/timer_stm32h5xx.c \
-#            drivers/stm32/adc_stm32h5xx.c \
-#            drivers/stm32/dma_stm32h5xx.c \
+#            drivers/mcu/stm32/memprot_hal.c \
+#            drivers/mcu/stm32/memprot_stm32h5xx.c \
+#            drivers/mcu/stm32/serial_uart_stm32h5xx.c \
+#            drivers/mcu/stm32/sdio_h5xx.c \
+#            drivers/mcu/stm32/timer_stm32h5xx.c \
+#            drivers/mcu/stm32/adc_stm32h5xx.c \
+#            drivers/mcu/stm32/dma_stm32h5xx.c \
 
 MCU_EXCLUDES = \
             drivers/bus_i2c.c
 
 MSC_SRC =
 #MSC_SRC = \
-            drivers/stm32/usb_msc_hal.c \
+            drivers/mcu/stm32/usb_msc_hal.c \
             drivers/usb_msc_common.c \
             msc/usbd_storage.c \
             msc/usbd_storage_emfat.c \

mk/mcu/STM32H7.mk

@@ -11,86 +11,52 @@ CMSIS_DIR      := $(ROOT)/lib/main/CMSIS
 
 #STDPERIPH
 STDPERIPH_DIR   = $(ROOT)/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver
-STDPERIPH_SRC   = $(notdir $(wildcard $(STDPERIPH_DIR)/Src/*.c))
-
-EXCLUDES        = \
-                stm32h7xx_hal_cec.c \
-                stm32h7xx_hal_comp.c \
-                stm32h7xx_hal_crc.c \
-                stm32h7xx_hal_crc_ex.c \
-                stm32h7xx_hal_cryp.c \
-                stm32h7xx_hal_cryp_ex.c \
-                stm32h7xx_hal_dcmi.c \
-                stm32h7xx_hal_dfsdm.c \
-                stm32h7xx_hal_dma2d.c \
-                stm32h7xx_hal_dsi.c \
-                stm32h7xx_hal_eth.c \
-                stm32h7xx_hal_eth_ex.c \
-                stm32h7xx_hal_fdcan.c \
-                stm32h7xx_hal_hash.c \
-                stm32h7xx_hal_hash_ex.c \
-                stm32h7xx_hal_hcd.c \
-                stm32h7xx_hal_hrtim.c \
-                stm32h7xx_hal_hsem.c \
-                stm32h7xx_hal_i2s.c \
-                stm32h7xx_hal_i2s_ex.c \
-                stm32h7xx_hal_irda.c \
-                stm32h7xx_hal_iwdg.c \
-                stm32h7xx_hal_jpeg.c \
-                stm32h7xx_hal_lptim.c \
-                stm32h7xx_hal_ltdc.c \
-                stm32h7xx_hal_ltdc_ex.c \
-                stm32h7xx_hal_mdios.c \
-                stm32h7xx_hal_mdma.c \
-                stm32h7xx_hal_mmc.c \
-                stm32h7xx_hal_mmc_ex.c \
-                stm32h7xx_hal_msp_template.c \
-                stm32h7xx_hal_nand.c \
-                stm32h7xx_hal_nor.c \
-                stm32h7xx_hal_opamp.c \
-                stm32h7xx_hal_opamp_ex.c \
-                stm32h7xx_hal_ramecc.c \
-                stm32h7xx_hal_rng.c \
-                stm32h7xx_hal_rtc.c \
-                stm32h7xx_hal_sai.c \
-                stm32h7xx_hal_sai_ex.c \
-                stm32h7xx_hal_sd_ex.c \
-                stm32h7xx_hal_sdram.c \
-                stm32h7xx_hal_smartcard.c \
-                stm32h7xx_hal_smartcard_ex.c \
-                stm32h7xx_hal_smbus.c \
-                stm32h7xx_hal_spdifrx.c \
-                stm32h7xx_hal_spi.c \
-                stm32h7xx_hal_sram.c \
-                stm32h7xx_hal_swpmi.c \
-                stm32h7xx_hal_usart.c \
-                stm32h7xx_hal_usart_ex.c \
-                stm32h7xx_hal_wwdg.c \
-                stm32h7xx_ll_adc.c \
-                stm32h7xx_ll_bdma.c \
-                stm32h7xx_ll_comp.c \
-                stm32h7xx_ll_crc.c \
-                stm32h7xx_ll_dac.c \
-                stm32h7xx_ll_delayblock.c \
-                stm32h7xx_ll_dma2d.c \
-                stm32h7xx_ll_exti.c \
-                stm32h7xx_ll_fmc.c \
-                stm32h7xx_ll_gpio.c \
-                stm32h7xx_ll_hrtim.c \
-                stm32h7xx_ll_i2c.c \
-                stm32h7xx_ll_lptim.c \
-                stm32h7xx_ll_lpuart.c \
-                stm32h7xx_ll_mdma.c \
-                stm32h7xx_ll_opamp.c \
-                stm32h7xx_ll_pwr.c \
-                stm32h7xx_ll_rcc.c \
-                stm32h7xx_ll_rng.c \
-                stm32h7xx_ll_rtc.c \
-                stm32h7xx_ll_swpmi.c \
-                stm32h7xx_ll_usart.c \
-                stm32h7xx_ll_utils.c
-
-STDPERIPH_SRC   := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
+STDPERIPH_SRC   = \
+            stm32h7xx_hal_adc.c \
+            stm32h7xx_hal_adc_ex.c \
+            stm32h7xx_hal.c \
+            stm32h7xx_hal_cordic.c \
+            stm32h7xx_hal_cortex.c \
+            stm32h7xx_hal_dac.c \
+            stm32h7xx_hal_dac_ex.c \
+            stm32h7xx_hal_dfsdm_ex.c \
+            stm32h7xx_hal_dma.c \
+            stm32h7xx_hal_dma_ex.c \
+            stm32h7xx_hal_dts.c \
+            stm32h7xx_hal_exti.c \
+            stm32h7xx_hal_flash.c \
+            stm32h7xx_hal_flash_ex.c \
+            stm32h7xx_hal_fmac.c \
+            stm32h7xx_hal_gfxmmu.c \
+            stm32h7xx_hal_gpio.c \
+            stm32h7xx_hal_i2c.c \
+            stm32h7xx_hal_i2c_ex.c \
+            stm32h7xx_hal_ospi.c \
+            stm32h7xx_hal_otfdec.c \
+            stm32h7xx_hal_pcd.c \
+            stm32h7xx_hal_pcd_ex.c \
+            stm32h7xx_hal_pssi.c \
+            stm32h7xx_hal_pwr.c \
+            stm32h7xx_hal_pwr_ex.c \
+            stm32h7xx_hal_qspi.c \
+            stm32h7xx_hal_rcc.c \
+            stm32h7xx_hal_rcc_ex.c \
+            stm32h7xx_hal_rng_ex.c \
+            stm32h7xx_hal_rtc_ex.c \
+            stm32h7xx_hal_sd.c \
+            stm32h7xx_hal_spi_ex.c \
+            stm32h7xx_hal_tim.c \
+            stm32h7xx_hal_tim_ex.c \
+            stm32h7xx_hal_uart.c \
+            stm32h7xx_hal_uart_ex.c \
+            stm32h7xx_ll_cordic.c \
+            stm32h7xx_ll_crs.c \
+            stm32h7xx_ll_dma.c \
+            stm32h7xx_ll_fmac.c \
+            stm32h7xx_ll_sdmmc.c \
+            stm32h7xx_ll_spi.c \
+            stm32h7xx_ll_tim.c \
+            stm32h7xx_ll_usb.c
 
 #USB
 USBCORE_DIR = $(ROOT)/lib/main/STM32H7/Middlewares/ST/STM32_USB_Device_Library/Core
@@ -124,6 +90,7 @@ VPATH           := $(VPATH):$(CMSIS_DIR)/Include:$(CMSIS_DIR)/Device/ST/STM32H7x
 VPATH           := $(VPATH):$(STDPERIPH_DIR)/Src
 CMSIS_SRC       :=
 INCLUDE_DIRS    := $(INCLUDE_DIRS) \
+                   $(SRC_DIR)/startup/stm32 \
                    $(STDPERIPH_DIR)/Inc \
                    $(USBCORE_DIR)/Inc \
                    $(USBCDC_DIR)/Inc \
@@ -131,8 +98,8 @@ INCLUDE_DIRS    := $(INCLUDE_DIRS) \
                    $(USBMSC_DIR)/Inc \
                    $(CMSIS_DIR)/Core/Include \
                    $(ROOT)/lib/main/STM32H7/Drivers/CMSIS/Device/ST/STM32H7xx/Include \
-                   $(ROOT)/src/main/drivers/stm32 \
-                   $(ROOT)/src/main/drivers/stm32/vcp_hal
+                   $(SRC_DIR)/drivers/mcu/stm32 \
+                   $(SRC_DIR)/drivers/mcu/stm32/vcp_hal
 
 #Flags
 ARCH_FLAGS      = -mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -fsingle-precision-constant
@@ -149,7 +116,7 @@ DEVICE_FLAGS    = -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER
 ifeq ($(TARGET_MCU),STM32H743xx)
 DEVICE_FLAGS       += -DSTM32H743xx
 DEFAULT_LD_SCRIPT   = $(LINKER_DIR)/stm32_flash_h743_2m.ld
-STARTUP_SRC         = startup_stm32h743xx.s
+STARTUP_SRC         = stm32/startup_stm32h743xx.s
 MCU_FLASH_SIZE     := 2048
 DEVICE_FLAGS       += -DMAX_MPU_REGIONS=16
 
@@ -164,7 +131,7 @@ endif
 else ifeq ($(TARGET_MCU),STM32H7A3xxQ)
 DEVICE_FLAGS       += -DSTM32H7A3xxQ
 DEFAULT_LD_SCRIPT   = $(LINKER_DIR)/stm32_flash_h7a3_2m.ld
-STARTUP_SRC         = startup_stm32h7a3xx.s
+STARTUP_SRC         = stm32/startup_stm32h7a3xx.s
 MCU_FLASH_SIZE     := 2048
 DEVICE_FLAGS       += -DMAX_MPU_REGIONS=16
 
@@ -179,7 +146,7 @@ endif
 else ifeq ($(TARGET_MCU),STM32H7A3xx)
 DEVICE_FLAGS       += -DSTM32H7A3xx
 DEFAULT_LD_SCRIPT   = $(LINKER_DIR)/stm32_flash_h7a3_2m.ld
-STARTUP_SRC         = startup_stm32h7a3xx.s
+STARTUP_SRC         = stm32/startup_stm32h7a3xx.s
 MCU_FLASH_SIZE     := 2048
 DEVICE_FLAGS       += -DMAX_MPU_REGIONS=16
 
@@ -194,7 +161,7 @@ endif
 else ifeq ($(TARGET_MCU),STM32H723xx)
 DEVICE_FLAGS       += -DSTM32H723xx
 DEFAULT_LD_SCRIPT   = $(LINKER_DIR)/stm32_flash_h723_1m.ld
-STARTUP_SRC         = startup_stm32h723xx.s
+STARTUP_SRC         = stm32/startup_stm32h723xx.s
 DEFAULT_TARGET_FLASH := 1024
 DEVICE_FLAGS       += -DMAX_MPU_REGIONS=16
 
@@ -214,14 +181,14 @@ endif
 else ifeq ($(TARGET_MCU),STM32H725xx)
 DEVICE_FLAGS       += -DSTM32H725xx
 DEFAULT_LD_SCRIPT   = $(LINKER_DIR)/stm32_flash_h723_1m.ld
-STARTUP_SRC         = startup_stm32h723xx.s
+STARTUP_SRC         = stm32/startup_stm32h723xx.s
 MCU_FLASH_SIZE     := 1024
 DEVICE_FLAGS       += -DMAX_MPU_REGIONS=16
 
 else ifeq ($(TARGET_MCU),STM32H730xx)
 DEVICE_FLAGS       += -DSTM32H730xx
 DEFAULT_LD_SCRIPT   = $(LINKER_DIR)/stm32_flash_h730_128m.ld
-STARTUP_SRC         = startup_stm32h730xx.s
+STARTUP_SRC         = stm32/startup_stm32h730xx.s
 DEFAULT_TARGET_FLASH := 128
 DEVICE_FLAGS       += -DMAX_MPU_REGIONS=16
 
@@ -243,7 +210,7 @@ endif
 else ifeq ($(TARGET_MCU),STM32H750xx)
 DEVICE_FLAGS       += -DSTM32H750xx
 DEFAULT_LD_SCRIPT   = $(LINKER_DIR)/stm32_flash_h750_128k.ld
-STARTUP_SRC         = startup_stm32h743xx.s
+STARTUP_SRC         = stm32/startup_stm32h743xx.s
 DEFAULT_TARGET_FLASH := 128
 
 ifeq ($(TARGET_FLASH),)
@@ -288,11 +255,11 @@ endif
 DEVICE_FLAGS    += -DHSE_VALUE=$(HSE_VALUE) -DHSE_STARTUP_TIMEOUT=1000 -DSTM32
 
 VCP_SRC = \
-            drivers/stm32/vcp_hal/usbd_desc.c \
-            drivers/stm32/vcp_hal/usbd_conf_stm32h7xx.c \
-            drivers/stm32/vcp_hal/usbd_cdc_hid.c \
-            drivers/stm32/vcp_hal/usbd_cdc_interface.c \
-            drivers/stm32/serial_usb_vcp.c \
+            drivers/mcu/stm32/vcp_hal/usbd_desc.c \
+            drivers/mcu/stm32/vcp_hal/usbd_conf_stm32h7xx.c \
+            drivers/mcu/stm32/vcp_hal/usbd_cdc_hid.c \
+            drivers/mcu/stm32/vcp_hal/usbd_cdc_interface.c \
+            drivers/mcu/stm32/serial_usb_vcp.c \
             drivers/usb_io.c
 
 MCU_COMMON_SRC = \
@@ -300,42 +267,42 @@ MCU_COMMON_SRC = \
             drivers/bus_quadspi.c \
             drivers/dshot_bitbang_decode.c \
             drivers/pwm_output_dshot_shared.c \
-            drivers/stm32/adc_stm32h7xx.c \
-            drivers/stm32/audio_stm32h7xx.c \
-            drivers/stm32/bus_i2c_hal_init.c \
-            drivers/stm32/bus_i2c_hal.c \
-            drivers/stm32/bus_spi_ll.c \
-            drivers/stm32/bus_quadspi_hal.c \
-            drivers/stm32/bus_octospi_stm32h7xx.c \
-            drivers/stm32/debug.c \
-            drivers/stm32/dma_reqmap_mcu.c \
-            drivers/stm32/dma_stm32h7xx.c \
-            drivers/stm32/dshot_bitbang_ll.c \
-            drivers/stm32/dshot_bitbang.c \
-            drivers/stm32/exti.c \
-            drivers/stm32/io_stm32.c \
-            drivers/stm32/light_ws2811strip_hal.c \
-            drivers/stm32/memprot_hal.c \
-            drivers/stm32/memprot_stm32h7xx.c \
-            drivers/stm32/persistent.c \
-            drivers/stm32/pwm_output.c \
-            drivers/stm32/pwm_output_dshot_hal.c \
-            drivers/stm32/rcc_stm32.c \
-            drivers/stm32/sdio_h7xx.c \
-            drivers/stm32/serial_uart_hal.c \
-            drivers/stm32/serial_uart_stm32h7xx.c \
-            drivers/stm32/system_stm32h7xx.c \
-            drivers/stm32/timer_hal.c \
-            drivers/stm32/timer_stm32h7xx.c \
-            drivers/stm32/transponder_ir_io_hal.c \
-            drivers/stm32/camera_control.c \
-            startup/system_stm32h7xx.c
+            drivers/mcu/stm32/adc_stm32h7xx.c \
+            drivers/mcu/stm32/audio_stm32h7xx.c \
+            drivers/mcu/stm32/bus_i2c_hal_init.c \
+            drivers/mcu/stm32/bus_i2c_hal.c \
+            drivers/mcu/stm32/bus_spi_ll.c \
+            drivers/mcu/stm32/bus_quadspi_hal.c \
+            drivers/mcu/stm32/bus_octospi_stm32h7xx.c \
+            drivers/mcu/stm32/debug.c \
+            drivers/mcu/stm32/dma_reqmap_mcu.c \
+            drivers/mcu/stm32/dma_stm32h7xx.c \
+            drivers/mcu/stm32/dshot_bitbang_ll.c \
+            drivers/mcu/stm32/dshot_bitbang.c \
+            drivers/mcu/stm32/exti.c \
+            drivers/mcu/stm32/io_stm32.c \
+            drivers/mcu/stm32/light_ws2811strip_hal.c \
+            drivers/mcu/stm32/memprot_hal.c \
+            drivers/mcu/stm32/memprot_stm32h7xx.c \
+            drivers/mcu/stm32/persistent.c \
+            drivers/mcu/stm32/pwm_output.c \
+            drivers/mcu/stm32/pwm_output_dshot_hal.c \
+            drivers/mcu/stm32/rcc_stm32.c \
+            drivers/mcu/stm32/sdio_h7xx.c \
+            drivers/mcu/stm32/serial_uart_hal.c \
+            drivers/mcu/stm32/serial_uart_stm32h7xx.c \
+            drivers/mcu/stm32/system_stm32h7xx.c \
+            drivers/mcu/stm32/timer_hal.c \
+            drivers/mcu/stm32/timer_stm32h7xx.c \
+            drivers/mcu/stm32/transponder_ir_io_hal.c \
+            drivers/mcu/stm32/camera_control.c \
+            startup/stm32/system_stm32h7xx.c
 
 MCU_EXCLUDES = \
             drivers/bus_i2c.c
 
 MSC_SRC = \
-            drivers/stm32/usb_msc_hal.c \
+            drivers/mcu/stm32/usb_msc_hal.c \
             drivers/usb_msc_common.c \
             msc/usbd_storage.c \
             msc/usbd_storage_emfat.c \

mk/source.mk

@@ -1,3 +1,46 @@
+PG_SRC = \
+            pg/adc.c \
+            pg/beeper.c \
+            pg/beeper_dev.c \
+            pg/board.c \
+            pg/bus_i2c.c \
+            pg/bus_quadspi.c \
+            pg/bus_spi.c \
+            pg/dashboard.c \
+            pg/displayport_profiles.c \
+            pg/dyn_notch.c \
+            pg/flash.c \
+            pg/gps.c \
+            pg/gps_lap_timer.c \
+            pg/gps_rescue.c \
+            pg/gyrodev.c \
+            pg/max7456.c \
+            pg/mco.c \
+            pg/motor.c \
+            pg/msp.c \
+            pg/pg.c \
+            pg/piniobox.c \
+            pg/pinio.c \
+            pg/pin_pull_up_down.c \
+            pg/rcdevice.c \
+            pg/rpm_filter.c \
+            pg/rx.c \
+            pg/rx_pwm.c \
+            pg/rx_spi.c \
+            pg/rx_spi_cc2500.c \
+            pg/rx_spi_expresslrs.c \
+            pg/scheduler.c \
+            pg/sdcard.c \
+            pg/sdio.c \
+            pg/serial_uart.c \
+            pg/stats.c \
+            pg/timerio.c \
+            pg/timerup.c \
+            pg/usb.c \
+            pg/vcd.c \
+            pg/vtx_io.c \
+            pg/vtx_table.c
+
 COMMON_SRC = \
             build/build_config.c \
             build/debug.c \
@@ -5,9 +48,33 @@ COMMON_SRC = \
             build/version.c \
             $(TARGET_DIR_SRC) \
             main.c \
-            $(addprefix pg/, $(notdir $(wildcard $(SRC_DIR)/pg/*.c))) \
-            $(addprefix common/,$(notdir $(wildcard $(SRC_DIR)/common/*.c))) \
-            $(addprefix config/,$(notdir $(wildcard $(SRC_DIR)/config/*.c))) \
+            $(PG_SRC) \
+            common/bitarray.c \
+            common/colorconversion.c \
+            common/crc.c \
+            common/encoding.c \
+            common/explog_approx.c \
+            common/filter.c \
+            common/gps_conversion.c \
+            common/huffman.c \
+            common/huffman_table.c \
+            common/maths.c \
+            common/printf.c \
+            common/printf_serial.c \
+            common/sdft.c \
+            common/sensor_alignment.c \
+            common/stopwatch.c \
+            common/streambuf.c \
+            common/string_light.c \
+            common/strtol.c \
+            common/time.c \
+            common/typeconversion.c \
+            common/uvarint.c \
+            config/config.c \
+            config/config_eeprom.c \
+            config/config_streamer.c \
+            config/feature.c \
+            config/simplified_tuning.c \
             cli/cli.c \
             cli/settings.c \
             config/config.c \
@@ -206,10 +273,44 @@ COMMON_SRC = \
 ifneq ($(SIMULATOR_BUILD),yes)
 
 COMMON_SRC += \
-            $(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.c))) \
+            drivers/accgyro/accgyro_mpu3050.c \
+            drivers/accgyro/accgyro_mpu6050.c \
+            drivers/accgyro/accgyro_mpu6500.c \
+            drivers/accgyro/accgyro_mpu.c \
+            drivers/accgyro/accgyro_spi_bmi160.c \
+            drivers/accgyro/accgyro_spi_bmi270.c \
+            drivers/accgyro/accgyro_spi_icm20649.c \
+            drivers/accgyro/accgyro_spi_icm20689.c \
+            drivers/accgyro/accgyro_spi_icm426xx.c \
+            drivers/accgyro/accgyro_spi_l3gd20.c \
+            drivers/accgyro/accgyro_spi_lsm6dso.c \
+            drivers/accgyro/accgyro_spi_lsm6dso_init.c \
+            drivers/accgyro/accgyro_spi_lsm6dsv16x.c \
+            drivers/accgyro/accgyro_spi_mpu6000.c \
+            drivers/accgyro/accgyro_spi_mpu6500.c \
+            drivers/accgyro/accgyro_spi_mpu9250.c \
+            drivers/accgyro/accgyro_virtual.c \
+            drivers/accgyro/gyro_sync.c \
             $(ROOT)/lib/main/BoschSensortec/BMI270-Sensor-API/bmi270_maximum_fifo.c \
-            $(addprefix drivers/barometer/,$(notdir $(wildcard $(SRC_DIR)/drivers/barometer/*.c))) \
-            $(addprefix drivers/compass/,$(notdir $(wildcard $(SRC_DIR)/drivers/compass/*.c))) \
+            drivers/barometer/barometer_2smpb_02b.c \
+            drivers/barometer/barometer_bmp085.c \
+            drivers/barometer/barometer_bmp280.c \
+            drivers/barometer/barometer_bmp388.c \
+            drivers/barometer/barometer_dps310.c \
+            drivers/barometer/barometer_lps22df.c \
+            drivers/barometer/barometer_lps.c \
+            drivers/barometer/barometer_ms5611.c \
+            drivers/barometer/barometer_qmp6988.c \
+            drivers/barometer/barometer_virtual.c \
+            drivers/compass/compass_ak8963.c \
+            drivers/compass/compass_ak8975.c \
+            drivers/compass/compass_hmc5883l.c \
+            drivers/compass/compass_ist8310.c \
+            drivers/compass/compass_lis2mdl.c \
+            drivers/compass/compass_lis3mdl.c \
+            drivers/compass/compass_mpu925x_ak8963.c \
+            drivers/compass/compass_qmc5883l.c \
+            drivers/compass/compass_virtual.c \
             drivers/max7456.c \
             drivers/vtx_rtc6705.c \
             drivers/vtx_rtc6705_soft_spi.c
@@ -226,6 +327,7 @@ COMMON_SRC += \
             drivers/accgyro/legacy/accgyro_lsm303dlhc.c \
             drivers/accgyro/legacy/accgyro_mma845x.c
 
+
 endif
 endif
 

src/main/drivers/dma.h

@@ -23,7 +23,7 @@
 #include "drivers/resource.h"
 
 #if defined(USE_ATBSP_DRIVER)
-#include "drivers/at32/dma_atbsp.h"
+#include "drivers/mcu/at32/dma_atbsp.h"
 #endif
 
 #define CACHE_LINE_SIZE 32

src/main/drivers/mcu/stm32/bus_i2c_hal_init.c

@@ -239,13 +239,13 @@ void i2cInit(I2CDevice device)
     uint32_t i2cPclk;
 
 #if defined(STM32F7) || defined(STM32G4)
-    // F7 Clock source configured in startup/system_stm32f7xx.c as:
+    // F7 Clock source configured in startup/stm32/system_stm32f7xx.c as:
     //   I2C1234 : PCLK1
-    // G4 Clock source configured in startup/system_stm32g4xx.c as:
+    // G4 Clock source configured in startup/stm32/system_stm32g4xx.c as:
     //   I2C1234 : PCLK1
     i2cPclk = HAL_RCC_GetPCLK1Freq();
 #elif defined(STM32H7)
-    // Clock sources configured in startup/system_stm32h7xx.c as:
+    // Clock sources configured in startup/stm32/system_stm32h7xx.c as:
     //   I2C123 : D2PCLK1 (rcc_pclk1 for APB1)
     //   I2C4   : D3PCLK1 (rcc_pclk4 for APB4)
     i2cPclk = (pHandle->Instance == I2C4) ? HAL_RCCEx_GetD3PCLK1Freq() : HAL_RCC_GetPCLK1Freq();

src/main/drivers/mcu/stm32/platform_mcu.h

@@ -32,7 +32,7 @@
 #include "stm32g4xx_ll_bus.h"
 #include "stm32g4xx_ll_tim.h"
 #include "stm32g4xx_ll_system.h"
-#include "drivers/stm32/stm32g4xx_ll_ex.h"
+#include "drivers/mcu/stm32/stm32g4xx_ll_ex.h"
 
 // Chip Unique ID on G4
 #define U_ID_0 (*(uint32_t*)UID_BASE)
@@ -57,7 +57,7 @@
 #include "stm32h7xx_ll_bus.h"
 #include "stm32h7xx_ll_tim.h"
 #include "stm32h7xx_ll_system.h"
-#include "drivers/stm32/stm32h7xx_ll_ex.h"
+#include "drivers/mcu/stm32/stm32h7xx_ll_ex.h"
 
 // Chip Unique ID on H7
 #define U_ID_0 (*(uint32_t*)UID_BASE)
@@ -82,7 +82,7 @@
 #include "stm32f7xx_ll_bus.h"
 #include "stm32f7xx_ll_tim.h"
 #include "stm32f7xx_ll_system.h"
-#include "drivers/stm32/stm32f7xx_ll_ex.h"
+#include "drivers/mcu/stm32/stm32f7xx_ll_ex.h"
 
 // Chip Unique ID on F7
 #define U_ID_0 (*(uint32_t*)UID_BASE)

src/main/drivers/mcu/stm32/serial_usb_vcp.c

@@ -41,7 +41,7 @@
 #endif
 #include "drivers/usb_io.h"
 #elif defined(STM32F7) || defined(STM32H7) || defined(STM32G4)
-#include "drivers/stm32/vcp_hal/usbd_cdc_interface.h"
+#include "drivers/mcu/stm32/vcp_hal/usbd_cdc_interface.h"
 #include "drivers/usb_io.h"
 #ifdef USE_USB_CDC_HID
 #include "usbd_ioreq.h"