From ffb5957bc48f64f0773fd3fbc43cb9bb9b38e270 Mon Sep 17 00:00:00 2001 From: Arnaud Lacombe Date: Sat, 14 Aug 2010 23:57:43 -0400 Subject: kconfig: allow build-time definition of the internal config prefix Signed-off-by: Arnaud Lacombe Reviewed-by: Sam Ravnborg Reviewed-by: Michal Marek --- scripts/kconfig/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/kconfig/menu.c') diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 4fb590247f33..64da30c76894 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -566,7 +566,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) if (menu_has_help(menu)) { if (sym->name) { - str_printf(help, "CONFIG_%s:\n\n", sym->name); + str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); str_append(help, _(menu_get_help(menu))); str_append(help, "\n"); } -- cgit v1.2.2 From 652cf9821d2a5b22a1725ce8dc235ea5de0e1c6f Mon Sep 17 00:00:00 2001 From: Arnaud Lacombe Date: Sat, 14 Aug 2010 23:51:40 -0400 Subject: kconfig: rephrase help texts/comments not to include the package name Signed-off-by: Arnaud Lacombe Reviewed-by: Randy Dunlap Reviewed-by: Sam Ravnborg Reviewed-by: Michal Marek --- scripts/kconfig/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/kconfig/menu.c') diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 64da30c76894..682045a7aae4 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -10,7 +10,7 @@ #include "lkc.h" static const char nohelp_text[] = N_( - "There is no help available for this kernel option.\n"); + "There is no help available for this option.\n"); struct menu rootmenu; static struct menu **last_entry_ptr; -- cgit v1.2.2 From ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46 Mon Sep 17 00:00:00 2001 From: Arnaud Lacombe Date: Sat, 4 Sep 2010 16:05:15 -0400 Subject: kconfig: don't emit warning upon rootmenu's prompt redefinition This silences the warning printed upon prompt redefinition for the rootmenu. We will encounter this redefinition when a "mainmenu" statement is specified and override the default prompt. Signed-off-by: Arnaud Lacombe Reviewed-by: Sam Ravnborg Reviewed-by: Michal Marek --- scripts/kconfig/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/kconfig/menu.c') diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 682045a7aae4..23acbdb2fd50 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -139,7 +139,7 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e while (isspace(*prompt)) prompt++; } - if (current_entry->prompt) + if (current_entry->prompt && current_entry != &rootmenu) prop_warn(prop, "prompt redefined"); current_entry->prompt = prop; } -- cgit v1.2.2