Commit 3460d0bc authored Dec 17, 2019 by Thomas Hebb Committed by Masahiro Yamada Jan 07, 2020

kconfig: distinguish between dependencies and visibility in help text



Kconfig makes a distinction between dependencies (defined by "depends
on" expressions and enclosing "if" blocks) and visibility (which
includes all dependencies, but also includes inline "if" expressions of
individual properties as well as, for prompts, "visible if" expressions
of enclosing menus).

Before commit bcdedcc1 ("menuconfig: print more info for symbol
without prompts"), the "Depends on" lines of a symbol's help text
indicated the visibility of the prompt property they appeared under.
After bcdedcc1, there was always only a single "Depends on" line,
which indicated the visibility of the first P_SYMBOL property of the
symbol. Since P_SYMBOLs never have inline if expressions, this was in
effect the same as the dependencies of the menu item that the P_SYMBOL
was attached to.

Neither of these situations accurately conveyed the dependencies of a
symbol--the first because it was actually the visibility, and the second
because it only showed the dependencies from a single definition.

With this series, we are back to printing separate dependencies for each
definition, but we print the actual dependencies (rather than the
visibility) in the "Depends on" line. However, it can still be useful to
know the visibility of a prompt, so this patch adds a "Visible if" line
that shows the visibility only if the visibility is different from the
dependencies (which it isn't for most prompts in Linux).

Before:

  Symbol: THUMB2_KERNEL [=n]
  Type  : bool
  Defined at arch/arm/Kconfig:1417
    Prompt: Compile the kernel in Thumb-2 mode
    Depends on: (CPU_V7 [=y] || CPU_V7M [=n]) && !CPU_V6 [=n] && !CPU_V6K [=n]
    Location:
      -> Kernel Features
    Selects: ARM_UNWIND [=n]

After:

   Symbol: THUMB2_KERNEL [=n]
   Type  : bool
   Defined at arch/arm/Kconfig:1417
     Prompt: Compile the kernel in Thumb-2 mode
     Depends on: (CPU_V7 [=y] || CPU_V7M [=n]) && !CPU_V6 [=n] && !CPU_V6K [=n]
     Visible if: (CPU_V7 [=y] || CPU_V7M [=n]) && !CPU_V6 [=n] && !CPU_V6K [=n] && !CPU_THUMBONLY [=n]
     Location:
       -> Kernel Features
     Selects: ARM_UNWIND [=n]

Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

parent edda15f2

scripts/kconfig/expr.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@

		#define DEBUG_EXPR 0

		static int expr_eq(struct expr e1, struct expr e2);
		static struct expr expr_eliminate_yn(struct expr e);

		struct expr expr_alloc_symbol(struct symbol sym)
		@@ -250,7 +249,7 @@ void expr_eliminate_eq(struct expr ep1, struct expr ep2)
		* equals some operand in the other (operands do not need to appear in the same
		* order), recursively.
		*/
		static int expr_eq(struct expr e1, struct expr e2)
		int expr_eq(struct expr e1, struct expr e2)
		{
		int res, old_count;

scripts/kconfig/expr.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -300,6 +300,7 @@ struct expr expr_alloc_or(struct expr e1, struct expr *e2);
		struct expr expr_copy(const struct expr org);
		void expr_free(struct expr *e);
		void expr_eliminate_eq(struct expr ep1, struct expr ep2);
		int expr_eq(struct expr e1, struct expr e2);
		tristate expr_calc_value(struct expr *e);
		struct expr expr_trans_bool(struct expr e);
		struct expr expr_eliminate_dups(struct expr e);

scripts/kconfig/menu.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -736,6 +736,17 @@ static void get_prompt_str(struct gstr r, struct property prop,
		str_printf(r, " Prompt: %s\n", prop->text);

		get_dep_str(r, prop->menu->dep, " Depends on: ");
		/*
		* Most prompts in Linux have visibility that exactly matches their
		* dependencies. For these, we print only the dependencies to improve
		* readability. However, prompts with inline "if" expressions and
		* prompts with a parent that has a "visible if" expression have
		* differing dependencies and visibility. In these rare cases, we
		* print both.
		*/
		if (!expr_eq(prop->menu->dep, prop->visible.expr))
		get_dep_str(r, prop->visible.expr, " Visible if: ");

		menu = prop->menu->parent;
		for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) {
		bool accessible = menu_is_visible(menu);

Original line number	Diff line number	Diff line
		@@ -300,6 +300,7 @@ struct expr expr_alloc_or(struct expr e1, struct expr *e2);
		struct expr expr_copy(const struct expr org);
		void expr_free(struct expr *e);
		void expr_eliminate_eq(struct expr ep1, struct expr ep2);
		int expr_eq(struct expr e1, struct expr e2);
		tristate expr_calc_value(struct expr *e);
		struct expr expr_trans_bool(struct expr e);
		struct expr expr_eliminate_dups(struct expr e);

Admin message