summaryrefslogtreecommitdiff
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2021-02-21 16:03:17 +0300
committerMasahiro Yamada <masahiroy@kernel.org>2021-02-24 09:12:06 +0300
commitae8da72bde7a3fb5c756fa34506196fe190c3204 (patch)
tree199670276a9b074801c410a5bdbad054f6e5f182 /scripts/kconfig
parenta2af62c3bd8fec5a2771be88c95783ddfcc57631 (diff)
downloadlinux-ae8da72bde7a3fb5c756fa34506196fe190c3204.tar.xz
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>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/Makefile2
-rw-r--r--scripts/kconfig/conf.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 2c40e68853dd..5180a71c931f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -29,7 +29,7 @@ menuconfig: $(obj)/mconf
$(Q)$< $(silent) $(Kconfig)
config: $(obj)/conf
- $(Q)$< $(silent) --oldaskconfig $(Kconfig)
+ $(Q)$< $(silent) $(Kconfig)
nconfig: $(obj)/nconf
$(Q)$< $(silent) $(Kconfig)
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 37e17934b67a..957d2a0832f7 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -483,6 +483,7 @@ static void conf_usage(const char *progname)
printf(" --randconfig New config with random answer to all options\n");
printf(" --yes2modconfig Change answers from yes to mod if possible\n");
printf(" --mod2yesconfig Change answers from mod to yes if possible\n");
+ printf(" (If none of the above is given, --oldaskconfig is the default)\n");
}
int main(int ac, char **av)