History

kconfig: allow symbols implied by y to become m

The 'imply' keyword restricts a symbol to y or n, excluding m when it is implied by y. This is the original behavior since commit 237e3ad0f195 ("Kconfig: Introduce the "imply" keyword"). However, the author of this feature, Nicolas Pitre, stated that the 'imply' keyword should not impose any restrictions. (https://lkml.org/lkml/2020/2/19/714) I agree, and want to get rid of this tricky behavior.

Masahiro Yamada committed 6 years ago

Commit def2fbf1 parent 1cd9b3a2 files · +12 −5Browse files

Showing the changes to scripts (1 of 2 files). Show all

Unified · Split

scripts/kconfig/symbol.c+1−4
@@ -401,8 +401,7 @@ void sym_calc_value(struct symbol *sym) · 400 unmodified lines
401 sym_warn_unmet_dep(sym);401 sym_warn_unmet_dep(sym);
402 newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);402 newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
403 }403 }
404 if (newval.tri == mod &&404 if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)
405 (sym_get_type(sym) == S_BOOLEAN || sym->implied.tri == yes))
406 newval.tri = yes;405 newval.tri = yes;
407 break;406 break;
408 case S_STRING:407 case S_STRING:
@@ -484,8 +483,6 @@ bool sym_tristate_within_range(struct symbol *sym, tristate val) · 75 unmodified lines
484 return false;483 return false;
485 if (sym->visible <= sym->rev_dep.tri)484 if (sym->visible <= sym->rev_dep.tri)
486 return false;485 return false;
487 if (sym->implied.tri == yes && val == mod)
488 return false;
489 if (sym_is_choice_value(sym) && sym->visible == yes)486 if (sym_is_choice_value(sym) && sym->visible == yes)
490 return val == yes;487 return val == yes;
491 return val >= sym->rev_dep.tri && val <= sym->visible;488 return val >= sym->rev_dep.tri && val <= sym->visible;