leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moveconfig: Correct operation of the 'imply' feature

Browse Source 
This doesn't work anymore, since the Kconfig update. The script has no
tests so we did not notice. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-12-18 08:09:42 -07:00 committed by Tom Rini
parent 93ad26264e
commit a36270861b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/moveconfig.py
View File

@ -1263,7 +1263,7 @@ def find_kconfig_rules(kconf, config, imply_config):
sym = kconf.syms.get(imply_config)
if sym:
for sel, cond in (sym.selects + sym.implies):
if sel == config:
if sel.name == config:
return sym
return None
@ -1291,7 +1291,8 @@ def check_imply_rule(kconf, config, imply_config):
nodes = sym.nodes
if len(nodes) != 1:
return '%d locations' % len(nodes)
fname, linenum = nodes[0].filename, nodes[0].linern
node = nodes[0]
fname, linenum = node.filename, node.linenr
cwd = os.getcwd()
if cwd and fname.startswith(cwd):
fname = fname[len(cwd) + 1:]
@ -1382,7 +1383,7 @@ def do_imply_config(config_list, add_imply, imply_flags, skip_added,
"""
kconf = KconfigScanner().conf if check_kconfig else None
if add_imply and add_imply != 'all':
add_imply = add_imply.split()
add_imply = add_imply.split(',')
# key is defconfig name, value is dict of (CONFIG_xxx, value)
config_db = {}
@ -1414,7 +1415,7 @@ def do_imply_config(config_list, add_imply, imply_flags, skip_added,
else: # New defconfig
defconfig = line
# Work through each target config option in tern, independently
# Work through each target config option in turn, independently
for config in config_list:
defconfigs = defconfig_db.get(config)
if not defconfigs: