Merge pull request #2395 from AndersHoglund/makefile_cleanup_highend
Makefile cleanup. Remove the concept of HIGHEND and the HIGHEND_SRC list
This commit is contained in:
commit
0fc9c37fe1
16
Makefile
16
Makefile
|
@ -635,10 +635,6 @@ COMMON_SRC = \
|
|||
sensors/compass.c \
|
||||
sensors/gyro.c \
|
||||
sensors/initialisation.c \
|
||||
$(CMSIS_SRC) \
|
||||
$(DEVICE_STDPERIPH_SRC)
|
||||
|
||||
HIGHEND_SRC = \
|
||||
blackbox/blackbox.c \
|
||||
blackbox/blackbox_io.c \
|
||||
cms/cms.c \
|
||||
|
@ -679,7 +675,10 @@ HIGHEND_SRC = \
|
|||
sensors/esc_sensor.c \
|
||||
io/vtx_string.c \
|
||||
io/vtx_smartaudio.c \
|
||||
io/vtx_tramp.c
|
||||
io/vtx_tramp.c \
|
||||
$(CMSIS_SRC) \
|
||||
$(DEVICE_STDPERIPH_SRC)
|
||||
|
||||
|
||||
SPEED_OPTIMISED_SRC := ""
|
||||
SIZE_OPTIMISED_SRC := ""
|
||||
|
@ -872,13 +871,8 @@ TARGET_SRC += \
|
|||
io/flashfs.c
|
||||
endif
|
||||
|
||||
ifeq ($(TARGET),$(filter $(TARGET),$(F7_TARGETS) $(F4_TARGETS) $(F3_TARGETS)))
|
||||
TARGET_SRC += $(HIGHEND_SRC)
|
||||
else ifneq ($(filter HIGHEND,$(FEATURES)),)
|
||||
TARGET_SRC += $(HIGHEND_SRC)
|
||||
endif
|
||||
|
||||
TARGET_SRC += $(COMMON_SRC)
|
||||
|
||||
#excludes
|
||||
ifeq ($(TARGET),$(filter $(TARGET),$(F7_TARGETS)))
|
||||
TARGET_SRC := $(filter-out ${F7EXCLUDES}, $(TARGET_SRC))
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
F1_TARGETS += $(TARGET)
|
||||
FEATURES = HIGHEND
|
||||
|
||||
TARGET_SRC = \
|
||||
drivers/accgyro_mpu.c \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
F1_TARGETS += $(TARGET)
|
||||
FEATURES = ONBOARDFLASH HIGHEND VCP
|
||||
FEATURES = ONBOARDFLASH VCP
|
||||
|
||||
TARGET_SRC = \
|
||||
drivers/accgyro_mpu.c \
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
F1_TARGETS += $(TARGET)
|
||||
FEATURES = HIGHEND
|
||||
|
||||
TARGET_SRC = \
|
||||
drivers/accgyro_mpu.c \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
F1_TARGETS += $(TARGET)
|
||||
FEATURES = ONBOARDFLASH HIGHEND
|
||||
FEATURES = ONBOARDFLASH
|
||||
|
||||
TARGET_SRC = \
|
||||
drivers/accgyro_adxl345.c \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
F3_TARGETS += $(TARGET)
|
||||
FEATURES = VCP SDCARD HIGHEND
|
||||
FEATURES = VCP SDCARD
|
||||
|
||||
TARGET_SRC = \
|
||||
drivers/accgyro_adxl345.c \
|
||||
|
|
Loading…
Reference in New Issue