michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: kconfig.py: Rename verify_*() functions to check_*()

Browse source 
Bit shorter, matches the devicetree code.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2019-11-16 05:05:41 +01:00 • committed by Carles Cufí
commit 7a148ef9da
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/kconfig/kconfig.py
View file

@ -53,20 +53,20 @@ def main():
# This won't work if zephyr/.config already exists (which means it's # This won't work if zephyr/.config already exists (which means it's
# being loaded), because zephyr/.config is a full configuration file # being loaded), because zephyr/.config is a full configuration file
# that includes values for promptless symbols. # that includes values for promptless symbols.
verify_no_promptless_assign(kconf) check_no_promptless_assign(kconf)
# Print warnings for symbols whose actual value doesn't match the assigned # Print warnings for symbols whose actual value doesn't match the assigned
# value # value
for sym in kconf.unique_defined_syms: for sym in kconf.unique_defined_syms:
# Was the symbol assigned to? Choice symbols are checked separately. # Was the symbol assigned to? Choice symbols are checked separately.
if sym.user_value is not None and not sym.choice: if sym.user_value is not None and not sym.choice:
verify_assigned_sym_value(sym) check_assigned_sym_value(sym)
# Print warnings for choices whose actual selection doesn't match the user # Print warnings for choices whose actual selection doesn't match the user
# selection # selection
for choice in kconf.unique_choices: for choice in kconf.unique_choices:
if choice.user_selection: if choice.user_selection:
verify_assigned_choice_value(choice) check_assigned_choice_value(choice)
# Hack: Force all symbols to be evaluated, to catch warnings generated # Hack: Force all symbols to be evaluated, to catch warnings generated
# during evaluation. Wait till the end to write the actual output files, so # during evaluation. Wait till the end to write the actual output files, so
@ -107,7 +107,7 @@ def main():
write_kconfig_filenames(kconf.kconfig_filenames, kconf.srctree, args.sources) write_kconfig_filenames(kconf.kconfig_filenames, kconf.srctree, args.sources)
def verify_no_promptless_assign(kconf): def check_no_promptless_assign(kconf):
# Checks that no promptless symbols are assigned # Checks that no promptless symbols are assigned
for sym in kconf.unique_defined_syms: for sym in kconf.unique_defined_syms:
@ -119,7 +119,7 @@ other symbols. \
""" + SYM_INFO_HINT).format(sym)) """ + SYM_INFO_HINT).format(sym))
def verify_assigned_sym_value(sym): def check_assigned_sym_value(sym):
# Verifies that the value assigned to 'sym' "took" (matches the value the # Verifies that the value assigned to 'sym' "took" (matches the value the
# symbol actually got), printing a warning otherwise # symbol actually got), printing a warning otherwise
@ -137,7 +137,7 @@ def verify_assigned_sym_value(sym):
""" + SYM_INFO_HINT).format(sym, user_value)) """ + SYM_INFO_HINT).format(sym, user_value))
def verify_assigned_choice_value(choice): def check_assigned_choice_value(choice):
# Verifies that the choice symbol that was selected (by setting it to y) # Verifies that the choice symbol that was selected (by setting it to y)
# ended up as the selection, printing a warning otherwise. # ended up as the selection, printing a warning otherwise.
# #