aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2010-07-31 17:35:31 -0400
committerMichal Marek <mmarek@suse.cz>2010-08-03 07:49:32 -0400
commit0748cb3e1fbd89c03a98c15e91ad65797981de77 (patch)
tree89d2ad1c37d7ad9527d8a4c0ec5e7c11169fb185
parentd595cea62403db4e65b98a8bb96ff2b5205c7b82 (diff)
kconfig: add alldefconfig
alldefconfig create a configuration with all values set to their default value (form the Kconfig files). This may be useful when we try to use more sensible default values and may also be used in combination with the minimal defconfigs. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--Documentation/kbuild/kconfig.txt2
-rw-r--r--scripts/kconfig/Makefile13
-rw-r--r--scripts/kconfig/conf.c7
3 files changed, 15 insertions, 7 deletions
diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt
index 49efae703979..0e69dd5f7a05 100644
--- a/Documentation/kbuild/kconfig.txt
+++ b/Documentation/kbuild/kconfig.txt
@@ -65,7 +65,7 @@ also use the environment variable KCONFIG_ALLCONFIG as a flag or a
65filename that contains config symbols that the user requires to be 65filename that contains config symbols that the user requires to be
66set to a specific value. If KCONFIG_ALLCONFIG is used without a 66set to a specific value. If KCONFIG_ALLCONFIG is used without a
67filename, "make *config" checks for a file named 67filename, "make *config" checks for a file named
68"all{yes/mod/no/random}.config" (corresponding to the *config command 68"all{yes/mod/no/def/random}.config" (corresponding to the *config command
69that was used) for symbol values that are to be forced. If this file 69that was used) for symbol values that are to be forced. If this file
70is not found, it checks for a file named "all.config" to contain forced 70is not found, it checks for a file named "all.config" to contain forced
71values. 71values.
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 01bad1bd2550..72973591c0f1 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -85,9 +85,9 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
85 $(Q)rm -f arch/um/Kconfig.arch 85 $(Q)rm -f arch/um/Kconfig.arch
86 $(Q)rm -f $(obj)/config.pot 86 $(Q)rm -f $(obj)/config.pot
87 87
88PHONY += allnoconfig allyesconfig allmodconfig randconfig 88PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
89 89
90allnoconfig allyesconfig allmodconfig randconfig: $(obj)/conf 90allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
91 $< --$@ $(Kconfig) 91 $< --$@ $(Kconfig)
92 92
93PHONY += listnewconfig oldnoconfig defconfig 93PHONY += listnewconfig oldnoconfig defconfig
@@ -117,11 +117,12 @@ help:
117 @echo ' localmodconfig - Update current config disabling modules not loaded' 117 @echo ' localmodconfig - Update current config disabling modules not loaded'
118 @echo ' localyesconfig - Update current config converting local mods to core' 118 @echo ' localyesconfig - Update current config converting local mods to core'
119 @echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps' 119 @echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
120 @echo ' randconfig - New config with random answer to all options' 120 @echo ' defconfig - New config with default from ARCH supplied defconfig'
121 @echo ' defconfig - New config with default answer to all options'
122 @echo ' allmodconfig - New config selecting modules when possible'
123 @echo ' allyesconfig - New config where all options are accepted with yes'
124 @echo ' allnoconfig - New config where all options are answered with no' 121 @echo ' allnoconfig - New config where all options are answered with no'
122 @echo ' allyesconfig - New config where all options are accepted with yes'
123 @echo ' allmodconfig - New config selecting modules when possible'
124 @echo ' alldefconfig - New config with all symbols set to default'
125 @echo ' randconfig - New config with random answer to all options'
125 @echo ' listnewconfig - List new options' 126 @echo ' listnewconfig - List new options'
126 @echo ' oldnoconfig - Same as silentoldconfig but set new symbols to n (unset)' 127 @echo ' oldnoconfig - Same as silentoldconfig but set new symbols to n (unset)'
127 128
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index ff5c914c0e5c..c8bd33cb3bf7 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -27,6 +27,7 @@ enum input_mode {
27 allnoconfig, 27 allnoconfig,
28 allyesconfig, 28 allyesconfig,
29 allmodconfig, 29 allmodconfig,
30 alldefconfig,
30 randconfig, 31 randconfig,
31 defconfig, 32 defconfig,
32 listnewconfig, 33 listnewconfig,
@@ -446,6 +447,7 @@ static struct option long_opts[] = {
446 {"allnoconfig", no_argument, NULL, allnoconfig}, 447 {"allnoconfig", no_argument, NULL, allnoconfig},
447 {"allyesconfig", no_argument, NULL, allyesconfig}, 448 {"allyesconfig", no_argument, NULL, allyesconfig},
448 {"allmodconfig", no_argument, NULL, allmodconfig}, 449 {"allmodconfig", no_argument, NULL, allmodconfig},
450 {"alldefconfig", no_argument, NULL, alldefconfig},
449 {"randconfig", no_argument, NULL, randconfig}, 451 {"randconfig", no_argument, NULL, randconfig},
450 {"listnewconfig", no_argument, NULL, listnewconfig}, 452 {"listnewconfig", no_argument, NULL, listnewconfig},
451 {"oldnoconfig", no_argument, NULL, oldnoconfig}, 453 {"oldnoconfig", no_argument, NULL, oldnoconfig},
@@ -534,6 +536,7 @@ int main(int ac, char **av)
534 case allnoconfig: 536 case allnoconfig:
535 case allyesconfig: 537 case allyesconfig:
536 case allmodconfig: 538 case allmodconfig:
539 case alldefconfig:
537 case randconfig: 540 case randconfig:
538 name = getenv("KCONFIG_ALLCONFIG"); 541 name = getenv("KCONFIG_ALLCONFIG");
539 if (name && !stat(name, &tmpstat)) { 542 if (name && !stat(name, &tmpstat)) {
@@ -544,6 +547,7 @@ int main(int ac, char **av)
544 case allnoconfig: name = "allno.config"; break; 547 case allnoconfig: name = "allno.config"; break;
545 case allyesconfig: name = "allyes.config"; break; 548 case allyesconfig: name = "allyes.config"; break;
546 case allmodconfig: name = "allmod.config"; break; 549 case allmodconfig: name = "allmod.config"; break;
550 case alldefconfig: name = "alldef.config"; break;
547 case randconfig: name = "allrandom.config"; break; 551 case randconfig: name = "allrandom.config"; break;
548 default: break; 552 default: break;
549 } 553 }
@@ -578,6 +582,9 @@ int main(int ac, char **av)
578 case allmodconfig: 582 case allmodconfig:
579 conf_set_all_new_symbols(def_mod); 583 conf_set_all_new_symbols(def_mod);
580 break; 584 break;
585 case alldefconfig:
586 conf_set_all_new_symbols(def_default);
587 break;
581 case randconfig: 588 case randconfig:
582 conf_set_all_new_symbols(def_random); 589 conf_set_all_new_symbols(def_random);
583 break; 590 break;