patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

scripts: kconfig: Make DEPRECATED/EXPERIMENTAL symbols optional

Browse source 
Make `kconfig.py` not crash when any one of these settings is undefined:

  * DEPRECATED
  * EXPERIMENTAL
  * WARN_DEPRECATED
  * WARN_EXPERIMENTAL

While these will continue to exist in Zephyr, they shouldn't be strictly
required for the script to work. One situation in which they could go
missing is when a user creates an application-specific Kconfig root, but
forgets to source "Kconfig.zephyr" inside it - not that this is expected
to work anyway, but it could at least raise a more intelligible error.

Note that when WARN_DEPRECATED is undefined, selecting DEPRECATED will
always produce warnings. Same with WARN_EXPERIMENTAL and EXPERIMENTAL.
This matches the fact that the WARN_* symbols normally have `default y`.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
This commit is contained in:
Grzegorz Swiderski 2023-10-09 10:48:50 +02:00 committed by Johan Hedberg
parent 45c369f419
commit ce1b8d6d16
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/kconfig/kconfig.py
View file

@ -78,10 +78,10 @@ def main():
check_assigned_sym_values(kconf)
check_assigned_choice_values(kconf)
if kconf.syms['WARN_DEPRECATED'].tri_value == 2:
if kconf.syms.get('WARN_DEPRECATED', kconf.y).tri_value == 2:
check_deprecated(kconf)
if kconf.syms['WARN_EXPERIMENTAL'].tri_value == 2:
if kconf.syms.get('WARN_EXPERIMENTAL', kconf.y).tri_value == 2:
check_experimental(kconf)
# Hack: Force all symbols to be evaluated, to catch warnings generated
@ -237,8 +237,8 @@ Practices sections of the manual might be helpful too.\
def check_deprecated(kconf):
deprecated = kconf.syms['DEPRECATED']
dep_expr = deprecated.rev_dep
deprecated = kconf.syms.get('DEPRECATED')
dep_expr = kconf.n if deprecated is None else deprecated.rev_dep
if dep_expr is not kconf.n:
selectors = [s for s in split_expr(dep_expr, OR) if expr_value(s) == 2]
@ -248,8 +248,8 @@ def check_deprecated(kconf):
def check_experimental(kconf):
experimental = kconf.syms['EXPERIMENTAL']
dep_expr = experimental.rev_dep
experimental = kconf.syms.get('EXPERIMENTAL')
dep_expr = kconf.n if experimental is None else experimental.rev_dep
if dep_expr is not kconf.n:
selectors = [s for s in split_expr(dep_expr, OR) if expr_value(s) == 2]