kconfig: remove allnoconfig_y option

Now that the only user, CONFIG_EMBEDDED has stopped using this option,
remove it entirely.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/Documentation/kbuild/kconfig-language.rst b/Documentation/kbuild/kconfig-language.rst
index 3cbccfc..4a796c6 100644 (file)
--- a/Documentation/kbuild/kconfig-language.rst
+++ b/Documentation/kbuild/kconfig-language.rst
@@ -234,10 +234,6 @@ applicable everywhere (see syntax).
     enables the third modular state for all config symbols.
     At most one symbol may have the "modules" option set.
 
     enables the third modular state for all config symbols.
     At most one symbol may have the "modules" option set.
 

-  - "allnoconfig_y"
-    This declares the symbol as one that should have the value y when
-    using "allnoconfig". Used for symbols that hide other symbols.
-

 Menu dependencies
 -----------------
 
 Menu dependencies
 -----------------
 

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 10958f1..bfa1ea8 100644 (file)
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -242,10 +242,7 @@ static bool conf_set_all_new_symbols(enum conf_def_mode mode)
                                sym->def[S_DEF_USER].tri = mod;
                                break;
                        case def_no:
                                sym->def[S_DEF_USER].tri = mod;
                                break;
                        case def_no:

-                               if (sym->flags & SYMBOL_ALLNOCONFIG_Y)
-                                       sym->def[S_DEF_USER].tri = yes;
-                               else
-                                       sym->def[S_DEF_USER].tri = no;
+                               sym->def[S_DEF_USER].tri = no;

                                break;
                        case def_random:
                                sym->def[S_DEF_USER].tri = no;
                                break;
                        case def_random:
                                sym->def[S_DEF_USER].tri = no;

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index dc17152..9c9caca 100644 (file)
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -156,9 +156,6 @@ struct symbol {
 /* choice values need to be set before calculating this symbol value */
 #define SYMBOL_NEED_SET_CHOICE_VALUES  0x100000
 
 /* choice values need to be set before calculating this symbol value */
 #define SYMBOL_NEED_SET_CHOICE_VALUES  0x100000
 

-/* Set symbol to y if allnoconfig; used for symbols that hide others */
-#define SYMBOL_ALLNOCONFIG_Y 0x200000
-

 #define SYMBOL_MAXLENGTH       256
 #define SYMBOL_HASHSIZE                9973
 
 #define SYMBOL_MAXLENGTH       256
 #define SYMBOL_HASHSIZE                9973
 

diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
index e918950..08c96a6 100644 (file)
--- a/scripts/kconfig/lexer.l
+++ b/scripts/kconfig/lexer.l
@@ -91,7 +91,6 @@ n     [A-Za-z0-9_-]
 [ \t]*                 /* whitespaces */
 \\\n                   /* escaped new line */
 \n                     return T_EOL;
 [ \t]*                 /* whitespaces */
 \\\n                   /* escaped new line */
 \n                     return T_EOL;

-"allnoconfig_y"                return T_ALLNOCONFIG_Y;

 "bool"                 return T_BOOL;
 "choice"               return T_CHOICE;
 "comment"              return T_COMMENT;
 "bool"                 return T_BOOL;
 "choice"               return T_CHOICE;
 "comment"              return T_COMMENT;

diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 7378e96..679ebad 100644 (file)
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -96,7 +96,6 @@ struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
 void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
 void menu_add_option_modules(void);
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
 void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
 void menu_add_option_modules(void);

-void menu_add_option_allnoconfig_y(void);

 void menu_finalize(struct menu *parent);
 void menu_set_type(int type);
 
 void menu_finalize(struct menu *parent);
 void menu_set_type(int type);
 

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 5dcfc17..d50d0de 100644 (file)
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -219,11 +219,6 @@ void menu_add_option_modules(void)
        modules_sym = current_entry->sym;
 }
 
        modules_sym = current_entry->sym;
 }
 

-void menu_add_option_allnoconfig_y(void)
-{
-       current_entry->sym->flags |= SYMBOL_ALLNOCONFIG_Y;
-}
-

 static int menu_validate_number(struct symbol *sym, struct symbol *sym2)
 {
        return sym2->type == S_INT || sym2->type == S_HEX ||
 static int menu_validate_number(struct symbol *sym, struct symbol *sym2)
 {
        return sym2->type == S_INT || sym2->type == S_HEX ||

diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y
index f11d838..2ada169 100644 (file)
--- a/scripts/kconfig/parser.y
+++ b/scripts/kconfig/parser.y
@@ -45,7 +45,6 @@ static struct menu *current_menu, *current_entry;
 %token <string> T_HELPTEXT
 %token <string> T_WORD
 %token <string> T_WORD_QUOTE
 %token <string> T_HELPTEXT
 %token <string> T_WORD
 %token <string> T_WORD_QUOTE

-%token T_ALLNOCONFIG_Y

 %token T_BOOL
 %token T_CHOICE
 %token T_CLOSE_PAREN
 %token T_BOOL
 %token T_CHOICE
 %token T_CLOSE_PAREN


@@ -222,11 +221,6 @@ config_option: T_OPTION T_MODULES T_EOL
        menu_add_option_modules();
 };
 
        menu_add_option_modules();
 };
 

-config_option: T_OPTION T_ALLNOCONFIG_Y T_EOL
-{
-       menu_add_option_allnoconfig_y();
-};
-

 /* choice entry */
 
 choice: T_CHOICE word_opt T_EOL
 /* choice entry */
 
 choice: T_CHOICE word_opt T_EOL