kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 06:23:53 +01:00
Code Releases Activity

makefiles: introduce KCONFIG_ADD_CONFIG variable

Browse Source 
This holds a list of .config files to be merged. For more details see
kconfig.mk.
This commit is contained in:
Leandro Lanzieri 2020-07-27 18:16:11 +02:00
parent 01454188e8
commit 180ee6efc9
No known key found for this signature in database
GPG Key ID: 13559905E2EBEAA5
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.include
View File

@ -217,9 +217,6 @@ ifeq (1,$(TEST_KCONFIG))
SHOULD_RUN_KCONFIG = 1
endif
# Include Kconfig functionalities
include $(RIOTMAKE)/kconfig.mk
ifeq ($(OS),Darwin)
OPEN := open
else
@ -366,6 +363,9 @@ include $(RIOTBASE)/Makefile.features
include $(RIOTMAKE)/pseudomodules.inc.mk
include $(RIOTMAKE)/defaultmodules.inc.mk
# Include Kconfig functionalities
include $(RIOTMAKE)/kconfig.mk
# For testing, use TEST_KCONFIG as a switch between Makefile.dep and Kconfig
ifeq (1,$(TEST_KCONFIG))
$(info === [ATTENTION] Testing Kconfig dependency modelling ===)

7
makefiles/kconfig.mk
View File

@ -50,6 +50,13 @@ KCONFIG_OUT_DEP = $(KCONFIG_OUT_CONFIG).d
# Add configurations to merge, in ascendent priority (i.e. a file overrides the
# previous ones).
ifeq (1, $(TEST_KCONFIG))
# KCONFIG_ADD_CONFIG holds a list of .config files that are merged for the
# initial configuration. This allows to split configurations in common files
# and share them among boards or cpus.
MERGE_SOURCES += $(KCONFIG_ADD_CONFIG)
endif
MERGE_SOURCES += $(wildcard $(KCONFIG_APP_CONFIG))
MERGE_SOURCES += $(wildcard $(KCONFIG_USER_CONFIG))

1
makefiles/vars.inc.mk
View File

@ -118,3 +118,4 @@ export LAZYSPONGE_FLAGS # Parameters supplied to LAZYSPONGE.
export AFL_FLAGS # Additional command-line flags passed to afl during fuzzing.
# LOG_LEVEL # Logging level as integer (NONE: 0, ERROR: 1, WARNING: 2, INFO: 3, DEBUG: 4, default: 3)
# KCONFIG_ADD_CONFIG # List of .config files to be merged used by Boards and CPUs. See kconfig.mk