kconfig: drop 'boolean' keyword

No more users of this keyword.  Drop it according to the notice by
commit 6341e62b212a ("kconfig: use bool instead of boolean for type
definition attributes").

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 297b079ae4d9f0decbabc76d0f7e833e20aadadb..027f5b4892cf01b6eee61c51a800b5d283e67b18 100644 (file)
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -1123,7 +1123,7 @@ void set_all_choice_values(struct symbol *csym)
 bool conf_set_all_new_symbols(enum conf_def_mode mode)
 {
        struct symbol *sym, *csym;
-       int i, cnt, pby, pty, ptm;      /* pby: probability of boolean  = y
+       int i, cnt, pby, pty, ptm;      /* pby: probability of bool     = y
                                         * pty: probability of tristate = y
                                         * ptm: probability of tristate = m
                                         */

diff --git a/scripts/kconfig/kconf_id.c b/scripts/kconfig/kconf_id.c
index 5abbc728fbc43f99ecf1693d84a2ce76b827ef12..3ea9c5f9f730db8a6c555b5692a3086434524956 100644 (file)
--- a/scripts/kconfig/kconf_id.c
+++ b/scripts/kconfig/kconf_id.c
@@ -20,7 +20,6 @@ static struct kconf_id kconf_id_array[] = {
        { "tristate",           T_TYPE,                 TF_COMMAND, S_TRISTATE },
        { "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 },
        { "int",                T_TYPE,                 TF_COMMAND, S_INT },
        { "hex",                T_TYPE,                 TF_COMMAND, S_HEX },

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 315ce2c7cb9dbc48b545329ee144c27e569d5c81..c829be8bb19fb3e0b37ee72a7e632074dd3f1b11 100644 (file)
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -246,7 +246,7 @@ search_help[] = N_(
        "  Selected by: BAR [=n]\n"
        "-----------------------------------------------------------------\n"
        "o The line 'Type:' shows the type of the configuration option for\n"
-       "  this symbol (boolean, tristate, string, ...)\n"
+       "  this symbol (bool, tristate, string, ...)\n"
        "o The line 'Prompt:' shows the text used in the menu structure for\n"
        "  this symbol\n"
        "o The 'Defined at' line tells at what file / line number the symbol\n"

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 93fe2fb841db63c33880967cd87a52effa9072c0..47bec3434fef16f1b0c46e0f8d908ee704aa57ca 100644 (file)
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -269,13 +269,13 @@ static void sym_check_prop(struct symbol *sym)
                        if (sym->type != S_BOOLEAN && sym->type != S_TRISTATE)
                                prop_warn(prop,
                                    "config symbol '%s' uses %s, but is "
-                                   "not boolean or tristate", sym->name, use);
+                                   "not bool or tristate", sym->name, use);
                        else if (sym2->type != S_UNKNOWN &&
                                 sym2->type != S_BOOLEAN &&
                                 sym2->type != S_TRISTATE)
                                prop_warn(prop,
                                    "'%s' has wrong type. '%s' only "
-                                   "accept arguments of boolean and "
+                                   "accept arguments of bool and "
                                    "tristate type", sym2->name, use);
                        break;
                case P_RANGE:

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 55c95e0bb48a546c7fddd5fae42d9f7855ad840b..c9123ed2b791ad2de18450485f11ed15984cf448 100644 (file)
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -77,7 +77,7 @@ const char *sym_type_name(enum symbol_type type)
 {
        switch (type) {
        case S_BOOLEAN:
-               return "boolean";
+               return "bool";
        case S_TRISTATE:
                return "tristate";
        case S_INT:

diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 798d56cba4a94a627f99471bc7c8fd73ff11f589..db5fbd8ac686f8d5eeac792434ea2abcdb1163c4 100644 (file)
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -639,7 +639,7 @@ static void print_symbol(FILE *out, struct menu *menu)
                fprintf(out, "\nconfig %s\n", sym->name);
        switch (sym->type) {
        case S_BOOLEAN:
-               fputs("  boolean\n", out);
+               fputs("  bool\n", out);
                break;
        case S_TRISTATE:
                fputs("  tristate\n", out);