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

Merge pull request #15217 from leandrolanzieri/pr/kconfig/allow_merge_configs

Browse Source 
makefiles/kconfig: always allow to use KCONFIG_ADD_CONFIG
This commit is contained in:
Cenk Gündoğan 2020-10-13 15:11:09 +02:00 committed by GitHub
commit f05ac07f19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cpu/cortexm_common/Makefile.features
View File

@ -37,4 +37,8 @@ endif
FEATURES_PROVIDED += no_idle_thread FEATURES_PROVIDED += no_idle_thread
KCONFIG_ADD_CONFIG += $(RIOTCPU)/cortexm_common/cortexm_common.config # This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1, $(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(RIOTCPU)/cortexm_common/cortexm_common.config
endif

12
cpu/sam0_common/Makefile.features
View File

@ -17,9 +17,11 @@ FEATURES_PROVIDED += periph_wdt periph_wdt_cb periph_wdt_warning_period
FEATURES_CONFLICT += periph_rtc:periph_rtt FEATURES_CONFLICT += periph_rtc:periph_rtt
FEATURES_CONFLICT_MSG += "The RTC and RTT map to the same hardware peripheral." FEATURES_CONFLICT_MSG += "The RTC and RTT map to the same hardware peripheral."
KCONFIG_ADD_CONFIG += $(RIOTCPU)/cortexm_common/cortexm_common.config include $(RIOTCPU)/cortexm_common/Makefile.features
-include $(RIOTCPU)/cortexm_common/Makefile.features # Add sam0 configurations after including cortexm_common so sam0 takes precendence
# This configuration enables modules that are only available when using Kconfig
# add sam0 configurations after including cortexm_common so sam0 takes precendence # module modelling
KCONFIG_ADD_CONFIG += $(RIOTCPU)/sam0_common/sam0_common.config ifeq (1, $(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(RIOTCPU)/sam0_common/sam0_common.config
endif

12
makefiles/kconfig.mk
View File

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