scripts: kconfig: Use unique_{defined_syms,choices} and clean up a bit
- Use Kconfig.unique_{defined_syms,choices} to avoid redundant checks
for symbols/choices defined in multiple locations. These were
recently added to Kconfiglib.
- Remove the comment about the alldefconfig starting state. It probably
isn't useful here.
- Print the messages about loading configuration files just before they
are actually loaded. That looks less confusing if one of them fails
to load.
- Line-wrap the error message about non-whitelisted warnings.
- Misc. other minor code cleanup.
Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
diff --git a/scripts/kconfig/kconfig.py b/scripts/kconfig/kconfig.py
index 2f9a739..f2e69fa 100755
--- a/scripts/kconfig/kconfig.py
+++ b/scripts/kconfig/kconfig.py
@@ -14,7 +14,6 @@
# Warning generated when a symbol with unsatisfied dependencies is being
# selected. These should be investigated, but whitelist them for now.
"y-selected",
-
)
def fatal(warning):
@@ -47,28 +46,22 @@
# Enable warnings for assignments to undefined symbols
kconf.enable_undef_warnings()
- # This script uses alldefconfig as the base. Other starting states could be set
- # up here as well. The approach in examples/allnoconfig_simpler.py could
- # provide an allnoconfig starting state for example.
-
- print("Using {} as base".format(args.conf_fragments[0]))
- for config in args.conf_fragments[1:]:
- print("Merging {}".format(config))
- # Create a merged configuration by loading the fragments with replace=False
- for config in args.conf_fragments:
+ for i, config in enumerate(args.conf_fragments):
+ print(("Loading {} as base" if i == 0 else "Merging {}")
+ .format(config))
+ # replace=False creates a merged configuration
kconf.load_config(config, replace=False)
-
# Print warnings for symbols whose actual value doesn't match the assigned
# value
- for sym in kconf.defined_syms:
+ for sym in kconf.unique_defined_syms:
# Was the symbol assigned to? Choice symbols are checked separately.
if sym.user_value is not None and not sym.choice:
verify_assigned_sym_value(sym)
# Print warnings for choices whose actual selection doesn't match the user
# selection
- for choice in kconf.choices:
+ for choice in kconf.unique_choices:
if choice.user_selection:
verify_assigned_choice_value(choice)
@@ -95,12 +88,13 @@
# now as well.
for warning in kconf.warnings:
if fatal(warning):
- sys.exit("Error: Aborting due to non-whitelisted Kconfig "
- "warning '{}'.\nNote: If this warning doesn't point "
- "to an actual problem, you can add it to the "
- "whitelist at the top of {}."
- .format(warning, sys.argv[0]))
-
+ sys.exit(textwrap.fill(
+ "Error: Aborting due to non-whitelisted Kconfig "
+ "warning '{}'.\nNote: If this warning doesn't point "
+ "to an actual problem, you can add it to the "
+ "whitelist at the top of {}."
+ .format(warning, sys.argv[0]),
+ 100))
# Write the merged configuration and the C header
kconf.write_config(args.dotconfig)
@@ -114,8 +108,7 @@
effect on it. It can only be set indirectly, via Kconfig defaults (e.g. in a
Kconfig.defconfig file) or through being 'select'ed or 'imply'd (note: try to
avoid Kconfig 'select's except for trivial promptless "helper" symbols without
-dependencies, as it ignores dependencies and forces symbols on).
-"""
+dependencies, as it ignores dependencies and forces symbols on)."""
# Message about where to look up symbol information
SYM_INFO_HINT = """
@@ -124,10 +117,10 @@
the Kconfig reference at
http://docs.zephyrproject.org/reference/kconfig/CONFIG_{}.html (which is
updated regularly from the master branch). See the 'Setting configuration
-values' section of the Board Porting Guide as well.
-"""[1:] # Remove initial newline for nicer textwrap output when joining texts
+values' section of the Board Porting Guide as well."""
-PROMPTLESS_HINT_EXTRA = "It covers Kconfig.defconfig files."
+PROMPTLESS_HINT_EXTRA = """
+It covers Kconfig.defconfig files."""
def verify_assigned_sym_value(sym):
# Verifies that the value assigned to 'sym' "took" (matches the value the
@@ -142,16 +135,12 @@
if user_value != sym.str_value:
msg = "warning: {} was assigned the value '{}' but got the " \
- "value '{}'. " \
+ "value '{}'." \
.format(name_and_loc(sym), user_value, sym.str_value)
- if promptless(sym):
- msg += PROMPTLESS_HINT
-
+ if promptless(sym): msg += PROMPTLESS_HINT
msg += SYM_INFO_HINT.format(sym.name)
-
- if promptless(sym):
- msg += PROMPTLESS_HINT_EXTRA
+ if promptless(sym): msg += PROMPTLESS_HINT_EXTRA
# Use a large fill() width to try to avoid linebreaks in the symbol
# reference link
@@ -173,12 +162,11 @@
if choice.user_selection is not choice.selection:
msg = "warning: the choice symbol {} was selected (set =y), but {} " \
- "ended up as the choice selection. " \
+ "ended up as the choice selection. {}" \
.format(name_and_loc(choice.user_selection),
name_and_loc(choice.selection) if choice.selection
- else "no symbol")
-
- msg += SYM_INFO_HINT.format(choice.user_selection.name)
+ else "no symbol",
+ SYM_INFO_HINT.format(choice.user_selection.name))
print(textwrap.fill(msg, 100), file=sys.stderr)
@@ -199,11 +187,7 @@
# Returns True if 'sym' has no prompt. Since the symbol might be defined in
# multiple locations, we need to check all locations.
- for node in sym.nodes:
- if node.prompt:
- return False
-
- return True
+ return not any(node.prompt for node in sym.nodes)
def parse_args():
