Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 29979aa8bd69becd94cbad59093807a417ce2a9e

Authored by Linus Torvalds
2 parents 50c6dc9eba e9203c9882
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  kbuild: fix oldnoconfig to do the right thing
  kconfig: Temporarily disable dependency warnings
  kconfig: delay symbol direct dependency initialization

Showing 4 changed files Side-by-side Diff

scripts/kconfig/conf.c
Diff comments   View file @ 29979aa
... ... @@ -427,7 +427,7 @@
427 427 if (sym->name && !sym_is_choice_value(sym)) {
428 428 printf("CONFIG_%s\n", sym->name);
429 429 }
430   - } else {
  430 + } else if (input_mode != oldnoconfig) {
431 431 if (!conf_cnt++)
432 432 printf(_("*\n* Restart config...\n*\n"));
433 433 rootEntry = menu_get_parent_menu(menu);
scripts/kconfig/expr.h
Diff comments   View file @ 29979aa
... ... @@ -165,7 +165,6 @@
165 165 struct symbol *sym;
166 166 struct property *prompt;
167 167 struct expr *dep;
168   - struct expr *dir_dep;
169 168 unsigned int flags;
170 169 char *help;
171 170 struct file *file;
scripts/kconfig/menu.c
Diff comments   View file @ 29979aa
... ... @@ -107,7 +107,6 @@
107 107 void menu_add_dep(struct expr *dep)
108 108 {
109 109 current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep));
110   - current_entry->dir_dep = current_entry->dep;
111 110 }
112 111  
113 112 void menu_set_type(int type)
... ... @@ -291,10 +290,6 @@
291 290 for (menu = parent->list; menu; menu = menu->next)
292 291 menu_finalize(menu);
293 292 } else if (sym) {
294   - /* ignore inherited dependencies for dir_dep */
295   - sym->dir_dep.expr = expr_transform(expr_copy(parent->dir_dep));
296   - sym->dir_dep.expr = expr_eliminate_dups(sym->dir_dep.expr);
297   -
298 293 basedep = parent->prompt ? parent->prompt->visible.expr : NULL;
299 294 basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no);
300 295 basedep = expr_eliminate_dups(expr_transform(basedep));
... ... @@ -325,6 +320,8 @@
325 320 parent->next = last_menu->next;
326 321 last_menu->next = NULL;
327 322 }
  323 +
  324 + sym->dir_dep.expr = parent->dep;
328 325 }
329 326 for (menu = parent->list; menu; menu = menu->next) {
330 327 if (sym && sym_is_choice(sym) &&
scripts/kconfig/symbol.c
Diff comments   View file @ 29979aa
... ... @@ -350,6 +350,7 @@
350 350 }
351 351 }
352 352 calc_newval:
  353 +#if 0
353 354 if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) {
354 355 fprintf(stderr, "warning: (");
355 356 expr_fprint(sym->rev_dep.expr, stderr);
... ... @@ -358,6 +359,7 @@
358 359 expr_fprint(sym->dir_dep.expr, stderr);
359 360 fprintf(stderr, ")\n");
360 361 }
  362 +#endif
361 363 newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
362 364 }
363 365 if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)