moveconfig: Correct operation of the 'imply' feature
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>
diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index 373b395..8d059be 100755
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -1263,7 +1263,7 @@
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 @@
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 @@
"""
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 @@
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: