diff --git a/make/project_config.mk b/make/project_config.mk index 3c7eac5f01..912d207367 100644 --- a/make/project_config.mk +++ b/make/project_config.mk @@ -61,15 +61,14 @@ ifeq ("$(PYTHON)","") PYTHON=python endif -ifneq ("$(wildcard $(SDKCONFIG_DEFAULTS))","") +SDKCONFIG_DEFAULTS_FILES := $(foreach f,$(SDKCONFIG_DEFAULTS),$(wildcard $(f))) +# for each sdkconfig.defaults file, also add sdkconfig.defaults.IDF_TARGET, if it exists +SDKCONFIG_DEFAULTS_FILES += $(foreach f,$(SDKCONFIG_DEFAULTS_FILES),$(wildcard $(f).$(IDF_TARGET))) + ifeq ($(OS),Windows_NT) -DEFAULTS_ARG:=--defaults $(shell cygpath -m $(SDKCONFIG_DEFAULTS)) -else -DEFAULTS_ARG:=--defaults $(SDKCONFIG_DEFAULTS) -endif -else -DEFAULTS_ARG:= +SDKCONFIG_DEFAULTS_FILES := $(shell cygpath -m $(SDKCONFIG_DEFAULTS_FILES)) endif +DEFAULTS_ARG := $(foreach f,$(SDKCONFIG_DEFAULTS_FILES),--defaults $(f)) # macro for running confgen.py define RunConfGen