summaryrefslogtreecommitdiff
path: root/kconfig/expr.c
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2018-02-05 07:26:28 (GMT)
committerGitHub <noreply@github.com>2018-02-05 07:26:28 (GMT)
commit04d910b8267856b345db93a5395212c4f7cd9199 (patch)
tree312dddf8b98f369ce51898e3c2c020bf4351ed14 /kconfig/expr.c
parentdfcb5fe3c14db5ec291aedb567f1da4ff19f8323 (diff)
parent59b08f8d06700770cf1105269acb2ec2460e2a34 (diff)
Merge pull request #907 from bhundven/update_kconfig_4_15
Sync kconfig files with upstream 4.15
Diffstat (limited to 'kconfig/expr.c')
-rw-r--r--kconfig/expr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kconfig/expr.c b/kconfig/expr.c
index cbf4996..8cee597 100644
--- a/kconfig/expr.c
+++ b/kconfig/expr.c
@@ -893,7 +893,10 @@ static enum string_value_kind expr_parse_string(const char *str,
switch (type) {
case S_BOOLEAN:
case S_TRISTATE:
- return k_string;
+ val->s = !strcmp(str, "n") ? 0 :
+ !strcmp(str, "m") ? 1 :
+ !strcmp(str, "y") ? 2 : -1;
+ return k_signed;
case S_INT:
val->s = strtoll(str, &tail, 10);
kind = k_signed;