Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-03-26 17:02:20 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Kconfig merge_config only set to 'n' when BOOL

Browse Source 
Run make updateconfig to fix delta's of derived configs
This commit is contained in:
Peter van der Perk
2021-10-28 10:27:51 +02:00
committed by Daniel Agar
parent fec0d6c5ed
commit c6f249f7f1
9 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/kconfig/merge_config.py
View File

@@ -115,10 +115,11 @@ def main(kconfig_file, config1, config2):
sym_name = match.group(1)
kconf.syms[sym_name].unset_value()
for default, cond in kconf.syms[sym_name].orig_defaults:
if(cond.str_value == 'y'):
# Default is y, our diff is unset thus we've set it to no
kconf.syms[sym_name].set_value(0)
if kconf.syms[sym_name].type is BOOL:
for default, cond in kconf.syms[sym_name].orig_defaults:
if(cond.str_value == 'y'):
# Default is y, our diff is unset thus we've set it to no
kconf.syms[sym_name].set_value(0)
f.close()