kconfig: reference environment variables directly and remove 'option env='

[carl9170fw.git] / config / zconf.y

diff --git a/config/zconf.y b/config/zconf.y
index 250d58e7d046a244fd195ea546f48fabdb8ba01e..c02e5c39f4ea162646f5524fcfb1284efe788ccc 100644 (file)
--- a/config/zconf.y
+++ b/config/zconf.y
@@ -276,6 +276,7 @@ choice: T_CHOICE word_opt T_EOL
        sym->flags |= SYMBOL_AUTO;
        menu_add_entry(sym);
        menu_add_expr(P_CHOICE, NULL, NULL);
+       free($2);
        printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
 };
 
@@ -533,7 +534,6 @@ void conf_parse(const char *name)
 
        zconf_initscan(name);
 
-       sym_init();
        _menu_init();
        rootmenu.prompt = menu_add_prompt(P_MENU, "CARL9170 Firmware Configuration", NULL);
 
@@ -546,7 +546,7 @@ void conf_parse(const char *name)
                modules_sym = sym_find( "n" );
 
        tmp = rootmenu.prompt->text;
-       rootmenu.prompt->text = _(rootmenu.prompt->text);
+       rootmenu.prompt->text = rootmenu.prompt->text;
        rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
        free((char*)tmp);
 
@@ -780,3 +780,4 @@ void zconfdump(FILE *out)
 #include "expr.c"
 #include "symbol.c"
 #include "menu.c"
+#include "preprocess.c"