kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-13 08:33:49 +01:00
Code Releases Activity

buildsystem: fix boards/Makefile.features inclusion

Browse Source
This commit is contained in:
crasbe 2025-03-28 11:48:32 +01:00
parent 3399b642c3
commit 8ea9a42608
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.features
View File

@ -4,6 +4,9 @@
# variables in their Makefile.features.
# This makes them available when setting features based on CPU_MODEL in the cpu
# Makefile.features and also during dependency resolution.
#
# Board features defined by common code in `boards/common` are processed
# during the dependency resolution, since they depend on the USEMODULE.
# Transition:
# Moving 'CPU/CPU_MODEL' to Makefile.features is an ongoing work and may not
@ -11,9 +14,6 @@
include $(BOARDDIR)/Makefile.features
# include global Makefile.features for `boards` modules
include $(RIOTBOARD)/Makefile.features
# Sanity check
ifeq (,$(CPU))
$(error $(BOARD): CPU must be defined by board / board_common Makefile.features)

4
makefiles/dependency_resolution.inc.mk
View File

@ -17,6 +17,10 @@ OLD_STATE := $(USEMODULE) $(USEPKG) $(FEATURES_USED)
# pull in dependencies of the currently used modules and pkgs
include $(RIOTBASE)/Makefile.dep
# include the global board features before the feature check as they depend
# on the USEMODULE, which is present after the `Makefile.dep` resolution
include $(RIOTBOARD)/Makefile.features
# check if required features are provided and update $(FEATURES_USED)
include $(RIOTMAKE)/features_check.inc.mk