Skip to content

makefiles.kconfig.mk: use EXTERNAL_MODULE_DIRS in Kconfig resolution #17596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leandrolanzieri merged 2 commits into from
Feb 1, 2022
Merged

makefiles.kconfig.mk: use EXTERNAL_MODULE_DIRS in Kconfig resolution #17596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80f63ba
makefiles.kconfig.mk: use EXTERNAL_MODULE_DIRS in Kconfig resolution
fjmolinas Feb 1, 2022
de325cd
tests/kconfig: also add external module dependencies
fjmolinas Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,8 @@ ifeq (1,$(TEST_KCONFIG))
# Locate used packages in $(RIOTPKG).
PKG_PATHS := $(sort $(foreach dir,$(RIOTPKG),\
$(foreach pkg,$(USEPKG),$(dir $(wildcard $(dir)/$(pkg)/Makefile)))))

EXTERNAL_MODULE_PATHS := $(dir $(EXTERNAL_MODULE_KCONFIGS))
else
# always select provided architecture features
FEATURES_REQUIRED += $(filter arch_%,$(FEATURES_PROVIDED))
Expand Down
4 changes: 2 additions & 2 deletions makefiles/kconfig.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ $(KCONFIG_GENERATED_ENV_CONFIG): FORCE | $(GENERATED_DIR)
| $(LAZYSPONGE) $(LAZYSPONGE_FLAGS) $@

# All directories in EXTERNAL_MODULES_PATHS which have a Kconfig file
EXTERNAL_MODULE_KCONFIGS ?= $(sort $(foreach dir,$(EXTERNAL_MODULE_PATHS),\
$(wildcard $(dir)/Kconfig)))
EXTERNAL_MODULE_KCONFIGS ?= $(sort $(foreach dir,$(EXTERNAL_MODULE_DIRS),\
$(wildcard $(dir)/*/Kconfig)))
# Build a Kconfig file that source all external modules configuration
# files. Every EXTERNAL_MODULE_DIRS with a Kconfig file is written to
# KCONFIG_EXTERNAL_CONFIGS as 'osource dir/Kconfig'
Expand Down
4 changes: 4 additions & 0 deletions tests/kconfig/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ USEMODULE += external_module_1
USEMODULE += external_module_2
EXTERNAL_MODULE_DIRS += external_modules

ifeq (1, $(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(APPDIR)/app.config
endif

include $(RIOTBASE)/Makefile.include
2 changes: 2 additions & 0 deletions tests/kconfig/app.config.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_MODULE_EXTERNAL_MODULE_1=y
Comment thread
leandrolanzieri marked this conversation as resolved.
CONFIG_MODULE_EXTERNAL_MODULE_2=y
4 changes: 4 additions & 0 deletions tests/kconfig/external_modules/external_module_1/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ config EXTERNAL_MODULE_1_MESSAGE
default "External Message 1 defined in Kconfig file"

endif # KCONFIG_EXTERNAL_MODULE_1

config MODULE_EXTERNAL_MODULE_1
bool "Select external module 2"
depends on TEST_KCONFIG
4 changes: 4 additions & 0 deletions tests/kconfig/external_modules/external_module_2/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ config EXTERNAL_MODULE_2_MESSAGE
default "External Message 2 defined in Kconfig file"

endif # KCONFIG_EXTERNAL_MODULE_2

config MODULE_EXTERNAL_MODULE_2
bool "Select external module 2"
depends on TEST_KCONFIG