diff options
author | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2021-11-24 18:25:43 -0300 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2022-02-19 13:10:01 +0100 |
commit | 009293c52e637612cd118717a1bea4e142889e09 (patch) | |
tree | c9f190a622ce0a6335875c561af5cdc2918b53ff /scripts/config/menu.c | |
parent | 73ea763c0dcdb96c9163790f20edd964399035c0 (diff) | |
download | upstream-009293c52e637612cd118717a1bea4e142889e09.tar.gz upstream-009293c52e637612cd118717a1bea4e142889e09.tar.bz2 upstream-009293c52e637612cd118717a1bea4e142889e09.zip |
build: scripts/config - update to kconfig-v5.14
Functional Changes
---------- -------
- make 'imply' not impose any restrictions: allow symbols implied by y
to become m
- change "modules" from sub-option to first-level attribute
Bugfixes
--------
- nconf: fix core dump when searching in empty menu
- nconf: stop endless search loops
- xconfig: fix content of the main widget
- xconfig: fix support for the split view mode
Other Changes
----- -------
- highlight xconfig 'comment' lines with '***'
- xconfig: navigate menus on hyperlinks
- xconfig: drop support for Qt4
- improve host ncurses detection
Update the 'option modules' usage to just 'modules' in Config.in.
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Diffstat (limited to 'scripts/config/menu.c')
-rw-r--r-- | scripts/config/menu.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/scripts/config/menu.c b/scripts/config/menu.c index 9bb5fe1582..22fd26a9f7 100644 --- a/scripts/config/menu.c +++ b/scripts/config/menu.c @@ -9,6 +9,7 @@ #include <string.h> #include "lkc.h" +#include "internal.h" static const char nohelp_text[] = "There is no help available for this option."; @@ -65,7 +66,8 @@ void menu_add_entry(struct symbol *sym) struct menu *menu_add_menu(void) { last_entry_ptr = ¤t_entry->list; - return current_menu = current_entry; + current_menu = current_entry; + return current_menu; } void menu_end_menu(void) @@ -210,28 +212,6 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep) menu_add_prop(type, expr_alloc_symbol(sym), dep); } -void menu_add_option_modules(void) -{ - if (modules_sym) - zconf_error("symbol '%s' redefines option 'modules' already defined by symbol '%s'", - current_entry->sym->name, modules_sym->name); - modules_sym = current_entry->sym; -} - -void menu_add_option_defconfig_list(void) -{ - if (!sym_defconfig_list) - sym_defconfig_list = current_entry->sym; - else if (sym_defconfig_list != current_entry->sym) - zconf_error("trying to redefine defconfig symbol"); - sym_defconfig_list->flags |= SYMBOL_NO_WRITE; -} - -void menu_add_option_allnoconfig_y(void) -{ - current_entry->sym->flags |= SYMBOL_ALLNOCONFIG_Y; -} - static int menu_validate_number(struct symbol *sym, struct symbol *sym2) { return sym2->type == S_INT || sym2->type == S_HEX || |