Skip to content

Commit 09748e1

Browse files
committed
kconfig: make defconfig is no longer chatty
make defconfig generated a lot of output then noone actually read. Use conf_set_all_new_symbols() to generate the default configuration and avoid the chatty output. A typical run now looks like this: $ make defconfig *** Default configuration is based on 'i386_defconfig' arch/x86/configs/i386_defconfig:13:warning: trying to assign nonexistent symbol SEMAPHORE_SLEEPERS arch/x86/configs/i386_defconfig:176:warning: trying to assign nonexistent symbol PREEMPT_BKL ... arch/x86/configs/i386_defconfig:1386:warning: trying to assign nonexistent symbol INSTRUMENTATION $ As an added benefit we now clearly see the warnings generated in the start of the process. Signed-off-by: Sam Ravnborg <[email protected]> Cc: Roman Zippel <[email protected]>
1 parent cd9140e commit 09748e1

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

scripts/kconfig/conf.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
102102
fflush(stdout);
103103
fgets(line, 128, stdin);
104104
return 1;
105-
case set_default:
106-
printf("%s\n", def);
107-
return 1;
108105
default:
109106
break;
110107
}
@@ -318,10 +315,6 @@ static int conf_choice(struct menu *menu)
318315
else
319316
continue;
320317
break;
321-
case set_default:
322-
cnt = def;
323-
printf("%d\n", cnt);
324-
break;
325318
default:
326319
break;
327320
}
@@ -589,13 +582,15 @@ int main(int ac, char **av)
589582
case set_random:
590583
conf_set_all_new_symbols(def_random);
591584
break;
585+
case set_default:
586+
conf_set_all_new_symbols(def_default);
587+
break;
592588
case ask_silent:
593589
case ask_new:
594590
if (conf_silent_update())
595591
exit(1);
596592
break;
597593
case ask_all:
598-
case set_default:
599594
if (conf_update())
600595
exit(1);
601596
break;

0 commit comments

Comments
 (0)