path: root/scripts
diff options
authorSrinivas Kandagatla <>2011-08-02 18:49:52 +0100
committerGreg Kroah-Hartman <>2011-11-11 09:44:10 -0800
commitf571b637c81f3cbac21c93c2f0e283965235b152 (patch)
tree9e0fc34168f329e650d1d490081bb2e89f342f35 /scripts
parent29ac4c3a5cc34c3fa5a44cdba3be3fd606cac748 (diff)
kbuild: Fix help text not displayed in choice option.
commit 3f198dfee49d2e9c30583c62b0c79286c78c7b44 upstream. Help text under choice menu is never displayed because it does not have symbol name associated with it, however many kconfigs have help text under choice, assuming that it will be displayed when user selects help. for example in Kconfig if we have: choice prompt "Choice" ---help--- HELP TEXT ... config A bool "A" config B bool "B" endchoice Without this patch "HELP TEXT" is not displayed when user selects help option when "Choice" is highlighted from menuconfig or xconfig or gconfig. This patch changes the logic in menu_get_ext_help to display help for cases which dont have symbol names like choice. Signed-off-by: Srinivas Kandagatla <> Reviewed-by: Stuart Menefy <> Reviewed-by: Arnaud Lacombe <> Signed-off-by: Michal Marek <> Signed-off-by: Greg Kroah-Hartman <>
Diffstat (limited to 'scripts')
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index d66008639a43..beeb92e75f8f 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -597,11 +597,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
struct symbol *sym = menu->sym;
if (menu_has_help(menu)) {
- if (sym->name) {
+ if (sym->name)
str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
- str_append(help, _(menu_get_help(menu)));
- str_append(help, "\n");
- }
+ str_append(help, _(menu_get_help(menu)));
+ str_append(help, "\n");
} else {
str_append(help, nohelp_text);