feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/confgen_avoid_write_to_conf' into 'master'

Browse Source 
tools: avoid using directly _write_to_conf from Kconfiglib

Closes IDFGH-1246

See merge request espressif/esp-idf!5423
This commit is contained in:
Ivan Grokhotkov
2019-07-04 22:36:23 +08:00
parent 564dbabf49 510042160d
commit cd89182458
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/kconfig_new/confgen.py
View File

@@ -349,10 +349,8 @@ def write_cmake(deprecated_options, config, filename):
if not isinstance(sym, kconfiglib.Symbol): if not isinstance(sym, kconfiglib.Symbol):
return return
# Note: str_value calculates _write_to_conf, due to if sym.config_string:
# internal magic in kconfiglib... val = sym.str_value
val = sym.str_value
if sym._write_to_conf:
if sym.orig_type in (kconfiglib.BOOL, kconfiglib.TRISTATE) and val == "n": if sym.orig_type in (kconfiglib.BOOL, kconfiglib.TRISTATE) and val == "n":
val = "" # write unset values as empty variables val = "" # write unset values as empty variables
write("set({}{} \"{}\")\n".format( write("set({}{} \"{}\")\n".format(
@@ -380,8 +378,8 @@ def get_json_values(config):
if not isinstance(sym, kconfiglib.Symbol): if not isinstance(sym, kconfiglib.Symbol):
return return
val = sym.str_value # this calculates _write_to_conf, due to kconfiglib magic if sym.config_string:
if sym._write_to_conf: val = sym.str_value
if sym.type in [kconfiglib.BOOL, kconfiglib.TRISTATE]: if sym.type in [kconfiglib.BOOL, kconfiglib.TRISTATE]:
val = (val != "n") val = (val != "n")
elif sym.type == kconfiglib.HEX: elif sym.type == kconfiglib.HEX: