summaryrefslogtreecommitdiff
path: root/scripts/kconfig/kconf_id.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-11 20:00:59 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-22 00:25:34 +0900
commit3c8f317d4cf15e7a67457cfdd1e63182a34bcb69 (patch)
tree33010572a0d3dcf96be4c70e5d18b8e384451ada /scripts/kconfig/kconf_id.c
parenta01e5d242d932f67f2657ceb0d76be777cd05a04 (diff)
kconfig: use distinct tokens for type and default properties
This commit removes kconf_id::stype to prepare for the entire removal of kconf_id.c To simplify the lexer, I want keywords straight-mapped to tokens. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/kconfig/kconf_id.c')
-rw-r--r--scripts/kconfig/kconf_id.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/kconfig/kconf_id.c b/scripts/kconfig/kconf_id.c
index b3e0ea0ac732..ec2c011f9e62 100644
--- a/scripts/kconfig/kconf_id.c
+++ b/scripts/kconfig/kconf_id.c
@@ -15,15 +15,15 @@ static struct kconf_id kconf_id_array[] = {
{ "endif", T_ENDIF, TF_COMMAND },
{ "depends", T_DEPENDS, TF_COMMAND },
{ "optional", T_OPTIONAL, TF_COMMAND },
- { "default", T_DEFAULT, TF_COMMAND, S_UNKNOWN },
+ { "default", T_DEFAULT, TF_COMMAND },
+ { "def_bool", T_DEF_BOOL, TF_COMMAND },
+ { "def_tristate", T_DEF_TRISTATE, TF_COMMAND },
{ "prompt", T_PROMPT, TF_COMMAND },
- { "tristate", T_TYPE, TF_COMMAND, S_TRISTATE },
- { "def_tristate", T_DEFAULT, TF_COMMAND, S_TRISTATE },
- { "bool", 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 },
- { "string", T_TYPE, TF_COMMAND, S_STRING },
+ { "bool", T_BOOL, TF_COMMAND },
+ { "tristate", T_TRISTATE, TF_COMMAND },
+ { "int", T_INT, TF_COMMAND },
+ { "hex", T_HEX, TF_COMMAND },
+ { "string", T_STRING, TF_COMMAND },
{ "select", T_SELECT, TF_COMMAND },
{ "imply", T_IMPLY, TF_COMMAND },
{ "range", T_RANGE, TF_COMMAND },