RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

*Makefile.include: Remove TEST_KCONFIG includes

Browse Source
This commit is contained in:
MrKevinWeiss 2024-03-26 10:32:53 +01:00
parent 0a9c51fdf9
commit ff7f7ccd5a
No known key found for this signature in database
GPG Key ID: C26684F1C0767FFF
1 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Makefile.include
View File

@ -268,11 +268,6 @@ include $(RIOTMAKE)/scan-build.inc.mk
export RIOTBUILD_CONFIG_HEADER_C = $(BINDIR)/riotbuild/riotbuild.h export RIOTBUILD_CONFIG_HEADER_C = $(BINDIR)/riotbuild/riotbuild.h
# When testing Kconfig's module modelling we need to run Kconfig
ifeq (1,$(TEST_KCONFIG))
SHOULD_RUN_KCONFIG = 1
endif
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
OPEN := open OPEN := open
else else
@ -425,40 +420,22 @@ include $(RIOTMAKE)/defaultmodules_regular.inc.mk
# Include Kconfig functionalities # Include Kconfig functionalities
include $(RIOTMAKE)/kconfig.mk include $(RIOTMAKE)/kconfig.mk
# For testing, use TEST_KCONFIG as a switch between Makefile.dep and Kconfig # always select provided architecture features
ifeq (1,$(TEST_KCONFIG)) FEATURES_REQUIRED += $(filter arch_%,$(FEATURES_PROVIDED))
ifneq ($(RIOT_CI_BUILD),1) # always select CPU core features
$(info === [ATTENTION] Testing Kconfig dependency modelling ===) FEATURES_REQUIRED += $(filter cpu_core_%,$(FEATURES_PROVIDED))
endif
KCONFIG_MODULES := $(call lowercase,$(patsubst CONFIG_MODULE_%,%,$(filter CONFIG_MODULE_%,$(.VARIABLES))))
USEMODULE := $(KCONFIG_MODULES)
KCONFIG_PACKAGES := $(call lowercase,$(patsubst CONFIG_PACKAGE_%,%,$(filter CONFIG_PACKAGE_%,$(.VARIABLES))))
USEPKG := $(KCONFIG_PACKAGES)
# Locate used packages in $(RIOTPKG) or $(EXTERNAL_PKG_DIRS). # check if required features are provided and update $(FEATURES_USED)
PKGDIRS := $(RIOTPKG) $(EXTERNAL_PKG_DIRS) include $(RIOTMAKE)/features_check.inc.mk
PKG_PATHS := $(sort $(foreach dir,$(PKGDIRS),\
$(foreach pkg,$(USEPKG),$(dir $(wildcard $(dir)/$(pkg)/Makefile)))))
EXTERNAL_MODULE_PATHS := $(dir $(EXTERNAL_MODULE_KCONFIGS)) # handle removal of default modules
else USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
# always select provided architecture features
FEATURES_REQUIRED += $(filter arch_%,$(FEATURES_PROVIDED))
# always select CPU core features
FEATURES_REQUIRED += $(filter cpu_core_%,$(FEATURES_PROVIDED))
# check if required features are provided and update $(FEATURES_USED) # avoid recursive expansion
include $(RIOTMAKE)/features_check.inc.mk USEMODULE := $(sort $(USEMODULE))
# handle removal of default modules # process dependencies
USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE)) include $(RIOTMAKE)/dependency_resolution.inc.mk
# avoid recursive expansion
USEMODULE := $(sort $(USEMODULE))
# process dependencies
include $(RIOTMAKE)/dependency_resolution.inc.mk
endif
# Include dfu-util configuration when using riotboot_dfu bootloader before # Include dfu-util configuration when using riotboot_dfu bootloader before
# including the board's Makefile.include which could define dfu-util # including the board's Makefile.include which could define dfu-util