diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2022-10-28 01:00:26 +0200 |
|---|---|---|
| committer | Patrick Georgi <patrick@coreboot.org> | 2022-10-30 08:45:52 +0000 |
| commit | 4c9b9e9709cef4937d012d6950e5e2932042c587 (patch) | |
| tree | 29fee0073ac8e97f918aa8ac00630c31dc4db042 /util/kconfig/lexer.l | |
| parent | 14cedd97a5790fe6182771630d91bfa375abf867 (diff) | |
util/kconfig: Uprev to Linux 5.16's kconfig
Linux 5.16 saw a significant rewrite in the boolean handling which
reduces our change set. On the other hand, it's all new code.
Comparing the config.build and config.h files generated by
`util/abuild/abuild -C`, only a few lines of comment in the header
changed.
Change-Id: I52984e15a48236ddf228707aec85e90f71aa4382
Signed-off-by: Patrick Georgi <patrick@coreboot.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66045
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Diffstat (limited to 'util/kconfig/lexer.l')
| -rw-r--r-- | util/kconfig/lexer.l | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/util/kconfig/lexer.l b/util/kconfig/lexer.l index dcb5648e26..2a754a8f1e 100644 --- a/util/kconfig/lexer.l +++ b/util/kconfig/lexer.l @@ -85,8 +85,7 @@ static void warn_ignored_character(char chr) n [A-Za-z0-9_-] %% - int str = 0; - int ts, i; + char open_quote = 0; #.* /* ignore comment */ [ \t]* /* whitespaces */ @@ -135,7 +134,7 @@ n [A-Za-z0-9_-] ":=" return T_COLON_EQUAL; "+=" return T_PLUS_EQUAL; \"|\' { - str = yytext[0]; + open_quote = yytext[0]; new_string(); BEGIN(STRING); } @@ -172,7 +171,7 @@ n [A-Za-z0-9_-] append_string(yytext + 1, yyleng - 1); } \'|\" { - if (str == yytext[0]) { + if (open_quote == yytext[0]) { BEGIN(INITIAL); yylval.string = text; return T_WORD_QUOTE; @@ -197,6 +196,8 @@ n [A-Za-z0-9_-] <HELP>{ [ \t]+ { + int ts, i; + ts = 0; for (i = 0; i < yyleng; i++) { if (yytext[i] == '\t') |