1 files changed, 28 insertions, 6 deletions

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 0fce20cb7f3c..c86c27f2c761 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -114,7 +114,7 @@ void menu_set_type(int type)
                 sym->type = type;
                 return;
         }
-        menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'\n",
+        menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'",
             sym->name ? sym->name : "<choice>",
             sym_type_name(sym->type), sym_type_name(type));
 }
@@ -124,15 +124,20 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
         struct property *prop = prop_alloc(type, current_entry->sym);
 
         prop->menu = current_entry;
-        prop->text = prompt;
         prop->expr = expr;
         prop->visible.expr = menu_check_dep(dep);
 
         if (prompt) {
+                if (isspace(*prompt)) {
+                        prop_warn(prop, "leading whitespace ignored");
+                        while (isspace(*prompt))
+                                prompt++;
+                }
                 if (current_entry->prompt)
-                        menu_warn(current_entry, "prompt redefined\n");
+                        prop_warn(prop, "prompt redefined");
                 current_entry->prompt = prop;
         }
+        prop->text = prompt;
 
         return prop;
 }
@@ -152,6 +157,24 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep)
         menu_add_prop(type, NULL, expr_alloc_symbol(sym), dep);
 }
 
+void menu_add_option(int token, char *arg)
+{
+        struct property *prop;
+
+        switch (token) {
+        case T_OPT_MODULES:
+                prop = prop_alloc(P_DEFAULT, modules_sym);
+                prop->expr = expr_alloc_symbol(current_entry->sym);
+                break;
+        case T_OPT_DEFCONFIG_LIST:
+                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");
+                break;
+        }
+}
+
 static int menu_range_valid_sym(struct symbol *sym, struct symbol *sym2)
 {
         return sym2->type == S_INT || sym2->type == S_HEX ||
@@ -325,11 +348,10 @@ void menu_finalize(struct menu *parent)
 
         if (sym && !(sym->flags & SYMBOL_WARNED)) {
                 if (sym->type == S_UNKNOWN)
-                        menu_warn(parent, "config symbol defined "
-                            "without type\n");
+                        menu_warn(parent, "config symbol defined without type");
 
                 if (sym_is_choice(sym) && !parent->prompt)
-                        menu_warn(parent, "choice must have a prompt\n");
+                        menu_warn(parent, "choice must have a prompt");
 
                 /* Check properties connected to this symbol */
                 sym_check_prop(sym);