diff options
| author | Patrick Georgi <patrick@coreboot.org> | 2024-03-13 13:01:21 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2024-04-03 12:28:04 +0000 |
| commit | 7761237dfe0c509fa4cae255b20fa4b1278cbca1 (patch) | |
| tree | 949e8eafd32fd4bfb2a518f7cce4344ddf3c25e3 /util/kconfig/menu.c | |
| parent | 96499840aa3f5376ae8cfa1cefb6fd98800019a9 (diff) | |
util/kconfig: Uprev to Linux 6.8's kconfig
Linux kconfig has its own implementation of KCONFIG_WERROR now, so use
that. This reduces our patch count by 2.
Change-Id: I4f5f1f552e96f8ef7a4c5c0ab2ab7e2b6d798ceb
Signed-off-by: Patrick Georgi <patrick@georgi.software>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81223
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'util/kconfig/menu.c')
| -rw-r--r-- | util/kconfig/menu.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/util/kconfig/menu.c b/util/kconfig/menu.c index d936ccca94..26e81b41e6 100644 --- a/util/kconfig/menu.c +++ b/util/kconfig/menu.c @@ -673,19 +673,6 @@ struct menu *menu_get_parent_menu(struct menu *menu) return menu; } -bool menu_has_help(struct menu *menu) -{ - return menu->help != NULL; -} - -const char *menu_get_help(struct menu *menu) -{ - if (menu->help) - return menu->help; - else - return ""; -} - static void get_def_str(struct gstr *r, struct menu *menu) { str_printf(r, "Defined at %s:%d\n", @@ -856,10 +843,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) struct symbol *sym = menu->sym; const char *help_text = nohelp_text; - if (menu_has_help(menu)) { + if (menu->help) { if (sym->name) str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); - help_text = menu_get_help(menu); + help_text = menu->help; } str_printf(help, "%s\n", help_text); if (sym) |