riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12417 from cladmi/pr/make/boards/cpu_cpu_model_to_features

Browse Source 
Makefile.features: assert CPU is defined by BOARD/Makefile.features
This commit is contained in:
Francisco 2019-11-12 10:09:23 +01:00 committed by GitHub
commit 9352b88da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.dep
View File

@ -5,12 +5,8 @@ OLD_USEPKG := $(sort $(USEPKG))
# include board dependencies # include board dependencies
-include $(RIOTBOARD)/$(BOARD)/Makefile.dep -include $(RIOTBOARD)/$(BOARD)/Makefile.dep
# Transitional conditional include until all boards define 'CPU' in # include cpu dependencies
# Makefile.features -include $(RIOTCPU)/$(CPU)/Makefile.dep
ifneq (,$(CPU))
# include cpu dependencies
-include $(RIOTCPU)/$(CPU)/Makefile.dep
endif
# include external modules dependencies # include external modules dependencies
# processed before RIOT ones to be evaluated before the 'default' rules. # processed before RIOT ones to be evaluated before the 'default' rules.

14
Makefile.features
View File

@ -5,19 +5,15 @@
# This makes them available when setting features based on CPU_MODEL in the cpu # This makes them available when setting features based on CPU_MODEL in the cpu
# Makefile.features and also during dependency resolution. # Makefile.features and also during dependency resolution.
# Transition:
# Moving 'CPU/CPU_MODEL' to Makefile.features is an ongoing work and may not
# reflect the state of all boards for the moment.
include $(RIOTBOARD)/$(BOARD)/Makefile.features include $(RIOTBOARD)/$(BOARD)/Makefile.features
# Transitional conditional include until all boards define 'CPU' # Sanity check
ifneq (,$(CPU)) ifeq (,$(CPU))
include $(RIOTCPU)/$(CPU)/Makefile.features $(error CPU must be defined by board / board_common Makefile.features)
else
$(warning CPU must be defined by board / board_common Makefile.features)
endif endif
include $(RIOTCPU)/$(CPU)/Makefile.features
# Resolve FEATURES_ variables # Resolve FEATURES_ variables
# Their value will only be complete after resolving dependencies # Their value will only be complete after resolving dependencies

7
Makefile.include
View File

@ -311,13 +311,6 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.include
INCLUDES += -I$(RIOTCPU)/$(CPU)/include INCLUDES += -I$(RIOTCPU)/$(CPU)/include
include $(RIOTCPU)/$(CPU)/Makefile.include include $(RIOTCPU)/$(CPU)/Makefile.include
# Sanity check
# The check is only done after 'include $(RIOTBOARD)/$(BOARD)/Makefile.include'
# because we need to have the 'CPU' variable defined
ifeq (,$(filter $(RIOTCPU)/$(CPU)/Makefile.features,$(MAKEFILE_LIST)))
$(error $$(RIOTCPU)/$$(CPU)/Makefile.features must have been included by the board / board common Makefile.features or Makefile.features)
endif
# Assume GCC/GNU as supported toolchain if CPU's Makefile.include doesn't # Assume GCC/GNU as supported toolchain if CPU's Makefile.include doesn't
# provide this macro # provide this macro
TOOLCHAINS_SUPPORTED ?= gnu TOOLCHAINS_SUPPORTED ?= gnu