aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/kconfig/Makefile7
-rw-r--r--scripts/kconfig/conf.c14
2 files changed, 10 insertions, 11 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 549e50e49cbf..2142afb0a13b 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -90,9 +90,9 @@ PHONY += allnoconfig allyesconfig allmodconfig randconfig
90allnoconfig allyesconfig allmodconfig randconfig: $(obj)/conf 90allnoconfig allyesconfig allmodconfig randconfig: $(obj)/conf
91 $< --$@ $(Kconfig) 91 $< --$@ $(Kconfig)
92 92
93PHONY += nonint_oldconfig loose_nonint_oldconfig defconfig 93PHONY += nonint_oldconfig oldnoconfig defconfig
94 94
95nonint_oldconfig loose_nonint_oldconfig: $(obj)/conf 95nonint_oldconfig oldnoconfig: $(obj)/conf
96 $< --$@ $(Kconfig) 96 $< --$@ $(Kconfig)
97 97
98defconfig: $(obj)/conf 98defconfig: $(obj)/conf
@@ -124,8 +124,7 @@ help:
124 @echo ' allnoconfig - New config where all options are answered with no' 124 @echo ' allnoconfig - New config where all options are answered with no'
125 @echo ' nonint_oldconfig - Checks the current configuration and fails if an option is ' 125 @echo ' nonint_oldconfig - Checks the current configuration and fails if an option is '
126 @echo ' not set' 126 @echo ' not set'
127 @echo ' loose_nonint_oldconfig - Same as nonint_oldconfig, but updates the config file with ' 127 @echo ' oldnoconfig - Same as silentoldconfig but set new symbols to n (unset)'
128 @echo ' missing config options as unset'
129 128
130# lxdialog stuff 129# lxdialog stuff
131check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh 130check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 2dec584f1268..1f86fca6b07f 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -34,7 +34,7 @@ enum input_mode {
34 randconfig, 34 randconfig,
35 defconfig, 35 defconfig,
36 nonint_oldconfig, 36 nonint_oldconfig,
37 loose_nonint_oldconfig, 37 oldnoconfig,
38} input_mode = oldaskconfig; 38} input_mode = oldaskconfig;
39 39
40char *defconfig_file; 40char *defconfig_file;
@@ -367,7 +367,7 @@ static void conf(struct menu *menu)
367 case P_MENU: 367 case P_MENU:
368 if ((input_mode == silentoldconfig || 368 if ((input_mode == silentoldconfig ||
369 input_mode == nonint_oldconfig || 369 input_mode == nonint_oldconfig ||
370 input_mode == loose_nonint_oldconfig) && 370 input_mode == oldnoconfig) &&
371 rootEntry != menu) { 371 rootEntry != menu) {
372 check_conf(menu); 372 check_conf(menu);
373 return; 373 return;
@@ -427,7 +427,7 @@ static void check_conf(struct menu *menu)
427 if (sym_is_changable(sym) || 427 if (sym_is_changable(sym) ||
428 (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { 428 (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
429 if (input_mode == nonint_oldconfig || 429 if (input_mode == nonint_oldconfig ||
430 input_mode == loose_nonint_oldconfig) { 430 input_mode == oldnoconfig) {
431 if (input_mode == nonint_oldconfig && 431 if (input_mode == nonint_oldconfig &&
432 sym->name && !sym_is_choice_value(sym)) { 432 sym->name && !sym_is_choice_value(sym)) {
433 if (!unset_variables) 433 if (!unset_variables)
@@ -460,7 +460,7 @@ static struct option long_opts[] = {
460 {"allmodconfig", no_argument, NULL, allmodconfig}, 460 {"allmodconfig", no_argument, NULL, allmodconfig},
461 {"randconfig", no_argument, NULL, randconfig}, 461 {"randconfig", no_argument, NULL, randconfig},
462 {"nonint_oldconfig", no_argument, NULL, nonint_oldconfig}, 462 {"nonint_oldconfig", no_argument, NULL, nonint_oldconfig},
463 {"loose_nonint_oldconfig", no_argument, NULL, loose_nonint_oldconfig}, 463 {"oldnoconfig", no_argument, NULL, oldnoconfig},
464 {NULL, 0, NULL, 0} 464 {NULL, 0, NULL, 0}
465}; 465};
466 466
@@ -540,7 +540,7 @@ int main(int ac, char **av)
540 case oldaskconfig: 540 case oldaskconfig:
541 case oldconfig: 541 case oldconfig:
542 case nonint_oldconfig: 542 case nonint_oldconfig:
543 case loose_nonint_oldconfig: 543 case oldnoconfig:
544 conf_read(NULL); 544 conf_read(NULL);
545 break; 545 break;
546 case allnoconfig: 546 case allnoconfig:
@@ -603,7 +603,7 @@ int main(int ac, char **av)
603 input_mode = silentoldconfig; 603 input_mode = silentoldconfig;
604 /* fall through */ 604 /* fall through */
605 case nonint_oldconfig: 605 case nonint_oldconfig:
606 case loose_nonint_oldconfig: 606 case oldnoconfig:
607 case silentoldconfig: 607 case silentoldconfig:
608 /* Update until a loop caused no more changes */ 608 /* Update until a loop caused no more changes */
609 do { 609 do {
@@ -611,7 +611,7 @@ int main(int ac, char **av)
611 check_conf(&rootmenu); 611 check_conf(&rootmenu);
612 } while (conf_cnt && 612 } while (conf_cnt &&
613 (input_mode != nonint_oldconfig && 613 (input_mode != nonint_oldconfig &&
614 input_mode != loose_nonint_oldconfig)); 614 input_mode != oldnoconfig));
615 break; 615 break;
616 } 616 }
617 617