Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 11:29:58 +03:00
Code Issues Wiki Activity

Cleanup make (#12179)

Browse source 
* Cleanup Makefiles

Given the targets are now simply the MCU, there is now a significant amount of duplication.

TODO:
- will possibly add STM32.mk for inclusion from STM32F4 etc to remove further duplication.

Noting it is now imperative that the gating is right.

* Removed the remnants of "features"

* Further clean up in preparation of new MCUs

* Typo for STM32F722xx

* Fix F411

* Last remnants of the _TARGETS lists.
This commit is contained in:
J Blackman 2023-01-29 11:51:06 +11:00 • committed by GitHub
parent d9264045b3
commit ecdbba2ce2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 152 additions and 580 deletions
Download patch file Download diff file Expand all files Collapse all files

63
Makefile
View file

@ -15,7 +15,7 @@
# Things that the user might override on the commandline # Things that the user might override on the commandline
# #
# The target to build, see VALID_TARGETS below # The target to build, see BASE_TARGETS below
TARGET ?= STM32F405 TARGET ?= STM32F405
BOARD ?= BOARD ?=
@ -94,15 +94,14 @@ include $(ROOT)/make/tools.mk
# default xtal value for F4 targets # default xtal value for F4 targets
HSE_VALUE ?= 8000000 HSE_VALUE ?= 8000000
# used for turning on features like VCP and SDCARD
FEATURES =
ifneq ($(BOARD),) ifneq ($(BOARD),)
# silently ignore if the file is not present. Allows for target defaults. # silently ignore if the file is not present. Allows for target defaults.
-include $(ROOT)/src/main/board/$(BOARD)/board.mk -include $(ROOT)/src/main/board/$(BOARD)/board.mk
endif endif
include $(ROOT)/make/targets.mk BASE_TARGETS = $(sort $(notdir $(patsubst %/,%,$(dir $(wildcard $(ROOT)/src/main/target/*/target.mk)))))
CI_TARGETS := $(BASE_TARGETS)
include $(ROOT)/src/main/target/$(TARGET)/target.mk
REVISION := norevision REVISION := norevision
ifeq ($(shell git diff --shortstat),) ifeq ($(shell git diff --shortstat),)
@ -149,7 +148,16 @@ VPATH := $(VPATH):$(ROOT)/make/mcu
VPATH := $(VPATH):$(ROOT)/make VPATH := $(VPATH):$(ROOT)/make
# start specific includes # start specific includes
include $(ROOT)/make/mcu/$(TARGET_MCU).mk ifeq ($(TARGET_MCU),)
$(error No TARGET_MCU specified. Is the target.mk valid for $(TARGET)?)
endif
ifeq ($(TARGET_MCU_FAMILY),)
$(error No TARGET_MCU_FAMILY specified. Is the target.mk valid for $(TARGET)?)
endif
TARGET_FLAGS := -D$(TARGET) -D$(TARGET_MCU_FAMILY) $(TARGET_FLAGS)
include $(ROOT)/make/mcu/$(TARGET_MCU_FAMILY).mk
# openocd specific includes # openocd specific includes
include $(ROOT)/make/openocd.mk include $(ROOT)/make/openocd.mk
@ -438,18 +446,13 @@ $(OBJECT_DIR)/$(TARGET)/%.o: %.S
## all : Build all currently built targets ## all : Build all currently built targets
all: $(CI_TARGETS) all: $(CI_TARGETS)
## all_all : Build all targets (including legacy / unsupported) $(BASE_TARGETS):
all_all: $(VALID_TARGETS)
$(VALID_TARGETS):
$(V0) @echo "Building $@" && \ $(V0) @echo "Building $@" && \
$(MAKE) hex TARGET=$@ && \ $(MAKE) hex TARGET=$@ && \
echo "Building $@ succeeded." echo "Building $@ succeeded."
$(NOBUILD_TARGETS):
$(MAKE) TARGET=$@
TARGETS_CLEAN = $(addsuffix _clean,$(VALID_TARGETS)) TARGETS_CLEAN = $(addsuffix _clean,$(BASE_TARGETS))
## clean : clean up temporary / machine-generated files ## clean : clean up temporary / machine-generated files
clean: clean:
@ -469,10 +472,10 @@ test_clean:
$(TARGETS_CLEAN): $(TARGETS_CLEAN):
$(V0) $(MAKE) -j TARGET=$(subst _clean,,$@) clean $(V0) $(MAKE) -j TARGET=$(subst _clean,,$@) clean
## clean_all : clean all valid targets ## clean_all : clean all targets
clean_all: $(TARGETS_CLEAN) test_clean clean_all: $(TARGETS_CLEAN) test_clean
TARGETS_FLASH = $(addsuffix _flash,$(VALID_TARGETS)) TARGETS_FLASH = $(addsuffix _flash,$(BASE_TARGETS))
## <TARGET>_flash : build and flash a target ## <TARGET>_flash : build and flash a target
$(TARGETS_FLASH): $(TARGETS_FLASH):
@ -510,7 +513,7 @@ openocd-gdb: $(TARGET_ELF)
$(V0) $(OPENOCD_COMMAND) & $(CROSS_GDB) $(TARGET_ELF) -ex "target remote localhost:3333" -ex "load" $(V0) $(OPENOCD_COMMAND) & $(CROSS_GDB) $(TARGET_ELF) -ex "target remote localhost:3333" -ex "load"
endif endif
TARGETS_ZIP = $(addsuffix _zip,$(VALID_TARGETS)) TARGETS_ZIP = $(addsuffix _zip,$(BASE_TARGETS))
## <TARGET>_zip : build target and zip it (useful for posting to GitHub) ## <TARGET>_zip : build target and zip it (useful for posting to GitHub)
$(TARGETS_ZIP): $(TARGETS_ZIP):
@ -526,7 +529,7 @@ binary:
hex: hex:
$(V0) $(MAKE) -j $(TARGET_HEX) $(V0) $(MAKE) -j $(TARGET_HEX)
TARGETS_REVISION = $(addsuffix _rev,$(VALID_TARGETS)) TARGETS_REVISION = $(addsuffix _rev,$(BASE_TARGETS))
## <TARGET>_rev : build target and add revision to filename ## <TARGET>_rev : build target and add revision to filename
$(TARGETS_REVISION): $(TARGETS_REVISION):
$(V0) $(MAKE) hex_rev TARGET=$(subst _rev,,$@) $(V0) $(MAKE) hex_rev TARGET=$(subst _rev,,$@)
@ -571,13 +574,13 @@ help: Makefile make/tools.mk
@echo "Or:" @echo "Or:"
@echo " make <target> [V=<verbosity>] [OPTIONS=\"<options>\"]" @echo " make <target> [V=<verbosity>] [OPTIONS=\"<options>\"]"
@echo "" @echo ""
@echo "Valid TARGET values are: $(VALID_TARGETS)" @echo "Valid TARGET values are: $(BASE_TARGETS)"
@echo "" @echo ""
@sed -n 's/^## //p' $? @sed -n 's/^## //p' $?
## targets : print a list of all valid target platforms (for consumption by scripts) ## targets : print a list of all valid target platforms (for consumption by scripts)
targets: targets:
@echo "Valid targets: $(VALID_TARGETS)" @echo "Valid targets: $(BASE_TARGETS)"
@echo "Built targets: $(CI_TARGETS)" @echo "Built targets: $(CI_TARGETS)"
@echo "Default target: $(TARGET)" @echo "Default target: $(TARGET)"
@ -586,7 +589,7 @@ targets-ci-print:
## target-mcu : print the MCU type of the target ## target-mcu : print the MCU type of the target
target-mcu: target-mcu:
@echo $(TARGET_MCU) @echo "$(TARGET_MCU_FAMILY) : $(TARGET_MCU)"
## targets-by-mcu : make all targets that have a MCU_TYPE mcu ## targets-by-mcu : make all targets that have a MCU_TYPE mcu
targets-by-mcu: targets-by-mcu:
@ -607,26 +610,6 @@ targets-by-mcu:
done done
@echo @echo
## targets-f4 : make all F4 targets
targets-f4:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F4 TARGETS="$(VALID_TARGETS)" DO_BUILD=1
targets-f4-print:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F4 TARGETS="$(VALID_TARGETS)"
targets-ci-f4-print:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F4 TARGETS="$(CI_TARGETS)"
## targets-f7 : make all F7 targets
targets-f7:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F7 TARGETS="$(VALID_TARGETS)" DO_BUILD=1
targets-f7-print:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F7 TARGETS="$(VALID_TARGETS)"
targets-ci-f7-print:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F7 TARGETS="$(CI_TARGETS)"
## test : run the Betaflight test suite ## test : run the Betaflight test suite
## junittest : run the Betaflight test suite, producing Junit XML result files. ## junittest : run the Betaflight test suite, producing Junit XML result files.
## test-representative: run a representative subset of the Betaflight test suite (i.e. run all tests, but run each expanded test only for one target) ## test-representative: run a representative subset of the Betaflight test suite (i.e. run all tests, but run each expanded test only for one target)

1
make/mcu/SITL.mk
View file

@ -10,7 +10,6 @@ DEVICE_FLAGS =
LD_SCRIPT = src/main/target/SITL/pg.ld LD_SCRIPT = src/main/target/SITL/pg.ld
STARTUP_SRC = STARTUP_SRC =
TARGET_FLAGS = -D$(TARGET)
MCU_FLASH_SIZE := 2048 MCU_FLASH_SIZE := 2048
ARM_SDK_PREFIX = ARM_SDK_PREFIX =

57
make/mcu/STM32F4.mk
View file

@ -33,14 +33,8 @@ EXCLUDES = stm32f4xx_crc.c \
stm32f4xx_hash_sha1.c stm32f4xx_hash_sha1.c
endif endif
ifeq ($(TARGET),$(filter $(TARGET), $(F411_TARGETS))) ifeq ($(TARGET_MCU),$(filter $(TARGET_MCU),STM32F411xE STM32F446xx))
EXCLUDES += stm32f4xx_fsmc.c EXCLUDES += stm32f4xx_fsmc.c
MCU_FLASH_SIZE := 512
else ifeq ($(TARGET),$(filter $(TARGET), $(F446_TARGETS)))
EXCLUDES += stm32f4xx_fsmc.c
MCU_FLASH_SIZE := 512
else
MCU_FLASH_SIZE := 1024
endif endif
STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC)) STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
@ -125,33 +119,27 @@ INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(ROOT)/src/main/vcpf4 $(ROOT)/src/main/vcpf4
endif endif
ifneq ($(filter SDCARD_SPI,$(FEATURES)),)
INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(FATFS_DIR)
VPATH := $(VPATH):$(FATFS_DIR)
endif
ifneq ($(filter SDCARD_SDIO,$(FEATURES)),)
INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(FATFS_DIR)
VPATH := $(VPATH):$(FATFS_DIR)
endif
#Flags #Flags
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant ARCH_FLAGS = -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
ifeq ($(TARGET),$(filter $(TARGET),$(F411_TARGETS))) ifeq ($(TARGET_MCU),STM32F411xE)
DEVICE_FLAGS = -DSTM32F411xE -finline-limit=20 DEVICE_FLAGS = -DSTM32F411xE -finline-limit=20
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f411.ld LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f411.ld
STARTUP_SRC = startup_stm32f411xe.s STARTUP_SRC = startup_stm32f411xe.s
else ifeq ($(TARGET),$(filter $(TARGET),$(F405_TARGETS))) 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 LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f405.ld
STARTUP_SRC = startup_stm32f40xx.s STARTUP_SRC = startup_stm32f40xx.s
else ifeq ($(TARGET),$(filter $(TARGET),$(F446_TARGETS))) MCU_FLASH_SIZE := 1024
else ifeq ($(TARGET_MCU),STM32F446xx)
DEVICE_FLAGS = -DSTM32F446xx DEVICE_FLAGS = -DSTM32F446xx
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f446.ld LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f446.ld
STARTUP_SRC = startup_stm32f446xx.s STARTUP_SRC = startup_stm32f446xx.s
MCU_FLASH_SIZE := 512
else else
$(error Unknown MCU for F4 target) $(error Unknown MCU for F4 target)
endif endif
@ -176,7 +164,8 @@ MCU_COMMON_SRC = \
drivers/serial_uart_stm32f4xx.c \ drivers/serial_uart_stm32f4xx.c \
drivers/system_stm32f4xx.c \ drivers/system_stm32f4xx.c \
drivers/timer_stm32f4xx.c \ drivers/timer_stm32f4xx.c \
drivers/persistent.c drivers/persistent.c \
drivers/sdio_f4xx.c
ifeq ($(PERIPH_DRIVER), HAL) ifeq ($(PERIPH_DRIVER), HAL)
VCP_SRC = \ VCP_SRC = \
@ -200,26 +189,12 @@ MSC_SRC = \
drivers/usb_msc_common.c \ drivers/usb_msc_common.c \
drivers/usb_msc_f4xx.c \ drivers/usb_msc_f4xx.c \
msc/usbd_msc_desc.c \ msc/usbd_msc_desc.c \
msc/usbd_storage.c msc/usbd_storage.c \
ifneq ($(filter SDCARD_SPI,$(FEATURES)),)
MSC_SRC += \
msc/usbd_storage_sd_spi.c
endif
ifneq ($(filter SDCARD_SDIO,$(FEATURES)),)
MSC_SRC += \
msc/usbd_storage_sdio.c
MCU_COMMON_SRC += \
drivers/sdio_f4xx.c
endif
ifneq ($(filter ONBOARDFLASH,$(FEATURES)),)
MSC_SRC += \
msc/usbd_storage_emfat.c \ msc/usbd_storage_emfat.c \
msc/emfat.c \ msc/emfat.c \
msc/emfat_file.c msc/emfat_file.c \
endif msc/usbd_storage_sd_spi.c \
msc/usbd_storage_sdio.c
DSP_LIB := $(ROOT)/lib/main/CMSIS/DSP DSP_LIB := $(ROOT)/lib/main/CMSIS/DSP
DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM4 DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM4

47
make/mcu/STM32F7.mk
View file

@ -110,40 +110,28 @@ INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(ROOT)/lib/main/STM32F7/Drivers/CMSIS/Device/ST/STM32F7xx/Include \ $(ROOT)/lib/main/STM32F7/Drivers/CMSIS/Device/ST/STM32F7xx/Include \
$(ROOT)/src/main/vcp_hal $(ROOT)/src/main/vcp_hal
ifneq ($(filter SDCARD_SPI,$(FEATURES)),)
INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(FATFS_DIR)
VPATH := $(VPATH):$(FATFS_DIR)
endif
ifneq ($(filter SDCARD_SDIO,$(FEATURES)),)
INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(FATFS_DIR)
VPATH := $(VPATH):$(FATFS_DIR)
endif
#Flags #Flags
ARCH_FLAGS = -mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -fsingle-precision-constant ARCH_FLAGS = -mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -fsingle-precision-constant
# Flags that are used in the STM32 libraries # Flags that are used in the STM32 libraries
DEVICE_FLAGS = -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER DEVICE_FLAGS = -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER
ifeq ($(TARGET),$(filter $(TARGET),$(F7X5XI_TARGETS))) ifeq ($(TARGET_MCU),STM32F765xx)
DEVICE_FLAGS += -DSTM32F765xx DEVICE_FLAGS += -DSTM32F765xx
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f765.ld LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f765.ld
STARTUP_SRC = startup_stm32f765xx.s STARTUP_SRC = startup_stm32f765xx.s
MCU_FLASH_SIZE := 2048 MCU_FLASH_SIZE := 2048
else ifeq ($(TARGET),$(filter $(TARGET),$(F7X5XG_TARGETS))) else ifeq ($(TARGET_MCU),STM32F745xx)
DEVICE_FLAGS += -DSTM32F745xx DEVICE_FLAGS += -DSTM32F745xx
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f74x.ld LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f74x.ld
STARTUP_SRC = startup_stm32f745xx.s STARTUP_SRC = startup_stm32f745xx.s
MCU_FLASH_SIZE := 1024 MCU_FLASH_SIZE := 1024
else ifeq ($(TARGET),$(filter $(TARGET),$(F7X6XG_TARGETS))) else ifeq ($(TARGET_MCU),STM32F746xx)
DEVICE_FLAGS += -DSTM32F746xx DEVICE_FLAGS += -DSTM32F746xx
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f74x.ld LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f74x.ld
STARTUP_SRC = startup_stm32f746xx.s STARTUP_SRC = startup_stm32f746xx.s
MCU_FLASH_SIZE := 1024 MCU_FLASH_SIZE := 1024
else ifeq ($(TARGET),$(filter $(TARGET),$(F7X2RE_TARGETS))) else ifeq ($(TARGET_MCU),STM32F722xx)
DEVICE_FLAGS += -DSTM32F722xx DEVICE_FLAGS += -DSTM32F722xx
ifndef LD_SCRIPT ifndef LD_SCRIPT
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f722.ld LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f722.ld
@ -158,8 +146,6 @@ $(error Unknown MCU for F7 target)
endif endif
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE)
TARGET_FLAGS = -D$(TARGET)
VCP_SRC = \ VCP_SRC = \
vcp_hal/usbd_desc.c \ vcp_hal/usbd_desc.c \
vcp_hal/usbd_conf_stm32f7xx.c \ vcp_hal/usbd_conf_stm32f7xx.c \
@ -190,7 +176,8 @@ MCU_COMMON_SRC = \
drivers/timer_stm32f7xx.c \ drivers/timer_stm32f7xx.c \
drivers/system_stm32f7xx.c \ drivers/system_stm32f7xx.c \
drivers/serial_uart_hal.c \ drivers/serial_uart_hal.c \
drivers/serial_uart_stm32f7xx.c drivers/serial_uart_stm32f7xx.c \
drivers/sdio_f7xx.c
MCU_EXCLUDES = \ MCU_EXCLUDES = \
drivers/bus_i2c.c \ drivers/bus_i2c.c \
@ -199,26 +186,12 @@ MCU_EXCLUDES = \
MSC_SRC = \ MSC_SRC = \
drivers/usb_msc_common.c \ drivers/usb_msc_common.c \
drivers/usb_msc_f7xx.c \ drivers/usb_msc_f7xx.c \
msc/usbd_storage.c msc/usbd_storage.c \
ifneq ($(filter SDCARD_SDIO,$(FEATURES)),)
MCU_COMMON_SRC += \
drivers/sdio_f7xx.c
MSC_SRC += \
msc/usbd_storage_sdio.c
endif
ifneq ($(filter SDCARD_SPI,$(FEATURES)),)
MSC_SRC += \
msc/usbd_storage_sd_spi.c
endif
ifneq ($(filter ONBOARDFLASH,$(FEATURES)),)
MSC_SRC += \
msc/usbd_storage_emfat.c \ msc/usbd_storage_emfat.c \
msc/emfat.c \ msc/emfat.c \
msc/emfat_file.c msc/emfat_file.c \
endif msc/usbd_storage_sdio.c \
msc/usbd_storage_sd_spi.c
DSP_LIB := $(ROOT)/lib/main/CMSIS/DSP DSP_LIB := $(ROOT)/lib/main/CMSIS/DSP
DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM7 DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM7

38
make/mcu/STM32G4.mk
View file

@ -113,18 +113,6 @@ INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(ROOT)/lib/main/STM32G4/Drivers/CMSIS/Device/ST/STM32G4xx/Include \ $(ROOT)/lib/main/STM32G4/Drivers/CMSIS/Device/ST/STM32G4xx/Include \
$(ROOT)/src/main/vcp_hal $(ROOT)/src/main/vcp_hal
ifneq ($(filter SDCARD_SPI,$(FEATURES)),)
INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(FATFS_DIR)
VPATH := $(VPATH):$(FATFS_DIR)
endif
ifneq ($(filter SDCARD_SDIO,$(FEATURES)),)
INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(FATFS_DIR)
VPATH := $(VPATH):$(FATFS_DIR)
endif
#Flags #Flags
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant ARCH_FLAGS = -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
@ -132,7 +120,7 @@ DEVICE_FLAGS = -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -DUSE_DMA_RAM -DMAX_MPU_
# G47X_TARGETS includes G47{3,4}{RE,CE,CEU} # G47X_TARGETS includes G47{3,4}{RE,CE,CEU}
ifeq ($(TARGET),$(filter $(TARGET),$(G47X_TARGETS))) ifeq ($(TARGET_MCU),STM32G474xx)
DEVICE_FLAGS += -DSTM32G474xx DEVICE_FLAGS += -DSTM32G474xx
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_g474.ld LD_SCRIPT = $(LINKER_DIR)/stm32_flash_g474.ld
STARTUP_SRC = startup_stm32g474xx.s STARTUP_SRC = startup_stm32g474xx.s
@ -145,8 +133,6 @@ $(error Unknown MCU for G4 target)
endif endif
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE)
TARGET_FLAGS = -D$(TARGET)
VCP_SRC = \ VCP_SRC = \
vcp_hal/usbd_desc.c \ vcp_hal/usbd_desc.c \
vcp_hal/usbd_conf_stm32g4xx.c \ vcp_hal/usbd_conf_stm32g4xx.c \
@ -188,26 +174,12 @@ MCU_EXCLUDES = \
MSC_SRC = \ MSC_SRC = \
drivers/usb_msc_common.c \ drivers/usb_msc_common.c \
drivers/usb_msc_f7xx.c \ drivers/usb_msc_f7xx.c \
msc/usbd_storage.c msc/usbd_storage.c \
ifneq ($(filter SDCARD_SDIO,$(FEATURES)),)
MCU_COMMON_SRC += \
drivers/sdio_g4xx.c
MSC_SRC += \
msc/usbd_storage_sdio.c
endif
ifneq ($(filter SDCARD_SPI,$(FEATURES)),)
MSC_SRC += \
msc/usbd_storage_sd_spi.c
endif
ifneq ($(filter ONBOARDFLASH,$(FEATURES)),)
MSC_SRC += \
msc/usbd_storage_emfat.c \ msc/usbd_storage_emfat.c \
msc/emfat.c \ msc/emfat.c \
msc/emfat_file.c msc/emfat_file.c \
endif msc/usbd_storage_sdio.c \
msc/usbd_storage_sd_spi.c
DSP_LIB := $(ROOT)/lib/main/CMSIS/DSP DSP_LIB := $(ROOT)/lib/main/CMSIS/DSP
DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM4 DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM4

64
make/mcu/STM32H7.mk
View file

@ -3,7 +3,7 @@
# #
ifeq ($(DEBUG_HARDFAULTS),H7) ifeq ($(DEBUG_HARDFAULTS),H7)
CFLAGS += -DDEBUG_HARDFAULTS CFLAGS += -DDEBUG_HARDFAULTS
endif endif
#CMSIS #CMSIS
@ -90,7 +90,6 @@ EXCLUDES = \
stm32h7xx_ll_usart.c \ stm32h7xx_ll_usart.c \
stm32h7xx_ll_utils.c stm32h7xx_ll_utils.c
STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC)) STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
#USB #USB
@ -134,18 +133,6 @@ INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(ROOT)/lib/main/STM32H7/Drivers/CMSIS/Device/ST/STM32H7xx/Include \ $(ROOT)/lib/main/STM32H7/Drivers/CMSIS/Device/ST/STM32H7xx/Include \
$(ROOT)/src/main/vcp_hal $(ROOT)/src/main/vcp_hal
ifneq ($(filter SDCARD_SPI,$(FEATURES)),)
INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(FATFS_DIR)
VPATH := $(VPATH):$(FATFS_DIR)
endif
ifneq ($(filter SDCARD_SDIO,$(FEATURES)),)
INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(FATFS_DIR)
VPATH := $(VPATH):$(FATFS_DIR)
endif
#Flags #Flags
ARCH_FLAGS = -mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -fsingle-precision-constant ARCH_FLAGS = -mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -fsingle-precision-constant
@ -158,7 +145,7 @@ DEVICE_FLAGS = -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER
# H7A3xI : 2M FLASH, 1MB AXI SRAM + 160KB AHB & SRD SRAM # H7A3xI : 2M FLASH, 1MB AXI SRAM + 160KB AHB & SRD SRAM
# H750xB : 128K FLASH, 1M RAM # H750xB : 128K FLASH, 1M RAM
# #
ifeq ($(TARGET),$(filter $(TARGET),$(H743xI_TARGETS))) ifeq ($(TARGET_MCU),STM32H743xx)
DEVICE_FLAGS += -DSTM32H743xx DEVICE_FLAGS += -DSTM32H743xx
DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h743_2m.ld DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h743_2m.ld
STARTUP_SRC = startup_stm32h743xx.s STARTUP_SRC = startup_stm32h743xx.s
@ -173,7 +160,7 @@ MCU_FLASH_SIZE := FIRMWARE_SIZE
DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_ram_h743.ld DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_ram_h743.ld
endif endif
else ifeq ($(TARGET),$(filter $(TARGET),$(H7A3xIQ_TARGETS))) else ifeq ($(TARGET_MCU),STM32H7A3xxQ)
DEVICE_FLAGS += -DSTM32H7A3xxQ DEVICE_FLAGS += -DSTM32H7A3xxQ
DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h7a3_2m.ld DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h7a3_2m.ld
STARTUP_SRC = startup_stm32h7a3xx.s STARTUP_SRC = startup_stm32h7a3xx.s
@ -188,7 +175,7 @@ MCU_FLASH_SIZE := FIRMWARE_SIZE
DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h7a3_ram_based.ld DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h7a3_ram_based.ld
endif endif
else ifeq ($(TARGET),$(filter $(TARGET),$(H7A3xI_TARGETS))) else ifeq ($(TARGET_MCU),STM32H7A3xx)
DEVICE_FLAGS += -DSTM32H7A3xx DEVICE_FLAGS += -DSTM32H7A3xx
DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h7a3_2m.ld DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h7a3_2m.ld
STARTUP_SRC = startup_stm32h7a3xx.s STARTUP_SRC = startup_stm32h7a3xx.s
@ -203,21 +190,21 @@ MCU_FLASH_SIZE := FIRMWARE_SIZE
DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h7a3_ram_based.ld DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h7a3_ram_based.ld
endif endif
else ifeq ($(TARGET),$(filter $(TARGET),$(H723xG_TARGETS))) else ifeq ($(TARGET_MCU),STM32H723xx)
DEVICE_FLAGS += -DSTM32H723xx DEVICE_FLAGS += -DSTM32H723xx
DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h723_1m.ld DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h723_1m.ld
STARTUP_SRC = startup_stm32h723xx.s STARTUP_SRC = startup_stm32h723xx.s
MCU_FLASH_SIZE := 1024 MCU_FLASH_SIZE := 1024
DEVICE_FLAGS += -DMAX_MPU_REGIONS=16 DEVICE_FLAGS += -DMAX_MPU_REGIONS=16
else ifeq ($(TARGET),$(filter $(TARGET),$(H725xG_TARGETS))) else ifeq ($(TARGET_MCU),STM32H725xx)
DEVICE_FLAGS += -DSTM32H725xx DEVICE_FLAGS += -DSTM32H725xx
DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h723_1m.ld DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h723_1m.ld
STARTUP_SRC = startup_stm32h723xx.s STARTUP_SRC = startup_stm32h723xx.s
MCU_FLASH_SIZE := 1024 MCU_FLASH_SIZE := 1024
DEVICE_FLAGS += -DMAX_MPU_REGIONS=16 DEVICE_FLAGS += -DMAX_MPU_REGIONS=16
else ifeq ($(TARGET),$(filter $(TARGET),$(H730xB_TARGETS))) else ifeq ($(TARGET_MCU),STM32H730xx)
DEVICE_FLAGS += -DSTM32H730xx DEVICE_FLAGS += -DSTM32H730xx
DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h730_128m.ld DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h730_128m.ld
STARTUP_SRC = startup_stm32h730xx.s STARTUP_SRC = startup_stm32h730xx.s
@ -226,7 +213,7 @@ DEVICE_FLAGS += -DMAX_MPU_REGIONS=16
ifeq ($(TARGET_FLASH),) ifeq ($(TARGET_FLASH),)
MCU_FLASH_SIZE := $(DEFAULT_TARGET_FLASH) MCU_FLASH_SIZE := $(DEFAULT_TARGET_FLASH)
endif endif
ifeq ($(EXST),yes) ifeq ($(EXST),yes)
@ -239,14 +226,14 @@ LD_SCRIPTS = $(LINKER_DIR)/stm32_h730_common.ld $(LINKER_DIR)/stm32_h73
endif endif
else ifeq ($(TARGET),$(filter $(TARGET),$(H750xB_TARGETS))) else ifeq ($(TARGET_MCU),STM32H750xx)
DEVICE_FLAGS += -DSTM32H750xx DEVICE_FLAGS += -DSTM32H750xx
DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h750_128k.ld DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h750_128k.ld
STARTUP_SRC = startup_stm32h743xx.s STARTUP_SRC = startup_stm32h743xx.s
DEFAULT_TARGET_FLASH := 128 DEFAULT_TARGET_FLASH := 128
ifeq ($(TARGET_FLASH),) ifeq ($(TARGET_FLASH),)
MCU_FLASH_SIZE := $(DEFAULT_TARGET_FLASH) MCU_FLASH_SIZE := $(DEFAULT_TARGET_FLASH)
endif endif
ifeq ($(EXST),yes) ifeq ($(EXST),yes)
@ -281,13 +268,11 @@ LD_SCRIPT = $(DEFAULT_LD_SCRIPT)
endif endif
ifneq ($(FIRMWARE_SIZE),) ifneq ($(FIRMWARE_SIZE),)
DEVICE_FLAGS += -DFIRMWARE_SIZE=$(FIRMWARE_SIZE) DEVICE_FLAGS += -DFIRMWARE_SIZE=$(FIRMWARE_SIZE)
endif endif
DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) -DHSE_STARTUP_TIMEOUT=1000 DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) -DHSE_STARTUP_TIMEOUT=1000
TARGET_FLAGS = -D$(TARGET)
VCP_SRC = \ VCP_SRC = \
vcp_hal/usbd_desc.c \ vcp_hal/usbd_desc.c \
vcp_hal/usbd_conf_stm32h7xx.c \ vcp_hal/usbd_conf_stm32h7xx.c \
@ -321,7 +306,9 @@ MCU_COMMON_SRC = \
drivers/audio_stm32h7xx.c \ drivers/audio_stm32h7xx.c \
drivers/memprot_hal.c \ drivers/memprot_hal.c \
drivers/memprot_stm32h7xx.c \ drivers/memprot_stm32h7xx.c \
#drivers/accgyro/accgyro_mpu.c \ drivers/sdio_h7xx.c \
drivers/bus_quadspi_hal.c \
drivers/bus_quadspi.c
MCU_EXCLUDES = \ MCU_EXCLUDES = \
drivers/bus_i2c.c \ drivers/bus_i2c.c \
@ -330,27 +317,12 @@ MCU_EXCLUDES = \
MSC_SRC = \ MSC_SRC = \
drivers/usb_msc_common.c \ drivers/usb_msc_common.c \
drivers/usb_msc_h7xx.c \ drivers/usb_msc_h7xx.c \
msc/usbd_storage.c msc/usbd_storage.c \
ifneq ($(filter SDCARD_SDIO,$(FEATURES)),)
MCU_COMMON_SRC += \
drivers/sdio_h7xx.c
MSC_SRC += \
msc/usbd_storage_sdio.c
endif
ifneq ($(filter SDCARD_SPI,$(FEATURES)),)
MSC_SRC += \
msc/usbd_storage_sd_spi.c
endif
ifneq ($(filter ONBOARDFLASH,$(FEATURES)),)
MSC_SRC += \
msc/usbd_storage_emfat.c \ msc/usbd_storage_emfat.c \
msc/emfat.c \ msc/emfat.c \
msc/emfat_file.c msc/emfat_file.c \
endif msc/usbd_storage_sdio.c \
msc/usbd_storage_sd_spi.c
DSP_LIB := $(ROOT)/lib/main/CMSIS/DSP DSP_LIB := $(ROOT)/lib/main/CMSIS/DSP
DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM7 DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM7

94
make/source.mk
View file

@ -203,11 +203,63 @@ COMMON_SRC = \
io/vtx_msp.c \ io/vtx_msp.c \
cms/cms_menu_vtx_msp.c cms/cms_menu_vtx_msp.c
ifneq ($(SIMULATOR_BUILD),yes)
COMMON_SRC += \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.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/max7456.c \
drivers/vtx_rtc6705.c \
drivers/vtx_rtc6705_soft_spi.c
RX_SRC = \
rx/cc2500_common.c \
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_sfhss.c \
rx/cc2500_redpine.c \
rx/a7105_flysky.c \
rx/cyrf6936_spektrum.c \
drivers/rx/expresslrs_driver.c \
rx/expresslrs.c \
rx/expresslrs_common.c \
rx/expresslrs_telemetry.c \
drivers/rx/rx_cc2500.c \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
drivers/rx/rx_sx1280.c
FLASH_SRC += \
drivers/flash.c \
drivers/flash_m25p16.c \
drivers/flash_w25n01g.c \
drivers/flash_w25q128fv.c \
drivers/flash_w25m.c \
io/flashfs.c
SDCARD_SRC += \
drivers/sdcard.c \
drivers/sdcard_spi.c \
drivers/sdcard_sdio_baremetal.c \
drivers/sdcard_standard.c \
io/asyncfatfs/asyncfatfs.c \
io/asyncfatfs/fat_standard.c
INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(FATFS_DIR)
VPATH := $(VPATH):$(FATFS_DIR)
endif
COMMON_DEVICE_SRC = \ COMMON_DEVICE_SRC = \
$(CMSIS_SRC) \ $(CMSIS_SRC) \
$(DEVICE_STDPERIPH_SRC) $(DEVICE_STDPERIPH_SRC)
COMMON_SRC := $(COMMON_SRC) $(COMMON_DEVICE_SRC) COMMON_SRC := $(COMMON_SRC) $(COMMON_DEVICE_SRC) $(RX_SRC)
ifeq ($(EXST),yes) ifeq ($(EXST),yes)
TARGET_FLAGS := -DUSE_EXST $(TARGET_FLAGS) TARGET_FLAGS := -DUSE_EXST $(TARGET_FLAGS)
@ -401,53 +453,17 @@ NOT_OPTIMISED_SRC := $(NOT_OPTIMISED_SRC) \
ifneq ($(DSP_LIB),) ifneq ($(DSP_LIB),)
INCLUDE_DIRS += $(DSP_LIB)/Include INCLUDE_DIRS += $(DSP_LIB)/Include
SRC += $(wildcard $(DSP_LIB)/Source/*/*.S) SRC += $(wildcard $(DSP_LIB)/Source/*/*.S)
endif endif
ifneq ($(filter ONBOARDFLASH,$(FEATURES)),) SRC += $(FLASH_SRC) $(MSC_SRC) $(SDCARD_SRC) $(COMMON_SRC)
SRC += \
drivers/flash.c \
drivers/flash_m25p16.c \
drivers/flash_w25n01g.c \
drivers/flash_w25q128fv.c \
drivers/flash_w25m.c \
io/flashfs.c \
$(MSC_SRC)
endif
SRC += $(COMMON_SRC)
#excludes #excludes
SRC := $(filter-out $(MCU_EXCLUDES), $(SRC)) SRC := $(filter-out $(MCU_EXCLUDES), $(SRC))
ifneq ($(filter SDCARD_SPI,$(FEATURES)),)
SRC += \
drivers/sdcard.c \
drivers/sdcard_spi.c \
drivers/sdcard_standard.c \
io/asyncfatfs/asyncfatfs.c \
io/asyncfatfs/fat_standard.c \
$(MSC_SRC)
endif
ifneq ($(filter SDCARD_SDIO,$(FEATURES)),)
SRC += \
drivers/sdcard.c \
drivers/sdcard_sdio_baremetal.c \
drivers/sdcard_standard.c \
io/asyncfatfs/asyncfatfs.c \
io/asyncfatfs/fat_standard.c \
$(MSC_SRC)
endif
ifneq ($(filter VCP,$(FEATURES)),)
SRC += $(VCP_SRC) SRC += $(VCP_SRC)
endif
ifneq ($(filter MSC,$(FEATURES)),)
SRC += $(MSC_SRC)
endif
# end target specific make file checks # end target specific make file checks
ifneq ($(BOARD),) ifneq ($(BOARD),)

41
make/targets.mk
View file

@ -1,41 +0,0 @@
BASE_TARGETS = $(sort $(notdir $(patsubst %/,%,$(dir $(wildcard $(ROOT)/src/main/target/*/target.mk)))))
VALID_TARGETS = $(sort $(BASE_TARGETS))
CI_TARGETS := $(VALID_TARGETS)
include $(ROOT)/src/main/target/$(TARGET)/target.mk
F4_TARGETS := $(F405_TARGETS) $(F411_TARGETS) $(F446_TARGETS)
F7_TARGETS := $(F7X2RE_TARGETS) $(F7X5XE_TARGETS) $(F7X5XG_TARGETS) $(F7X5XI_TARGETS) $(F7X6XG_TARGETS)
G4_TARGETS := $(G47X_TARGETS)
H7_TARGETS := $(H743xI_TARGETS) $(H750xB_TARGETS) $(H7A3xI_TARGETS) $(H7A3xIQ_TARGETS) $(H723xG_TARGETS) $(H725xG_TARGETS) $(H730xB_TARGETS)
ifeq ($(filter $(TARGET),$(VALID_TARGETS)),)
$(error Target '$(TARGET)' is not valid, must be one of $(VALID_TARGETS). Have you prepared a valid target.mk?)
endif
ifeq ($(filter $(TARGET), $(F4_TARGETS) $(F7_TARGETS) $(G4_TARGETS) $(H7_TARGETS) $(SITL_TARGETS)),)
$(error Target '$(TARGET)' has not specified a valid STM group, must be one of F405, F411, F446, F7X2RE, F7X5XE, F7X5XG, F7X5XI, F7X6XG, G47X or H7X3XI. Have you prepared a valid target.mk?)
endif
ifeq ($(TARGET),$(filter $(TARGET), $(F4_TARGETS)))
TARGET_MCU := STM32F4
else ifeq ($(TARGET),$(filter $(TARGET), $(F7_TARGETS)))
TARGET_MCU := STM32F7
else ifeq ($(TARGET),$(filter $(TARGET), $(G4_TARGETS)))
TARGET_MCU := STM32G4
else ifeq ($(TARGET),$(filter $(TARGET), $(H7_TARGETS)))
TARGET_MCU := STM32H7
else ifeq ($(TARGET),$(filter $(TARGET), $(SITL_TARGETS)))
TARGET_MCU := SITL
SIMULATOR_BUILD = yes
else
$(error Unknown target MCU specified.)
endif
TARGET_FLAGS := $(TARGET_FLAGS) -D$(TARGET_MCU)

5
src/main/target/SITL/target.mk
View file

@ -1,5 +1,6 @@
SITL_TARGETS += $(TARGET) TARGET_MCU := SITL
FEATURES += #SDCARD_SPI VCP TARGET_MCU_FAMILY := SITL
SIMULATOR_BUILD = yes
TARGET_SRC = \ TARGET_SRC = \
drivers/accgyro/accgyro_fake.c \ drivers/accgyro/accgyro_fake.c \

34
src/main/target/STM32F405/target.mk
View file

@ -1,34 +1,4 @@
RX_SRC = \ TARGET_MCU := STM32F405xx
rx/cc2500_common.c \ TARGET_MCU_FAMILY := STM32F4
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_sfhss.c \
rx/cc2500_redpine.c \
rx/a7105_flysky.c \
rx/cyrf6936_spektrum.c \
drivers/rx/expresslrs_driver.c \
rx/expresslrs.c \
rx/expresslrs_common.c \
rx/expresslrs_telemetry.c \
drivers/rx/rx_cc2500.c \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
drivers/rx/rx_sx1280.c \
F405_TARGETS += $(TARGET)
CUSTOM_DEFAULTS_EXTENDED = yes CUSTOM_DEFAULTS_EXTENDED = yes
FEATURES += VCP SDCARD_SPI SDCARD_SDIO ONBOARDFLASH
TARGET_SRC = \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.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/max7456.c \
drivers/vtx_rtc6705.c \
drivers/vtx_rtc6705_soft_spi.c \
$(RX_SRC)

35
src/main/target/STM32F411/target.mk
View file

@ -1,33 +1,2 @@
RX_SRC = \ TARGET_MCU := STM32F411xE
rx/cc2500_common.c \ TARGET_MCU_FAMILY := STM32F4
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_sfhss.c \
rx/cc2500_redpine.c \
rx/a7105_flysky.c \
rx/cyrf6936_spektrum.c \
drivers/rx/expresslrs_driver.c \
rx/expresslrs.c \
rx/expresslrs_common.c \
rx/expresslrs_telemetry.c \
drivers/rx/rx_cc2500.c \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
drivers/rx/rx_sx1280.c
F411_TARGETS += $(TARGET)
FEATURES += VCP SDCARD_SPI SDCARD_SDIO ONBOARDFLASH
TARGET_SRC = \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.c))) \
$(addprefix drivers/accgyro_legacy/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro_legacy/*.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/max7456.c \
drivers/vtx_rtc6705.c \
drivers/vtx_rtc6705_soft_spi.c \
$(RX_SRC)

34
src/main/target/STM32F745/target.mk
View file

@ -1,34 +1,4 @@
RX_SRC = \ TARGET_MCU := STM32F745xx
rx/cc2500_common.c \ TARGET_MCU_FAMILY := STM32F7
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_sfhss.c \
rx/cc2500_redpine.c \
rx/a7105_flysky.c \
rx/cyrf6936_spektrum.c \
drivers/rx/expresslrs_driver.c \
rx/expresslrs.c \
rx/expresslrs_common.c \
rx/expresslrs_telemetry.c \
drivers/rx/rx_cc2500.c \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
drivers/rx/rx_sx1280.c \
F7X5XG_TARGETS += $(TARGET)
CUSTOM_DEFAULTS_EXTENDED = yes CUSTOM_DEFAULTS_EXTENDED = yes
FEATURES += VCP SDCARD_SPI SDCARD_SDIO ONBOARDFLASH
TARGET_SRC = \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.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/max7456.c \
drivers/vtx_rtc6705.c \
drivers/vtx_rtc6705_soft_spi.c \
$(RX_SRC)

32
src/main/target/STM32F7X2/target.mk
View file

@ -1,32 +1,4 @@
RX_SRC = \ TARGET_MCU := STM32F722xx
rx/cc2500_common.c \ TARGET_MCU_FAMILY := STM32F7
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_sfhss.c \
rx/cc2500_redpine.c \
rx/a7105_flysky.c \
rx/cyrf6936_spektrum.c \
drivers/rx/expresslrs_driver.c \
rx/expresslrs.c \
rx/expresslrs_common.c \
rx/expresslrs_telemetry.c \
drivers/rx/rx_cc2500.c \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
drivers/rx/rx_sx1280.c \
F7X2RE_TARGETS += $(TARGET) F7X2RE_TARGETS += $(TARGET)
FEATURES += VCP SDCARD_SPI SDCARD_SDIO ONBOARDFLASH
TARGET_SRC = \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.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/max7456.c \
drivers/vtx_rtc6705.c \
drivers/vtx_rtc6705_soft_spi.c \
$(RX_SRC)

4
src/main/target/STM32G47X/target.h
View file

@ -54,9 +54,7 @@
#define USE_BEEPER #define USE_BEEPER
#ifdef USE_SDCARD #undef USE_SDCARD
#define USE_SDCARD_SPI
#endif
#define USE_SPI #define USE_SPI
#define SPI_FULL_RECONFIGURABILITY #define SPI_FULL_RECONFIGURABILITY

34
src/main/target/STM32G47X/target.mk
View file

@ -1,32 +1,2 @@
RX_SRC = \ TARGET_MCU := STM32G474xx
rx/cc2500_common.c \ TARGET_MCU_FAMILY := STM32G4
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_sfhss.c \
rx/cc2500_redpine.c \
rx/a7105_flysky.c \
rx/cyrf6936_spektrum.c \
drivers/rx/expresslrs_driver.c \
rx/expresslrs.c \
rx/expresslrs_common.c \
rx/expresslrs_telemetry.c \
drivers/rx/rx_cc2500.c \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
drivers/rx/rx_sx1280.c \
G47X_TARGETS += $(TARGET)
FEATURES += VCP SDCARD_SPI ONBOARDFLASH
TARGET_SRC = \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.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/max7456.c \
drivers/vtx_rtc6705.c \
drivers/vtx_rtc6705_soft_spi.c \
$(RX_SRC)

33
src/main/target/STM32H723/target.mk
View file

@ -1,34 +1,5 @@
RX_SRC = \ TARGET_MCU := STM32H723xx
rx/cc2500_common.c \ TARGET_MCU_FAMILY := STM32H7
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_sfhss.c \
rx/cc2500_redpine.c \
rx/a7105_flysky.c \
rx/cyrf6936_spektrum.c \
drivers/rx/expresslrs_driver.c \
rx/expresslrs.c \
rx/expresslrs_common.c \
rx/expresslrs_telemetry.c \
drivers/rx/rx_cc2500.c \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
drivers/rx/rx_sx1280.c \
H723xG_TARGETS += $(TARGET) H723xG_TARGETS += $(TARGET)
CUSTOM_DEFAULTS_EXTENDED = yes CUSTOM_DEFAULTS_EXTENDED = yes
FEATURES += VCP SDCARD_SPI SDCARD_SDIO ONBOARDFLASH
TARGET_SRC = \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.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/max7456.c \
drivers/vtx_rtc6705.c \
drivers/vtx_rtc6705_soft_spi.c \
$(RX_SRC)

40
src/main/target/STM32H730/target.mk
View file

@ -1,25 +1,7 @@
RX_SRC = \ TARGET_MCU := STM32H730xx
rx/cc2500_common.c \ TARGET_MCU_FAMILY := STM32H7
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_sfhss.c \
rx/cc2500_redpine.c \
rx/a7105_flysky.c \
rx/cyrf6936_spektrum.c \
drivers/rx/expresslrs_driver.c \
rx/expresslrs.c \
rx/expresslrs_common.c \
rx/expresslrs_telemetry.c \
drivers/rx/rx_cc2500.c \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
drivers/rx/rx_sx1280.c
H730xB_TARGETS += $(TARGET) HSE_VALUE = 8000000
HSE_VALUE = 8000000
ifneq ($(EXST),) ifneq ($(EXST),)
EXST = yes EXST = yes
@ -27,19 +9,3 @@ ifeq ($(EXST_ADJUST_VMA),)
EXST_ADJUST_VMA = 0x90100000 EXST_ADJUST_VMA = 0x90100000
endif endif
endif endif
FEATURES += VCP ONBOARDFLASH SDCARD_SDIO
TARGET_SRC = \
msc/usbd_storage_sd_spi.c \
drivers/sdcard_spi.c \
drivers/bus_quadspi_hal.c \
drivers/bus_quadspi.c \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.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/max7456.c \
drivers/vtx_rtc6705.c \
drivers/vtx_rtc6705_soft_spi.c \
$(RX_SRC)

34
src/main/target/STM32H743/target.mk
View file

@ -1,34 +1,4 @@
RX_SRC = \ TARGET_MCU := STM32H743xx
rx/cc2500_common.c \ TARGET_MCU_FAMILY := STM32H7
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_sfhss.c \
rx/cc2500_redpine.c \
rx/a7105_flysky.c \
rx/cyrf6936_spektrum.c \
drivers/rx/expresslrs_driver.c \
rx/expresslrs.c \
rx/expresslrs_common.c \
rx/expresslrs_telemetry.c \
drivers/rx/rx_cc2500.c \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
drivers/rx/rx_sx1280.c \
H743xI_TARGETS += $(TARGET)
CUSTOM_DEFAULTS_EXTENDED = yes CUSTOM_DEFAULTS_EXTENDED = yes
FEATURES += VCP SDCARD_SPI SDCARD_SDIO ONBOARDFLASH
TARGET_SRC = \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.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/max7456.c \
drivers/vtx_rtc6705.c \
drivers/vtx_rtc6705_soft_spi.c \
$(RX_SRC)

42
src/main/target/STM32H750/target.mk
View file

@ -1,25 +1,7 @@
RX_SRC = \ TARGET_MCU := STM32H750xx
rx/cc2500_common.c \ TARGET_MCU_FAMILY := STM32H7
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_sfhss.c \
rx/cc2500_redpine.c \
rx/a7105_flysky.c \
rx/cyrf6936_spektrum.c \
drivers/rx/expresslrs_driver.c \
rx/expresslrs.c \
rx/expresslrs_common.c \
rx/expresslrs_telemetry.c \
drivers/rx/rx_cc2500.c \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
drivers/rx/rx_sx1280.c
H750xB_TARGETS += $(TARGET) HSE_VALUE = 8000000
HSE_VALUE = 8000000
ifneq ($(EXST),) ifneq ($(EXST),)
EXST = yes EXST = yes
@ -28,21 +10,5 @@ endif
ifneq ($(EXST),yes) ifneq ($(EXST),yes)
TARGET_FLASH_SIZE := 1024 TARGET_FLASH_SIZE := 1024
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h750_1m.ld LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h750_1m.ld
endif endif
FEATURES += VCP ONBOARDFLASH SDCARD_SDIO
TARGET_SRC = \
msc/usbd_storage_sd_spi.c \
drivers/sdcard_spi.c \
drivers/bus_quadspi_hal.c \
drivers/bus_quadspi.c \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.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/max7456.c \
drivers/vtx_rtc6705.c \
drivers/vtx_rtc6705_soft_spi.c \
$(RX_SRC)