diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2018-02-01 00:39:45 (GMT) |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2018-02-01 00:39:45 (GMT) |
| commit | 59b08f8d06700770cf1105269acb2ec2460e2a34 (patch) | |
| tree | 7e26466ff1bdcb344d223d27c24a2014ff54a38f /kconfig/expr.c | |
| parent | ba165ed4c0bfa8a83e61a2efd1ad205777978486 (diff) | |
Sync kconfig files with upstream 4.15
Last updated with 4.9-rc7.
This commit introduces the following upstream changes:
9059a3493efe kconfig: fix relational operators for bool and tristate symbols
88127dae6ed9 kconfig/symbol.c: use correct pointer type argument for sizeof
b24413180f56 License cleanup: add SPDX GPL-2.0 license identifier to files with no license
bb3290d91695 Remove gperf usage from toolchain
ad8181060788 kconfig: fix sparse warnings in nconfig
ff85a1a80e00 kconfig: Check for libncurses before menuconfig
9be3213b14d4 gconfig: remove misleading parentheses around a condition
83c3a1bad224 xconfig: fix missing suboption and help panels on first run
e039303ff71a xconfig: fix 'Show Debug' functionality
79e51b5c2dee kconfig/nconf: Fix hang when editing symbol with a long prompt
0eb47346968f Scripts: kconfig: nconf: fix _GNU_SOURCE redefined warning
237e3ad0f195 Kconfig: Introduce the "imply" keyword
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'kconfig/expr.c')
| -rw-r--r-- | kconfig/expr.c | 5 |
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; |