Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 08:45:36 +03:00
Code Issues Wiki Activity

Source file re-arrangement for better separation of MCU types (#12268)

Browse source 
Source file re-arrangement for better spearation of MCU types

- Move STM32 specific files to drivers/stm32
This commit is contained in:
J Blackman 2023-02-01 11:12:34 +11:00 • committed by GitHub
parent a3b7d74016
commit 33a96bb5f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
79 changed files with 537 additions and 485 deletions
Download patch file Download diff file Expand all files Collapse all files

28
make/mcu/STM32F4.mk
View file

@ -143,29 +143,29 @@ MCU_FLASH_SIZE := 512
else
$(error Unknown MCU for F4 target)
endif
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE)
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) -DSTM32
MCU_COMMON_SRC = \
startup/system_stm32f4xx.c \
drivers/accgyro/accgyro_mpu.c \
drivers/adc_stm32f4xx.c \
drivers/bus_i2c_stm32f4xx.c \
drivers/bus_spi_stdperiph.c \
drivers/dma_stm32f4xx.c \
drivers/stm32/adc_stm32f4xx.c \
drivers/stm32/bus_i2c_stm32f4xx.c \
drivers/stm32/bus_spi_stdperiph.c \
drivers/stm32/dma_stm32f4xx.c \
drivers/dshot_bitbang.c \
drivers/dshot_bitbang_decode.c \
drivers/dshot_bitbang_stdperiph.c \
drivers/stm32/dshot_bitbang_stdperiph.c \
drivers/inverter.c \
drivers/light_ws2811strip_stdperiph.c \
drivers/transponder_ir_io_stdperiph.c \
drivers/stm32/light_ws2811strip_stdperiph.c \
drivers/stm32/transponder_ir_io_stdperiph.c \
drivers/pwm_output_dshot.c \
drivers/pwm_output_dshot_shared.c \
drivers/serial_uart_stdperiph.c \
drivers/serial_uart_stm32f4xx.c \
drivers/system_stm32f4xx.c \
drivers/timer_stm32f4xx.c \
drivers/stm32/serial_uart_stdperiph.c \
drivers/stm32/serial_uart_stm32f4xx.c \
drivers/stm32/system_stm32f4xx.c \
drivers/stm32/timer_stm32f4xx.c \
drivers/persistent.c \
drivers/sdio_f4xx.c
drivers/stm32/sdio_f4xx.c
ifeq ($(PERIPH_DRIVER), HAL)
VCP_SRC = \
@ -187,7 +187,7 @@ endif
MSC_SRC = \
drivers/usb_msc_common.c \
drivers/usb_msc_f4xx.c \
drivers/stm32/usb_msc_f4xx.c \
msc/usbd_msc_desc.c \
msc/usbd_storage.c \
msc/usbd_storage_emfat.c \

36
make/mcu/STM32F7.mk
View file

@ -144,7 +144,7 @@ OPTIMISE_SPEED = -O2
else
$(error Unknown MCU for F7 target)
endif
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE)
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) -DSTM32
VCP_SRC = \
vcp_hal/usbd_desc.c \
@ -157,27 +157,27 @@ VCP_SRC = \
MCU_COMMON_SRC = \
startup/system_stm32f7xx.c \
drivers/accgyro/accgyro_mpu.c \
drivers/adc_stm32f7xx.c \
drivers/audio_stm32f7xx.c \
drivers/bus_i2c_hal.c \
drivers/bus_i2c_hal_init.c \
drivers/stm32/adc_stm32f7xx.c \
drivers/stm32/audio_stm32f7xx.c \
drivers/stm32/bus_i2c_hal.c \
drivers/stm32/bus_i2c_hal_init.c \
drivers/bus_i2c_timing.c \
drivers/dma_stm32f7xx.c \
drivers/light_ws2811strip_hal.c \
drivers/transponder_ir_io_hal.c \
drivers/bus_spi_ll.c \
drivers/stm32/dma_stm32f7xx.c \
drivers/stm32/light_ws2811strip_hal.c \
drivers/stm32/transponder_ir_io_hal.c \
drivers/stm32/bus_spi_ll.c \
drivers/persistent.c \
drivers/dshot_bitbang.c \
drivers/dshot_bitbang_decode.c \
drivers/dshot_bitbang_ll.c \
drivers/pwm_output_dshot_hal.c \
drivers/stm32/dshot_bitbang_ll.c \
drivers/stm32/pwm_output_dshot_hal.c \
drivers/pwm_output_dshot_shared.c \
drivers/timer_hal.c \
drivers/timer_stm32f7xx.c \
drivers/system_stm32f7xx.c \
drivers/serial_uart_hal.c \
drivers/serial_uart_stm32f7xx.c \
drivers/sdio_f7xx.c
drivers/stm32/timer_hal.c \
drivers/stm32/timer_stm32f7xx.c \
drivers/stm32/system_stm32f7xx.c \
drivers/stm32/serial_uart_hal.c \
drivers/stm32/serial_uart_stm32f7xx.c \
drivers/stm32/sdio_f7xx.c
MCU_EXCLUDES = \
drivers/bus_i2c.c \
@ -185,7 +185,7 @@ MCU_EXCLUDES = \
MSC_SRC = \
drivers/usb_msc_common.c \
drivers/usb_msc_f7xx.c \
drivers/stm32/usb_msc_f7xx.c \
msc/usbd_storage.c \
msc/usbd_storage_emfat.c \
msc/emfat.c \

36
make/mcu/STM32G4.mk
View file

@ -131,7 +131,7 @@ OPTIMISE_SPEED = -O2
else
$(error Unknown MCU for G4 target)
endif
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE)
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) -DSTM32
VCP_SRC = \
vcp_hal/usbd_desc.c \
@ -143,27 +143,27 @@ VCP_SRC = \
MCU_COMMON_SRC = \
drivers/accgyro/accgyro_mpu.c \
drivers/adc_stm32g4xx.c \
drivers/bus_i2c_hal.c \
drivers/bus_i2c_hal_init.c \
drivers/stm32/adc_stm32g4xx.c \
drivers/stm32/bus_i2c_hal.c \
drivers/stm32/bus_i2c_hal_init.c \
drivers/bus_i2c_timing.c \
drivers/bus_spi_ll.c \
drivers/dma_stm32g4xx.c \
drivers/stm32/bus_spi_ll.c \
drivers/stm32/dma_stm32g4xx.c \
drivers/dshot_bitbang.c \
drivers/dshot_bitbang_decode.c \
drivers/dshot_bitbang_ll.c \
drivers/light_ws2811strip_hal.c \
drivers/memprot_hal.c \
drivers/memprot_stm32g4xx.c \
drivers/stm32/dshot_bitbang_ll.c \
drivers/stm32/light_ws2811strip_hal.c \
drivers/stm32/memprot_hal.c \
drivers/stm32/memprot_stm32g4xx.c \
drivers/persistent.c \
drivers/pwm_output_dshot_shared.c \
drivers/pwm_output_dshot_hal.c \
drivers/timer_hal.c \
drivers/timer_stm32g4xx.c \
drivers/transponder_ir_io_hal.c \
drivers/system_stm32g4xx.c \
drivers/serial_uart_stm32g4xx.c \
drivers/serial_uart_hal.c \
drivers/stm32/pwm_output_dshot_hal.c \
drivers/stm32/timer_hal.c \
drivers/stm32/timer_stm32g4xx.c \
drivers/stm32/transponder_ir_io_hal.c \
drivers/stm32/system_stm32g4xx.c \
drivers/stm32/serial_uart_stm32g4xx.c \
drivers/stm32/serial_uart_hal.c \
startup/system_stm32g4xx.c
MCU_EXCLUDES = \
@ -173,7 +173,7 @@ MCU_EXCLUDES = \
# G4's MSC use the same driver layer file with F7
MSC_SRC = \
drivers/usb_msc_common.c \
drivers/usb_msc_f7xx.c \
drivers/stm32/usb_msc_f7xx.c \
msc/usbd_storage.c \
msc/usbd_storage_emfat.c \
msc/emfat.c \

44
make/mcu/STM32H7.mk
View file

@ -271,7 +271,7 @@ ifneq ($(FIRMWARE_SIZE),)
DEVICE_FLAGS += -DFIRMWARE_SIZE=$(FIRMWARE_SIZE)
endif
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) -DHSE_STARTUP_TIMEOUT=1000
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) -DHSE_STARTUP_TIMEOUT=1000 -DSTM32
VCP_SRC = \
vcp_hal/usbd_desc.c \
@ -283,31 +283,31 @@ VCP_SRC = \
MCU_COMMON_SRC = \
startup/system_stm32h7xx.c \
drivers/system_stm32h7xx.c \
drivers/timer_hal.c \
drivers/timer_stm32h7xx.c \
drivers/serial_uart_hal.c \
drivers/serial_uart_stm32h7xx.c \
drivers/bus_quadspi_hal.c \
drivers/bus_spi_ll.c \
drivers/dma_stm32h7xx.c \
drivers/stm32/system_stm32h7xx.c \
drivers/stm32/timer_hal.c \
drivers/stm32/timer_stm32h7xx.c \
drivers/stm32/serial_uart_hal.c \
drivers/stm32/serial_uart_stm32h7xx.c \
drivers/stm32/bus_quadspi_hal.c \
drivers/stm32/bus_spi_ll.c \
drivers/stm32/dma_stm32h7xx.c \
drivers/dshot_bitbang.c \
drivers/dshot_bitbang_decode.c \
drivers/dshot_bitbang_ll.c \
drivers/light_ws2811strip_hal.c \
drivers/adc_stm32h7xx.c \
drivers/bus_i2c_hal.c \
drivers/bus_i2c_hal_init.c \
drivers/stm32/dshot_bitbang_ll.c \
drivers/stm32/light_ws2811strip_hal.c \
drivers/stm32/adc_stm32h7xx.c \
drivers/stm32/bus_i2c_hal.c \
drivers/stm32/bus_i2c_hal_init.c \
drivers/bus_i2c_timing.c \
drivers/pwm_output_dshot_hal.c \
drivers/stm32/pwm_output_dshot_hal.c \
drivers/pwm_output_dshot_shared.c \
drivers/persistent.c \
drivers/transponder_ir_io_hal.c \
drivers/audio_stm32h7xx.c \
drivers/memprot_hal.c \
drivers/memprot_stm32h7xx.c \
drivers/sdio_h7xx.c \
drivers/bus_quadspi_hal.c \
drivers/stm32/transponder_ir_io_hal.c \
drivers/stm32/audio_stm32h7xx.c \
drivers/stm32/memprot_hal.c \
drivers/stm32/memprot_stm32h7xx.c \
drivers/stm32/sdio_h7xx.c \
drivers/stm32/bus_quadspi_hal.c \
drivers/bus_quadspi.c
MCU_EXCLUDES = \
@ -316,7 +316,7 @@ MCU_EXCLUDES = \
MSC_SRC = \
drivers/usb_msc_common.c \
drivers/usb_msc_h7xx.c \
drivers/stm32/usb_msc_h7xx.c \
msc/usbd_storage.c \
msc/usbd_storage_emfat.c \
msc/emfat.c \