History

kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help

As explained by Michal Marek at https://lkml.org/lkml/2011/8/31/189 silentoldconfig has become a misnomer. It has become an internal interface so remove it from "make help" and Documentation/ to stop confusing people using it as seen for instance at https://chromium-review.googlesource.com/835632 Don't remove it from kconfig/Makefile yet not to break any (other) tool using it. On the other hand, correct and expand its description in the help of the (internal) scripts/kconfig/conf.c

Marc Herbert committed 8 years ago

Commit cedd55d1 parent 1ccb2713 files · +7 −10Browse files

Showing the changes to scripts (2 of 3 files). Show all

Unified · Split

2 files
  1. scripts/kconfig/Makefile +4 −3
  2. scripts/kconfig/conf.c +3 −2
scripts/kconfig/Makefile+4−3
@@ -34,6 +34,8 @@ config: $(obj)/conf · 33 unmodified lines
34nconfig: $(obj)/nconf34nconfig: $(obj)/nconf
35 $< $(silent) $(Kconfig)35 $< $(silent) $(Kconfig)
36 36
37# This has become an internal implementation detail and is now deprecated
38# for external use.
37silentoldconfig: $(obj)/conf39silentoldconfig: $(obj)/conf
38 $(Q)mkdir -p include/config include/generated40 $(Q)mkdir -p include/config include/generated
39 $(Q)test -e include/generated/autoksyms.h || \41 $(Q)test -e include/generated/autoksyms.h || \
@@ -144,7 +146,6 @@ help: · 104 unmodified lines
144 @echo ' oldconfig - Update current config utilising a provided .config as base'146 @echo ' oldconfig - Update current config utilising a provided .config as base'
145 @echo ' localmodconfig - Update current config disabling modules not loaded'147 @echo ' localmodconfig - Update current config disabling modules not loaded'
146 @echo ' localyesconfig - Update current config converting local mods to core'148 @echo ' localyesconfig - Update current config converting local mods to core'
147 @echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
148 @echo ' defconfig - New config with default from ARCH supplied defconfig'149 @echo ' defconfig - New config with default from ARCH supplied defconfig'
149 @echo ' savedefconfig - Save current config as ./defconfig (minimal config)'150 @echo ' savedefconfig - Save current config as ./defconfig (minimal config)'
150 @echo ' allnoconfig - New config where all options are answered with no'151 @echo ' allnoconfig - New config where all options are answered with no'
@@ -153,8 +154,8 @@ help: · 2 unmodified lines
153 @echo ' alldefconfig - New config with all symbols set to default'154 @echo ' alldefconfig - New config with all symbols set to default'
154 @echo ' randconfig - New config with random answer to all options'155 @echo ' randconfig - New config with random answer to all options'
155 @echo ' listnewconfig - List new options'156 @echo ' listnewconfig - List new options'
156 @echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their'157 @echo ' olddefconfig - Same as oldconfig but sets new symbols to their'
157 @echo ' default value'158 @echo ' default value without prompting'
158 @echo ' kvmconfig - Enable additional options for kvm guest kernel support'159 @echo ' kvmconfig - Enable additional options for kvm guest kernel support'
159 @echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support'160 @echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support'
160 @echo ' tinyconfig - Configure the tiniest possible kernel'161 @echo ' tinyconfig - Configure the tiniest possible kernel'
scripts/kconfig/conf.c+3−2
@@ -484,8 +484,9 @@ static void conf_usage(const char *progname) · 483 unmodified lines
484 printf(" --listnewconfig List new options\n");484 printf(" --listnewconfig List new options\n");
485 printf(" --oldaskconfig Start a new configuration using a line-oriented program\n");485 printf(" --oldaskconfig Start a new configuration using a line-oriented program\n");
486 printf(" --oldconfig Update a configuration using a provided .config as base\n");486 printf(" --oldconfig Update a configuration using a provided .config as base\n");
487 printf(" --silentoldconfig Same as oldconfig, but quietly, additionally update deps\n");487 printf(" --silentoldconfig Similar to oldconfig but generates configuration in\n"
488 printf(" --olddefconfig Same as silentoldconfig but sets new symbols to their default value\n");488 " include/{generated/,config/} (oldconfig used to be more verbose)\n");
489 printf(" --olddefconfig Same as oldconfig but sets new symbols to their default value\n");
489 printf(" --oldnoconfig An alias of olddefconfig\n");490 printf(" --oldnoconfig An alias of olddefconfig\n");
490 printf(" --defconfig <file> New config with default defined in <file>\n");491 printf(" --defconfig <file> New config with default defined in <file>\n");
491 printf(" --savedefconfig <file> Save the minimal current configuration to <file>\n");492 printf(" --savedefconfig <file> Save the minimal current configuration to <file>\n");