alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-07 20:00:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle deprecated values in sdkconfig.defaults

Browse Source 
The issue was pointed out also in
https://github.com/espressif/esp-idf/issues/4092
This commit is contained in:
Roland Dobai
2019-09-25 15:58:02 +02:00
parent abdf12dc9e
commit dedaf624db
19 changed files with 312 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
make/project_config.mk
View File

@@ -46,6 +46,16 @@ $(SDKCONFIG): defconfig
endif
endif
ifneq ("$(wildcard $(SDKCONFIG_DEFAULTS))","")
ifeq ($(OS),Windows_NT)
DEFAULTS_ARG:=--defaults $(shell cygpath -m $(SDKCONFIG_DEFAULTS))
else
DEFAULTS_ARG:=--defaults $(SDKCONFIG_DEFAULTS)
endif
else
DEFAULTS_ARG:=
endif
# macro for running confgen.py
define RunConfGen
mkdir -p $(BUILD_DIR_BASE)/include/config
@@ -57,6 +67,7 @@ define RunConfGen
--env "COMPONENT_KCONFIGS_PROJBUILD=$(strip $(COMPONENT_KCONFIGS_PROJBUILD))" \
--env "COMPONENT_SDKCONFIG_RENAMES=$(strip $(COMPONENT_SDKCONFIG_RENAMES))" \
--env "IDF_CMAKE=n" \
$(DEFAULTS_ARG) \
--output config ${SDKCONFIG} \
--output makefile $(SDKCONFIG_MAKEFILE) \
--output header $(BUILD_DIR_BASE)/include/sdkconfig.h
@@ -106,9 +117,6 @@ endif
# defconfig creates a default config, based on SDKCONFIG_DEFAULTS if present
defconfig: | check_python_dependencies
$(summary) DEFCONFIG
ifneq ("$(wildcard $(SDKCONFIG_DEFAULTS))","")
cat $(SDKCONFIG_DEFAULTS) >> $(SDKCONFIG) # append defaults to sdkconfig, will override existing values
endif
$(call RunConfGen)
# if neither defconfig or menuconfig are requested, use the GENCONFIG rule to