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

Merge pull request #16092 from miri64/kconfig/fix/app.config-mutual-exclusive

Browse Source 
Kconfig: make app.config and app.config.test mutually exclusive
This commit is contained in:
Kevin "Tristate Tom" Weiss 2021-02-26 09:51:58 +01:00 committed by GitHub
commit a31ffdc934
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
makefiles/kconfig.mk
View File

@ -29,8 +29,15 @@ export KCONFIG_GENERATED_DEPENDENCIES = $(GENERATED_DIR)/Kconfig.dep
# This file will contain external module configurations # This file will contain external module configurations
export KCONFIG_EXTERNAL_CONFIGS = $(GENERATED_DIR)/Kconfig.external_modules export KCONFIG_EXTERNAL_CONFIGS = $(GENERATED_DIR)/Kconfig.external_modules
# This file will contain application default configurations # Add configurations that only work when running the Kconfig test so far,
KCONFIG_APP_CONFIG = $(APPDIR)/app.config # because they activate modules.
ifeq (1,$(TEST_KCONFIG))
# This file will contain application default configurations
KCONFIG_APP_CONFIG = $(APPDIR)/app.config.test
else
# This file will contain application default configurations
KCONFIG_APP_CONFIG = $(APPDIR)/app.config
endif
# Default and user overwritten configurations # Default and user overwritten configurations
KCONFIG_USER_CONFIG = $(APPDIR)/user.config KCONFIG_USER_CONFIG = $(APPDIR)/user.config
@ -54,13 +61,6 @@ KCONFIG_OUT_DEP = $(KCONFIG_OUT_CONFIG).d
# and share them among boards or cpus. # and share them among boards or cpus.
# This file will contain application default configurations used for Kconfig Test # This file will contain application default configurations used for Kconfig Test
MERGE_SOURCES += $(KCONFIG_ADD_CONFIG) MERGE_SOURCES += $(KCONFIG_ADD_CONFIG)
# Add configurations that only work when running the Kconfig test so far,
# because they activate modules.
ifeq (1,$(TEST_KCONFIG))
MERGE_SOURCES += $(wildcard $(APPDIR)/app.config.test)
endif
MERGE_SOURCES += $(wildcard $(KCONFIG_APP_CONFIG)) MERGE_SOURCES += $(wildcard $(KCONFIG_APP_CONFIG))
MERGE_SOURCES += $(wildcard $(KCONFIG_USER_CONFIG)) MERGE_SOURCES += $(wildcard $(KCONFIG_USER_CONFIG))