Skip to content

Commit ae8da72

Browse files
committed
kconfig: omit --oldaskconfig option for 'make config'
scripts/kconfig/conf.c line 39 defines the default of input_mode as oldaskconfig. Hence, 'make config' works in the same way even without the --oldaskconfig option given. Note this in the help message. This will be helpful to unify build rules in Makefile in the next commit. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
1 parent a2af62c commit ae8da72

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

scripts/kconfig/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ menuconfig: $(obj)/mconf
2929
$(Q)$< $(silent) $(Kconfig)
3030

3131
config: $(obj)/conf
32-
$(Q)$< $(silent) --oldaskconfig $(Kconfig)
32+
$(Q)$< $(silent) $(Kconfig)
3333

3434
nconfig: $(obj)/nconf
3535
$(Q)$< $(silent) $(Kconfig)

scripts/kconfig/conf.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ static void conf_usage(const char *progname)
483483
printf(" --randconfig New config with random answer to all options\n");
484484
printf(" --yes2modconfig Change answers from yes to mod if possible\n");
485485
printf(" --mod2yesconfig Change answers from mod to yes if possible\n");
486+
printf(" (If none of the above is given, --oldaskconfig is the default)\n");
486487
}
487488

488489
int main(int ac, char **av)

0 commit comments

Comments
 (0)