kconfig: syntax cleanup - drop support for "depends/requires/def_boolean"

Remove the following redundant and never or rarely used kconfig syntax:

- "def_boolean" (same as "def_bool")
- "requires" (same as "depends on")
- "depends" (same as "depends on")

This patch contains the code changes and Kconfig updates.
The shipped files are in next patch to let actual codechange stand out.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Cc: Bryan Wu <bryan.wu@analog.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

2 files changed, 0 insertions, 13 deletions

diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf
index 9b44c80dd899..93538e567bda 100644
--- a/scripts/kconfig/zconf.gperf
+++ b/scripts/kconfig/zconf.gperf
@@ -23,7 +23,6 @@ help,		T_HELP,		TF_COMMAND
 if,             T_IF,           TF_COMMAND|TF_PARAM
 endif,          T_ENDIF,        TF_COMMAND
 depends,        T_DEPENDS,      TF_COMMAND
-requires,       T_REQUIRES,     TF_COMMAND
 optional,       T_OPTIONAL,     TF_COMMAND
 default,        T_DEFAULT,      TF_COMMAND, S_UNKNOWN
 prompt,         T_PROMPT,       TF_COMMAND
@@ -32,7 +31,6 @@ def_tristate,	T_DEFAULT,	TF_COMMAND, S_TRISTATE
 bool,           T_TYPE,         TF_COMMAND, S_BOOLEAN
 boolean,        T_TYPE,         TF_COMMAND, S_BOOLEAN
 def_bool,       T_DEFAULT,      TF_COMMAND, S_BOOLEAN
-def_boolean,    T_DEFAULT,      TF_COMMAND, S_BOOLEAN
 int,            T_TYPE,         TF_COMMAND, S_INT
 hex,            T_TYPE,         TF_COMMAND, S_HEX
 string,         T_TYPE,         TF_COMMAND, S_STRING
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 79db4cf22a51..d9b96ba8e38c 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -64,7 +64,6 @@ static struct menu *current_menu, *current_entry;
 %token <id>T_IF
 %token <id>T_ENDIF
 %token <id>T_DEPENDS
-%token <id>T_REQUIRES
 %token <id>T_OPTIONAL
 %token <id>T_PROMPT
 %token <id>T_TYPE
@@ -418,16 +417,6 @@ depends: T_DEPENDS T_ON expr T_EOL
 {
         menu_add_dep($3);
         printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
-}
-        | T_DEPENDS expr T_EOL
-{
-        menu_add_dep($2);
-        printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno());
-}
-        | T_REQUIRES expr T_EOL
-{
-        menu_add_dep($2);
-        printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno());
 };
 
 /* prompt statement */