From ecdbba2ce2a63bd115067fbce81c12d57b83972c Mon Sep 17 00:00:00 2001 From: J Blackman Date: Sun, 29 Jan 2023 11:51:06 +1100 Subject: [PATCH] Cleanup make (#12179) * 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. --- Makefile | 63 +++++++------------ make/mcu/SITL.mk | 1 - make/mcu/STM32F4.mk | 57 +++++------------ make/mcu/STM32F7.mk | 47 +++------------ make/mcu/STM32G4.mk | 38 ++---------- make/mcu/STM32H7.mk | 64 ++++++-------------- make/source.mk | 94 +++++++++++++++++------------ make/targets.mk | 41 ------------- src/main/target/SITL/target.mk | 5 +- src/main/target/STM32F405/target.mk | 34 +---------- src/main/target/STM32F411/target.mk | 35 +---------- src/main/target/STM32F745/target.mk | 34 +---------- src/main/target/STM32F7X2/target.mk | 32 +--------- src/main/target/STM32G47X/target.h | 4 +- src/main/target/STM32G47X/target.mk | 34 +---------- src/main/target/STM32H723/target.mk | 33 +--------- src/main/target/STM32H730/target.mk | 40 +----------- src/main/target/STM32H743/target.mk | 34 +---------- src/main/target/STM32H750/target.mk | 42 ++----------- 19 files changed, 152 insertions(+), 580 deletions(-) delete mode 100644 make/targets.mk diff --git a/Makefile b/Makefile index 1dde7cc6ef..1379d929da 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # 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 BOARD ?= @@ -94,15 +94,14 @@ include $(ROOT)/make/tools.mk # default xtal value for F4 targets HSE_VALUE ?= 8000000 -# used for turning on features like VCP and SDCARD -FEATURES = - ifneq ($(BOARD),) # silently ignore if the file is not present. Allows for target defaults. -include $(ROOT)/src/main/board/$(BOARD)/board.mk 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 ifeq ($(shell git diff --shortstat),) @@ -149,7 +148,16 @@ VPATH := $(VPATH):$(ROOT)/make/mcu VPATH := $(VPATH):$(ROOT)/make # 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 include $(ROOT)/make/openocd.mk @@ -438,18 +446,13 @@ $(OBJECT_DIR)/$(TARGET)/%.o: %.S ## all : Build all currently built targets all: $(CI_TARGETS) -## all_all : Build all targets (including legacy / unsupported) -all_all: $(VALID_TARGETS) - -$(VALID_TARGETS): +$(BASE_TARGETS): $(V0) @echo "Building $@" && \ $(MAKE) hex TARGET=$@ && \ 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: @@ -469,10 +472,10 @@ test_clean: $(TARGETS_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 -TARGETS_FLASH = $(addsuffix _flash,$(VALID_TARGETS)) +TARGETS_FLASH = $(addsuffix _flash,$(BASE_TARGETS)) ## _flash : build and flash a target $(TARGETS_FLASH): @@ -510,7 +513,7 @@ openocd-gdb: $(TARGET_ELF) $(V0) $(OPENOCD_COMMAND) & $(CROSS_GDB) $(TARGET_ELF) -ex "target remote localhost:3333" -ex "load" endif -TARGETS_ZIP = $(addsuffix _zip,$(VALID_TARGETS)) +TARGETS_ZIP = $(addsuffix _zip,$(BASE_TARGETS)) ## _zip : build target and zip it (useful for posting to GitHub) $(TARGETS_ZIP): @@ -526,7 +529,7 @@ binary: hex: $(V0) $(MAKE) -j $(TARGET_HEX) -TARGETS_REVISION = $(addsuffix _rev,$(VALID_TARGETS)) +TARGETS_REVISION = $(addsuffix _rev,$(BASE_TARGETS)) ## _rev : build target and add revision to filename $(TARGETS_REVISION): $(V0) $(MAKE) hex_rev TARGET=$(subst _rev,,$@) @@ -571,13 +574,13 @@ help: Makefile make/tools.mk @echo "Or:" @echo " make [V=] [OPTIONS=\"\"]" @echo "" - @echo "Valid TARGET values are: $(VALID_TARGETS)" + @echo "Valid TARGET values are: $(BASE_TARGETS)" @echo "" @sed -n 's/^## //p' $? ## targets : print a list of all valid target platforms (for consumption by scripts) targets: - @echo "Valid targets: $(VALID_TARGETS)" + @echo "Valid targets: $(BASE_TARGETS)" @echo "Built targets: $(CI_TARGETS)" @echo "Default target: $(TARGET)" @@ -586,7 +589,7 @@ targets-ci-print: ## target-mcu : print the MCU type of the target 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: @@ -607,26 +610,6 @@ targets-by-mcu: done @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 ## 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) diff --git a/make/mcu/SITL.mk b/make/mcu/SITL.mk index 32ad3f445a..c8dcd76f33 100644 --- a/make/mcu/SITL.mk +++ b/make/mcu/SITL.mk @@ -10,7 +10,6 @@ DEVICE_FLAGS = LD_SCRIPT = src/main/target/SITL/pg.ld STARTUP_SRC = -TARGET_FLAGS = -D$(TARGET) MCU_FLASH_SIZE := 2048 ARM_SDK_PREFIX = diff --git a/make/mcu/STM32F4.mk b/make/mcu/STM32F4.mk index 65c81c45ba..1be59de09e 100644 --- a/make/mcu/STM32F4.mk +++ b/make/mcu/STM32F4.mk @@ -33,14 +33,8 @@ EXCLUDES = stm32f4xx_crc.c \ stm32f4xx_hash_sha1.c endif -ifeq ($(TARGET),$(filter $(TARGET), $(F411_TARGETS))) +ifeq ($(TARGET_MCU),$(filter $(TARGET_MCU),STM32F411xE STM32F446xx)) 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 STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC)) @@ -125,33 +119,27 @@ INCLUDE_DIRS := $(INCLUDE_DIRS) \ $(ROOT)/src/main/vcpf4 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 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 LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f411.ld 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 LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f405.ld STARTUP_SRC = startup_stm32f40xx.s -else ifeq ($(TARGET),$(filter $(TARGET),$(F446_TARGETS))) +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 +MCU_FLASH_SIZE := 512 + else $(error Unknown MCU for F4 target) endif @@ -176,7 +164,8 @@ MCU_COMMON_SRC = \ drivers/serial_uart_stm32f4xx.c \ drivers/system_stm32f4xx.c \ drivers/timer_stm32f4xx.c \ - drivers/persistent.c + drivers/persistent.c \ + drivers/sdio_f4xx.c ifeq ($(PERIPH_DRIVER), HAL) VCP_SRC = \ @@ -200,26 +189,12 @@ MSC_SRC = \ drivers/usb_msc_common.c \ drivers/usb_msc_f4xx.c \ msc/usbd_msc_desc.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.c \ msc/usbd_storage_emfat.c \ msc/emfat.c \ - msc/emfat_file.c -endif + msc/emfat_file.c \ + msc/usbd_storage_sd_spi.c \ + msc/usbd_storage_sdio.c 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 diff --git a/make/mcu/STM32F7.mk b/make/mcu/STM32F7.mk index b3539ee67f..7f365d1f53 100644 --- a/make/mcu/STM32F7.mk +++ b/make/mcu/STM32F7.mk @@ -110,40 +110,28 @@ INCLUDE_DIRS := $(INCLUDE_DIRS) \ $(ROOT)/lib/main/STM32F7/Drivers/CMSIS/Device/ST/STM32F7xx/Include \ $(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 ARCH_FLAGS = -mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -fsingle-precision-constant # Flags that are used in the STM32 libraries DEVICE_FLAGS = -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -ifeq ($(TARGET),$(filter $(TARGET),$(F7X5XI_TARGETS))) +ifeq ($(TARGET_MCU),STM32F765xx) DEVICE_FLAGS += -DSTM32F765xx LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f765.ld STARTUP_SRC = startup_stm32f765xx.s MCU_FLASH_SIZE := 2048 -else ifeq ($(TARGET),$(filter $(TARGET),$(F7X5XG_TARGETS))) +else ifeq ($(TARGET_MCU),STM32F745xx) DEVICE_FLAGS += -DSTM32F745xx LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f74x.ld STARTUP_SRC = startup_stm32f745xx.s MCU_FLASH_SIZE := 1024 -else ifeq ($(TARGET),$(filter $(TARGET),$(F7X6XG_TARGETS))) +else ifeq ($(TARGET_MCU),STM32F746xx) DEVICE_FLAGS += -DSTM32F746xx LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f74x.ld STARTUP_SRC = startup_stm32f746xx.s MCU_FLASH_SIZE := 1024 -else ifeq ($(TARGET),$(filter $(TARGET),$(F7X2RE_TARGETS))) +else ifeq ($(TARGET_MCU),STM32F722xx) DEVICE_FLAGS += -DSTM32F722xx ifndef LD_SCRIPT LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f722.ld @@ -158,8 +146,6 @@ $(error Unknown MCU for F7 target) endif DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) -TARGET_FLAGS = -D$(TARGET) - VCP_SRC = \ vcp_hal/usbd_desc.c \ vcp_hal/usbd_conf_stm32f7xx.c \ @@ -190,7 +176,8 @@ MCU_COMMON_SRC = \ drivers/timer_stm32f7xx.c \ drivers/system_stm32f7xx.c \ drivers/serial_uart_hal.c \ - drivers/serial_uart_stm32f7xx.c + drivers/serial_uart_stm32f7xx.c \ + drivers/sdio_f7xx.c MCU_EXCLUDES = \ drivers/bus_i2c.c \ @@ -199,26 +186,12 @@ MCU_EXCLUDES = \ MSC_SRC = \ drivers/usb_msc_common.c \ drivers/usb_msc_f7xx.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.c \ msc/usbd_storage_emfat.c \ msc/emfat.c \ - msc/emfat_file.c -endif + msc/emfat_file.c \ + msc/usbd_storage_sdio.c \ + msc/usbd_storage_sd_spi.c 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 diff --git a/make/mcu/STM32G4.mk b/make/mcu/STM32G4.mk index 510d6088f0..a47134cef0 100644 --- a/make/mcu/STM32G4.mk +++ b/make/mcu/STM32G4.mk @@ -113,18 +113,6 @@ INCLUDE_DIRS := $(INCLUDE_DIRS) \ $(ROOT)/lib/main/STM32G4/Drivers/CMSIS/Device/ST/STM32G4xx/Include \ $(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 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} -ifeq ($(TARGET),$(filter $(TARGET),$(G47X_TARGETS))) +ifeq ($(TARGET_MCU),STM32G474xx) DEVICE_FLAGS += -DSTM32G474xx LD_SCRIPT = $(LINKER_DIR)/stm32_flash_g474.ld STARTUP_SRC = startup_stm32g474xx.s @@ -145,8 +133,6 @@ $(error Unknown MCU for G4 target) endif DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) -TARGET_FLAGS = -D$(TARGET) - VCP_SRC = \ vcp_hal/usbd_desc.c \ vcp_hal/usbd_conf_stm32g4xx.c \ @@ -188,26 +174,12 @@ MCU_EXCLUDES = \ MSC_SRC = \ drivers/usb_msc_common.c \ drivers/usb_msc_f7xx.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.c \ msc/usbd_storage_emfat.c \ msc/emfat.c \ - msc/emfat_file.c -endif + msc/emfat_file.c \ + msc/usbd_storage_sdio.c \ + msc/usbd_storage_sd_spi.c 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 diff --git a/make/mcu/STM32H7.mk b/make/mcu/STM32H7.mk index 5649818ecb..f5c8ebb341 100644 --- a/make/mcu/STM32H7.mk +++ b/make/mcu/STM32H7.mk @@ -3,7 +3,7 @@ # ifeq ($(DEBUG_HARDFAULTS),H7) -CFLAGS += -DDEBUG_HARDFAULTS +CFLAGS += -DDEBUG_HARDFAULTS endif #CMSIS @@ -90,7 +90,6 @@ EXCLUDES = \ stm32h7xx_ll_usart.c \ stm32h7xx_ll_utils.c - STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC)) #USB @@ -134,18 +133,6 @@ INCLUDE_DIRS := $(INCLUDE_DIRS) \ $(ROOT)/lib/main/STM32H7/Drivers/CMSIS/Device/ST/STM32H7xx/Include \ $(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 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 # H750xB : 128K FLASH, 1M RAM # -ifeq ($(TARGET),$(filter $(TARGET),$(H743xI_TARGETS))) +ifeq ($(TARGET_MCU),STM32H743xx) DEVICE_FLAGS += -DSTM32H743xx DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h743_2m.ld STARTUP_SRC = startup_stm32h743xx.s @@ -173,7 +160,7 @@ MCU_FLASH_SIZE := FIRMWARE_SIZE DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_ram_h743.ld endif -else ifeq ($(TARGET),$(filter $(TARGET),$(H7A3xIQ_TARGETS))) +else ifeq ($(TARGET_MCU),STM32H7A3xxQ) DEVICE_FLAGS += -DSTM32H7A3xxQ DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h7a3_2m.ld 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 endif -else ifeq ($(TARGET),$(filter $(TARGET),$(H7A3xI_TARGETS))) +else ifeq ($(TARGET_MCU),STM32H7A3xx) DEVICE_FLAGS += -DSTM32H7A3xx DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h7a3_2m.ld 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 endif -else ifeq ($(TARGET),$(filter $(TARGET),$(H723xG_TARGETS))) +else ifeq ($(TARGET_MCU),STM32H723xx) DEVICE_FLAGS += -DSTM32H723xx DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h723_1m.ld STARTUP_SRC = startup_stm32h723xx.s MCU_FLASH_SIZE := 1024 DEVICE_FLAGS += -DMAX_MPU_REGIONS=16 -else ifeq ($(TARGET),$(filter $(TARGET),$(H725xG_TARGETS))) +else ifeq ($(TARGET_MCU),STM32H725xx) DEVICE_FLAGS += -DSTM32H725xx DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h723_1m.ld STARTUP_SRC = startup_stm32h723xx.s MCU_FLASH_SIZE := 1024 DEVICE_FLAGS += -DMAX_MPU_REGIONS=16 -else ifeq ($(TARGET),$(filter $(TARGET),$(H730xB_TARGETS))) +else ifeq ($(TARGET_MCU),STM32H730xx) DEVICE_FLAGS += -DSTM32H730xx DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h730_128m.ld STARTUP_SRC = startup_stm32h730xx.s @@ -226,7 +213,7 @@ DEVICE_FLAGS += -DMAX_MPU_REGIONS=16 ifeq ($(TARGET_FLASH),) -MCU_FLASH_SIZE := $(DEFAULT_TARGET_FLASH) +MCU_FLASH_SIZE := $(DEFAULT_TARGET_FLASH) endif ifeq ($(EXST),yes) @@ -239,14 +226,14 @@ LD_SCRIPTS = $(LINKER_DIR)/stm32_h730_common.ld $(LINKER_DIR)/stm32_h73 endif -else ifeq ($(TARGET),$(filter $(TARGET),$(H750xB_TARGETS))) +else ifeq ($(TARGET_MCU),STM32H750xx) DEVICE_FLAGS += -DSTM32H750xx DEFAULT_LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h750_128k.ld STARTUP_SRC = startup_stm32h743xx.s DEFAULT_TARGET_FLASH := 128 ifeq ($(TARGET_FLASH),) -MCU_FLASH_SIZE := $(DEFAULT_TARGET_FLASH) +MCU_FLASH_SIZE := $(DEFAULT_TARGET_FLASH) endif ifeq ($(EXST),yes) @@ -281,13 +268,11 @@ LD_SCRIPT = $(DEFAULT_LD_SCRIPT) endif ifneq ($(FIRMWARE_SIZE),) -DEVICE_FLAGS += -DFIRMWARE_SIZE=$(FIRMWARE_SIZE) +DEVICE_FLAGS += -DFIRMWARE_SIZE=$(FIRMWARE_SIZE) endif DEVICE_FLAGS += -DHSE_VALUE=$(HSE_VALUE) -DHSE_STARTUP_TIMEOUT=1000 -TARGET_FLAGS = -D$(TARGET) - VCP_SRC = \ vcp_hal/usbd_desc.c \ vcp_hal/usbd_conf_stm32h7xx.c \ @@ -321,7 +306,9 @@ MCU_COMMON_SRC = \ drivers/audio_stm32h7xx.c \ drivers/memprot_hal.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 = \ drivers/bus_i2c.c \ @@ -330,27 +317,12 @@ MCU_EXCLUDES = \ MSC_SRC = \ drivers/usb_msc_common.c \ drivers/usb_msc_h7xx.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.c \ msc/usbd_storage_emfat.c \ msc/emfat.c \ - msc/emfat_file.c -endif + msc/emfat_file.c \ + msc/usbd_storage_sdio.c \ + msc/usbd_storage_sd_spi.c 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 - diff --git a/make/source.mk b/make/source.mk index 1590e1b486..af8a785f3b 100644 --- a/make/source.mk +++ b/make/source.mk @@ -203,11 +203,63 @@ COMMON_SRC = \ io/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 = \ $(CMSIS_SRC) \ $(DEVICE_STDPERIPH_SRC) -COMMON_SRC := $(COMMON_SRC) $(COMMON_DEVICE_SRC) +COMMON_SRC := $(COMMON_SRC) $(COMMON_DEVICE_SRC) $(RX_SRC) ifeq ($(EXST),yes) TARGET_FLAGS := -DUSE_EXST $(TARGET_FLAGS) @@ -401,53 +453,17 @@ NOT_OPTIMISED_SRC := $(NOT_OPTIMISED_SRC) \ ifneq ($(DSP_LIB),) INCLUDE_DIRS += $(DSP_LIB)/Include - SRC += $(wildcard $(DSP_LIB)/Source/*/*.S) + endif -ifneq ($(filter ONBOARDFLASH,$(FEATURES)),) -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) +SRC += $(FLASH_SRC) $(MSC_SRC) $(SDCARD_SRC) $(COMMON_SRC) #excludes 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) -endif -ifneq ($(filter MSC,$(FEATURES)),) -SRC += $(MSC_SRC) -endif # end target specific make file checks ifneq ($(BOARD),) diff --git a/make/targets.mk b/make/targets.mk deleted file mode 100644 index 65915c6f4d..0000000000 --- a/make/targets.mk +++ /dev/null @@ -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) diff --git a/src/main/target/SITL/target.mk b/src/main/target/SITL/target.mk index 80f025cf99..a9cf8a9b14 100644 --- a/src/main/target/SITL/target.mk +++ b/src/main/target/SITL/target.mk @@ -1,5 +1,6 @@ -SITL_TARGETS += $(TARGET) -FEATURES += #SDCARD_SPI VCP +TARGET_MCU := SITL +TARGET_MCU_FAMILY := SITL +SIMULATOR_BUILD = yes TARGET_SRC = \ drivers/accgyro/accgyro_fake.c \ diff --git a/src/main/target/STM32F405/target.mk b/src/main/target/STM32F405/target.mk index fd7a4a19ab..e81667cf53 100644 --- a/src/main/target/STM32F405/target.mk +++ b/src/main/target/STM32F405/target.mk @@ -1,34 +1,4 @@ -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 \ - -F405_TARGETS += $(TARGET) +TARGET_MCU := STM32F405xx +TARGET_MCU_FAMILY := STM32F4 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) diff --git a/src/main/target/STM32F411/target.mk b/src/main/target/STM32F411/target.mk index 851969aa77..d74e68a21d 100644 --- a/src/main/target/STM32F411/target.mk +++ b/src/main/target/STM32F411/target.mk @@ -1,33 +1,2 @@ -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 - -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) +TARGET_MCU := STM32F411xE +TARGET_MCU_FAMILY := STM32F4 diff --git a/src/main/target/STM32F745/target.mk b/src/main/target/STM32F745/target.mk index 61b31c1c08..0fb3a0fe8a 100644 --- a/src/main/target/STM32F745/target.mk +++ b/src/main/target/STM32F745/target.mk @@ -1,34 +1,4 @@ -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 \ - -F7X5XG_TARGETS += $(TARGET) +TARGET_MCU := STM32F745xx +TARGET_MCU_FAMILY := STM32F7 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) diff --git a/src/main/target/STM32F7X2/target.mk b/src/main/target/STM32F7X2/target.mk index 2e6512cb7f..72fddf0f82 100644 --- a/src/main/target/STM32F7X2/target.mk +++ b/src/main/target/STM32F7X2/target.mk @@ -1,32 +1,4 @@ -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 \ - +TARGET_MCU := STM32F722xx +TARGET_MCU_FAMILY := STM32F7 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) diff --git a/src/main/target/STM32G47X/target.h b/src/main/target/STM32G47X/target.h index 393f855d68..d0787af54c 100644 --- a/src/main/target/STM32G47X/target.h +++ b/src/main/target/STM32G47X/target.h @@ -54,9 +54,7 @@ #define USE_BEEPER -#ifdef USE_SDCARD -#define USE_SDCARD_SPI -#endif +#undef USE_SDCARD #define USE_SPI #define SPI_FULL_RECONFIGURABILITY diff --git a/src/main/target/STM32G47X/target.mk b/src/main/target/STM32G47X/target.mk index b421ac91e8..a9c3ebd394 100644 --- a/src/main/target/STM32G47X/target.mk +++ b/src/main/target/STM32G47X/target.mk @@ -1,32 +1,2 @@ -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 \ - -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) +TARGET_MCU := STM32G474xx +TARGET_MCU_FAMILY := STM32G4 diff --git a/src/main/target/STM32H723/target.mk b/src/main/target/STM32H723/target.mk index 0930806cba..62e9152007 100644 --- a/src/main/target/STM32H723/target.mk +++ b/src/main/target/STM32H723/target.mk @@ -1,34 +1,5 @@ -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 \ +TARGET_MCU := STM32H723xx +TARGET_MCU_FAMILY := STM32H7 H723xG_TARGETS += $(TARGET) - 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) diff --git a/src/main/target/STM32H730/target.mk b/src/main/target/STM32H730/target.mk index baca1e07ff..1c83c4b2f8 100644 --- a/src/main/target/STM32H730/target.mk +++ b/src/main/target/STM32H730/target.mk @@ -1,25 +1,7 @@ -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 +TARGET_MCU := STM32H730xx +TARGET_MCU_FAMILY := STM32H7 -H730xB_TARGETS += $(TARGET) - -HSE_VALUE = 8000000 +HSE_VALUE = 8000000 ifneq ($(EXST),) EXST = yes @@ -27,19 +9,3 @@ ifeq ($(EXST_ADJUST_VMA),) EXST_ADJUST_VMA = 0x90100000 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) diff --git a/src/main/target/STM32H743/target.mk b/src/main/target/STM32H743/target.mk index 2ed32c8132..9b3235507f 100644 --- a/src/main/target/STM32H743/target.mk +++ b/src/main/target/STM32H743/target.mk @@ -1,34 +1,4 @@ -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 \ - -H743xI_TARGETS += $(TARGET) +TARGET_MCU := STM32H743xx +TARGET_MCU_FAMILY := STM32H7 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) diff --git a/src/main/target/STM32H750/target.mk b/src/main/target/STM32H750/target.mk index 56502fc632..2485fb0443 100644 --- a/src/main/target/STM32H750/target.mk +++ b/src/main/target/STM32H750/target.mk @@ -1,25 +1,7 @@ -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 +TARGET_MCU := STM32H750xx +TARGET_MCU_FAMILY := STM32H7 -H750xB_TARGETS += $(TARGET) - -HSE_VALUE = 8000000 +HSE_VALUE = 8000000 ifneq ($(EXST),) EXST = yes @@ -28,21 +10,5 @@ endif ifneq ($(EXST),yes) TARGET_FLASH_SIZE := 1024 -LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h750_1m.ld +LD_SCRIPT = $(LINKER_DIR)/stm32_flash_h750_1m.ld 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)