History

Merge branch 'devel-stable' into devel

Russell King committed 16 years ago

Commit 809b4e02 parents a0a5568 79a94c3685 files · +21747 −5907Browse files

Showing the changes to scripts (4 of 685 files). Show all

Unified · Split

4 files
  1. scripts/kconfig/conf.c +1 −1
  2. scripts/kconfig/expr.h +0 −1
  3. scripts/kconfig/menu.c +2 −5
  4. scripts/kconfig/symbol.c +2 −0
scripts/kconfig/conf.c+1−1
@@ -427,7 +427,7 @@ static void check_conf(struct menu *menu) · 426 unmodified lines
427427 if (sym->name && !sym_is_choice_value(sym)) {
428428 printf("CONFIG_%s\n", sym->name);
429429 }
430− } else {
430+ } else if (input_mode != oldnoconfig) {
431431 if (!conf_cnt++)
432432 printf(_("*\n* Restart config...\n*\n"));
433433 rootEntry = menu_get_parent_menu(menu);
scripts/kconfig/expr.h+0−1
@@ -165,7 +165,6 @@ struct menu { · 164 unmodified lines
165165 struct symbol *sym;
166166 struct property *prompt;
167167 struct expr *dep;
168− struct expr *dir_dep;
169168 unsigned int flags;
170169 char *help;
171170 struct file *file;
scripts/kconfig/menu.c+2−5
@@ -107,7 +107,6 @@ static struct expr *menu_check_dep(struct expr *e) · 106 unmodified lines
107107 void menu_add_dep(struct expr *dep)
108108 {
109109 current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep));
110− current_entry->dir_dep = current_entry->dep;
111110 }
112111
113112 void menu_set_type(int type)
@@ -291,10 +290,6 @@ void menu_finalize(struct menu *parent) · 177 unmodified lines
291290 for (menu = parent->list; menu; menu = menu->next)
292291 menu_finalize(menu);
293292 } 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−
298293 basedep = parent->prompt ? parent->prompt->visible.expr : NULL;
299294 basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no);
300295 basedep = expr_eliminate_dups(expr_transform(basedep));
@@ -325,6 +320,8 @@ void menu_finalize(struct menu *parent) · 24 unmodified lines
325320 parent->next = last_menu->next;
326321 last_menu->next = NULL;
327322 }
323+
324+ sym->dir_dep.expr = parent->dep;
328325 }
329326 for (menu = parent->list; menu; menu = menu->next) {
330327 if (sym && sym_is_choice(sym) &&
scripts/kconfig/symbol.c+2−0
@@ -350,6 +350,7 @@ void sym_calc_value(struct symbol *sym) · 349 unmodified lines
350350 }
351351 }
352352 calc_newval:
353+#if 0
353354 if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) {
354355 fprintf(stderr, "warning: (");
355356 expr_fprint(sym->rev_dep.expr, stderr);
@@ -358,6 +359,7 @@ void sym_calc_value(struct symbol *sym) · 2 unmodified lines
358359 expr_fprint(sym->dir_dep.expr, stderr);
359360 fprintf(stderr, ")\n");
360361 }
362+#endif
361363 newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
362364 }
363365 if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t