kconfig: environment symbol support

[linux-2.6] / scripts / kconfig / menu.c

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 7bfa181d6ed6f685d45d8a68f301cd75810e3369..e6ef171e5b142e19c10af5c2b4a17260c78ace26 100644 (file)
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -15,7 +15,7 @@ static struct menu **last_entry_ptr;
 struct file *file_list;
 struct file *current_file;
 
-static void menu_warn(struct menu *menu, const char *fmt, ...)
+void menu_warn(struct menu *menu, const char *fmt, ...)
 {
        va_list ap;
        va_start(ap, fmt);
@@ -172,6 +172,9 @@ void menu_add_option(int token, char *arg)
                else if (sym_defconfig_list != current_entry->sym)
                        zconf_error("trying to redefine defconfig symbol");
                break;
+       case T_OPT_ENV:
+               prop_add_env(arg);
+               break;
        }
 }
 
@@ -235,23 +238,16 @@ void menu_finalize(struct menu *parent)
        sym = parent->sym;
        if (parent->list) {
                if (sym && sym_is_choice(sym)) {
-                       /* find out choice type */
-                       enum symbol_type type = S_UNKNOWN;
-
+                       /* find the first choice value and find out choice type */
                        for (menu = parent->list; menu; menu = menu->next) {
-                               if (menu->sym && menu->sym->type != S_UNKNOWN) {
-                                       if (type == S_UNKNOWN)
-                                               type = menu->sym->type;
-                                       if (type != S_BOOLEAN)
-                                               break;
-                                       if (menu->sym->type == S_TRISTATE) {
-                                               type = S_TRISTATE;
-                                               break;
-                                       }
+                               if (menu->sym) {
+                                       current_entry = parent;
+                                       menu_set_type(menu->sym->type);
+                                       current_entry = menu;
+                                       menu_set_type(sym->type);
+                                       break;
                                }
                        }
-                       current_entry = parent;
-                       menu_set_type(type);
                        parentdep = expr_alloc_symbol(sym);
                } else if (parent->prompt)
                        parentdep = parent->prompt->visible.expr;
@@ -260,16 +256,7 @@ void menu_finalize(struct menu *parent)
 
                for (menu = parent->list; menu; menu = menu->next) {
                        basedep = expr_transform(menu->dep);
-                       dep = parentdep;
-                       if (sym && sym_is_choice(sym) && menu->sym) {
-                               enum symbol_type type = menu->sym->type;
-
-                               if (type == S_UNKNOWN)
-                                       type = sym->type;
-                            if (type != S_TRISTATE)
-                                       dep = expr_alloc_comp(E_EQUAL, sym, &symbol_yes);
-                       }
-                       basedep = expr_alloc_and(expr_copy(dep), basedep);
+                       basedep = expr_alloc_and(expr_copy(parentdep), basedep);
                        basedep = expr_eliminate_dups(basedep);
                        menu->dep = basedep;
                        if (menu->sym)
@@ -342,13 +329,12 @@ void menu_finalize(struct menu *parent)
                                            "values not supported");
                        }
                        current_entry = menu;
-                       if (menu->sym->type == S_UNKNOWN)
-                               menu_set_type(sym->type);
+                       menu_set_type(sym->type);
                        menu_add_symbol(P_CHOICE, sym, NULL);
                        prop = sym_get_choice_prop(sym);
                        for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr)
                                ;
-                       *ep = expr_alloc_one(E_CHOICE, NULL);
+                       *ep = expr_alloc_one(E_LIST, NULL);
                        (*ep)->right.sym = menu->sym;
                }
                if (menu->list && (!menu->prompt || !menu->prompt->text)) {
@@ -411,9 +397,9 @@ bool menu_is_visible(struct menu *menu)
 const char *menu_get_prompt(struct menu *menu)
 {
        if (menu->prompt)
-               return _(menu->prompt->text);
+               return menu->prompt->text;
        else if (menu->sym)
-               return _(menu->sym->name);
+               return menu->sym->name;
        return NULL;
 }