Re: Linux 2.6.3-rc4

[Roman Zippel <zippel@linux-m68k.org>]

Hi,

On Tue, 17 Feb 2004, Adrian Bunk wrote:

> > Which implies a configuration error (but the Kconfig file looks correct,
> > so I wonder if you found a bug in the configurator).
>
> Most likely the problem is CONFIG_I2C=m and the fact that FB_RADEON_I2C
> is a bool.

Try the patch below. I noticed that problem recently and I hoped I could
get away with it after 2.6.3. :)
When calculating the select expression it should only use the config
symbol itself not the complete dependency, otherwise a boolean could be
turned into a tristate.

bye, Roman

--- linux/scripts/kconfig/menu.c	18 Jul 2003 21:22:54 -0000	1.1.1.1
+++ linux/scripts/kconfig/menu.c	17 Feb 2004 20:18:28 -0000
@@ -172,16 +172,16 @@ void menu_finalize(struct menu *parent)
 				if (prop->menu != menu)
 					continue;
 				dep = expr_transform(prop->visible.expr);
-				dep = expr_alloc_and(expr_copy(basedep), dep);
-				dep = expr_eliminate_dups(dep);
-				if (menu->sym && menu->sym->type != S_TRISTATE)
-					dep = expr_trans_bool(dep);
-				prop->visible.expr = dep;
 				if (prop->type == P_SELECT) {
 					struct symbol *es = prop_get_symbol(prop);
 					es->rev_dep.expr = expr_alloc_or(es->rev_dep.expr,
 							expr_alloc_and(expr_alloc_symbol(menu->sym), expr_copy(dep)));
 				}
+				dep = expr_alloc_and(expr_copy(basedep), dep);
+				dep = expr_eliminate_dups(dep);
+				if (menu->sym && menu->sym->type != S_TRISTATE)
+					dep = expr_trans_bool(dep);
+				prop->visible.expr = dep;
 			}
 		}
 		for (menu = parent->list; menu; menu = menu->next)