RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #14753 from fjmolinas/pr_info_boards_supported_conflicts

Browse Source 
makefiles/info-global.inc.mk: include FEATURES_CONFLICTS
This commit is contained in:
Kaspar Schleiser 2020-08-18 10:37:20 +02:00 committed by GitHub
commit b93b972074
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.include
View File

@ -176,6 +176,7 @@ include $(RIOTMAKE)/dependencies_debug.inc.mk
GLOBAL_GOALS += buildtest \
buildtest-indocker \
info-boards-features-blacklisted \
info-boards-features-conflicting \
info-boards-features-missing \
info-boards-supported \
info-buildsizes info-buildsizes-diff \

15
makefiles/info-global.inc.mk
View File

@ -3,6 +3,7 @@
info-boards-supported \
info-boards-features-missing \
info-boards-features-blacklisted \
info-boards-features-conflicting \
#
BOARDDIR_GLOBAL := $(BOARDDIR)
@ -66,6 +67,11 @@ define board_unsatisfied_features
BOARDS_FEATURES_USED_BLACKLISTED += "$$(BOARD) $$(FEATURES_USED_BLACKLISTED)"
BOARDS_WITH_BLACKLISTED_FEATURES += $$(BOARD)
endif
ifneq (,$$(FEATURES_CONFLICTING))
BOARDS_FEATURES_CONFLICTING += "$$(BOARD) $$(FEATURES_CONFLICTING)"
BOARDS_WITH_CONFLICTING_FEATURES += $$(BOARD)
endif
endif
ifneq (,$$(DEPENDENCY_DEBUG))
@ -80,9 +86,13 @@ BOARDS_WITH_MISSING_FEATURES :=
BOARDS_FEATURES_MISSING :=
BOARDS_WITH_BLACKLISTED_FEATURES :=
BOARDS_FEATURES_USED_BLACKLISTED :=
BOARDS_FEATURES_CONFLICTING :=
BOARDS_WITH_CONFLICTING_FEATURES :=
$(foreach board,$(BOARDS),$(eval $(call board_unsatisfied_features,$(board))))
BOARDS := $(filter-out $(BOARDS_WITH_MISSING_FEATURES) $(BOARDS_WITH_BLACKLISTED_FEATURES), $(BOARDS))
BOARDS := $(filter-out $(BOARDS_WITH_MISSING_FEATURES) \
$(BOARDS_WITH_BLACKLISTED_FEATURES) \
$(BOARDS_WITH_CONFLICTING_FEATURES), $(BOARDS))
info-buildsizes: SHELL=bash
info-buildsizes:
@ -124,6 +134,9 @@ info-boards-features-missing:
info-boards-features-blacklisted:
@for f in $(BOARDS_FEATURES_USED_BLACKLISTED); do echo $${f}; done | column -t
info-boards-features-conflicting:
@for f in $(BOARDS_FEATURES_CONFLICTING); do echo $${f}; done | column -t
# Reset BOARDSDIR so unchanged for makefiles included after, for now only
# needed for buildtests.inc.mk
BOARDDIR := $(BOARDDIR_GLOBAL)