diff --git a/Makefile b/Makefile index 96b02ec12..673dcc7a2 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # # The target to build, see VALID_TARGETS below -TARGET ?= NAZE +TARGET ?= BETAFLIGHTF3 # Compile-time options OPTIONS ?= @@ -315,8 +315,14 @@ $(OBJECT_DIR)/$(TARGET)/%.o: %.S $(V1) $(CROSS_CC) -c -o $@ $(ASFLAGS) $< -## all : Build all valid targets -all: $(VALID_TARGETS) +## all : Build all targets (excluding unsupported) +all: $(SUPPORTED_TARGETS) + +## all_with_unsupported : Build all targets (excluding unsupported) +all_with_unsupported: $(VALID_TARGETS) + +## unsupported : Build unsupported targets +unsupported: $(UNSUPPORTED_TARGETS) ## official : Build all official (travis) targets official: $(OFFICIAL_TARGETS) @@ -333,9 +339,6 @@ targets-group-3: $(GROUP_3_TARGETS) ## targets-group-3 : build some targets targets-group-4: $(GROUP_4_TARGETS) -## targets-legacy : build legacy targets -targets-legacy: $(LEGACY_TARGETS) - ## targets-group-rest: build the rest of the targets (not listed in group 1, 2 or 3) targets-group-rest: $(GROUP_OTHER_TARGETS) @@ -445,14 +448,16 @@ help: Makefile make/tools.mk ## targets : print a list of all valid target platforms (for consumption by scripts) targets: - $(V0) @echo "Valid targets: $(VALID_TARGETS)" - $(V0) @echo "Target: $(TARGET)" - $(V0) @echo "Base target: $(BASE_TARGET)" - $(V0) @echo "targets-group-1: $(GROUP_1_TARGETS)" - $(V0) @echo "targets-group-2: $(GROUP_2_TARGETS)" - $(V0) @echo "targets-group-3: $(GROUP_3_TARGETS)" - $(V0) @echo "targets-group-4: $(GROUP_4_TARGETS)" - $(V0) @echo "targets-group-rest: $(GROUP_OTHER_TARGETS)" + $(V0) @echo "Valid targets: $(VALID_TARGETS)" + $(V0) @echo "Supported targets: $(SUPPORTED_TARGETS)" + $(V0) @echo "Unsupported targets: $(UNSUPPORTED_TARGETS)" + $(V0) @echo "Target: $(TARGET)" + $(V0) @echo "Base target: $(BASE_TARGET)" + $(V0) @echo "targets-group-1: $(GROUP_1_TARGETS)" + $(V0) @echo "targets-group-2: $(GROUP_2_TARGETS)" + $(V0) @echo "targets-group-3: $(GROUP_3_TARGETS)" + $(V0) @echo "targets-group-4: $(GROUP_4_TARGETS)" + $(V0) @echo "targets-group-rest: $(GROUP_OTHER_TARGETS)" ## test : run the cleanflight test suite ## junittest : run the cleanflight test suite, producing Junit XML result files. diff --git a/make/targets.mk b/make/targets.mk index 772e150f3..c55956611 100644 --- a/make/targets.mk +++ b/make/targets.mk @@ -15,6 +15,18 @@ ALTERNATES := $(sort $(filter-out target, $(basename $(notdir $(wildcard $(RO $(error The target specified, $(TARGET), cannot be built. Use one of the ALT targets: $(ALTERNATES)) endif +UNSUPPORTED_TARGETS := \ + AFROMINI \ + ALIENFLIGHTF1 \ + BEEBRAIN \ + CC3D \ + CC3D_OPBL \ + CJMCU \ + MICROSCISKY \ + NAZE + +SUPPORTED_TARGETS := $(filter-out $(UNSUPPORTED_TARGETS), $(VALID_TARGETS)) + GROUP_1_TARGETS := \ AIORACERF3 \ AIR32 \ @@ -98,17 +110,7 @@ GROUP_4_TARGETS := \ STM32F3DISCOVERY \ TINYBEEF3 -LEGACY_TARGETS := \ - AFROMINI \ - ALIENFLIGHTF1 \ - BEEBRAIN \ - CC3D \ - CC3D_OPBL \ - CJMCU \ - MICROSCISKY \ - NAZE - -GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS) $(LEGACY_TARGETS), $(VALID_TARGETS)) +GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS), $(SUPPORTED_TARGETS)) ifeq ($(filter $(TARGET),$(ALT_TARGETS)), $(TARGET)) BASE_TARGET := $(firstword $(subst /,, $(subst ./src/main/target/,, $(dir $(wildcard $(ROOT)/src/main/target/*/$(TARGET).mk)))))