projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: hide irrelevant sub-menus for oldconfig
[carl9170fw.git]
/
config
/
conf.c
diff --git
a/config/conf.c
b/config/conf.c
index 392cefd68daf03a68be5747733c51118c623e72b..c4bc255a95d5232b0249e63d99a529da2064ed9d 100644
(file)
--- a/
config/conf.c
+++ b/
config/conf.c
@@
-354,9
+354,11
@@
static void conf(struct menu *menu)
switch (prop->type) {
case P_MENU:
switch (prop->type) {
case P_MENU:
- if ((input_mode == listnewconfig ||
- input_mode == oldnoconfig) &&
- rootEntry != menu) {
+ /*
+ * Except in oldaskconfig mode, we show only menus that
+ * contain new symbols.
+ */
+ if (input_mode != oldaskconfig && rootEntry != menu) {
check_conf(menu);
return;
}
check_conf(menu);
return;
}
@@
-419,7
+421,7
@@
static void check_conf(struct menu *menu)
if (sym->name && !sym_is_choice_value(sym)) {
printf("%s%s\n", CONFIG_, sym->name);
}
if (sym->name && !sym_is_choice_value(sym)) {
printf("%s%s\n", CONFIG_, sym->name);
}
- } else
if (input_mode != oldnoconfig)
{
+ } else {
if (!conf_cnt++)
printf(_("*\n* Restart config...\n*\n"));
rootEntry = menu_get_parent_menu(menu);
if (!conf_cnt++)
printf(_("*\n* Restart config...\n*\n"));
rootEntry = menu_get_parent_menu(menu);
@@
-630,9
+632,7
@@
int main(int ac, char **av)
do {
conf_cnt = 0;
check_conf(&rootmenu);
do {
conf_cnt = 0;
check_conf(&rootmenu);
- } while (conf_cnt &&
- (input_mode != listnewconfig &&
- input_mode != oldnoconfig));
+ } while (conf_cnt);
break;
}
break;
}