summaryrefslogtreecommitdiff
path: root/util/kconfig/patches
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2022-10-28 01:00:26 +0200
committerPatrick Georgi <patrick@coreboot.org>2022-10-30 08:46:23 +0000
commit5526be21eacbee90d004343e9efdf4f8eb6242b7 (patch)
tree786bb9803094e29b5fc49141acbf7dc3b92add82 /util/kconfig/patches
parent7eb03cb6574ed873f59a2c559e5ab079b9256b64 (diff)
util/kconfig: Uprev to Linux 5.18's kconfig
Only minor changes in kconfig this time that shouldn't affect us. TEST=`util/abuild/abuild -C` output (build.h and build.conf) remains the same Change-Id: I46f43182ce9ec1b6a5923cb77dcd6e335e44c87a Signed-off-by: Patrick Georgi <patrick@coreboot.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/66047 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Diffstat (limited to 'util/kconfig/patches')
-rw-r--r--util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch b/util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch
index f05c620950..70e9d3f648 100644
--- a/util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch
+++ b/util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch
@@ -27,7 +27,7 @@ Index: kconfig/confdata.c
===================================================================
--- kconfig.orig/confdata.c
+++ kconfig/confdata.c
-@@ -722,7 +722,12 @@ static void print_symbol_for_dotconfig(F
+@@ -715,7 +715,12 @@ static void print_symbol_for_dotconfig(F
static void print_symbol_for_autoconf(FILE *fp, struct symbol *sym)
{
@@ -41,7 +41,7 @@ Index: kconfig/confdata.c
}
void print_symbol_for_listconfig(struct symbol *sym)
-@@ -747,6 +752,10 @@ static void print_symbol_for_c(FILE *fp,
+@@ -740,6 +745,10 @@ static void print_symbol_for_c(FILE *fp,
case S_TRISTATE:
switch (*val) {
case 'n':
@@ -52,7 +52,7 @@ Index: kconfig/confdata.c
return;
case 'm':
sym_suffix = "_MODULE";
-@@ -758,6 +767,12 @@ static void print_symbol_for_c(FILE *fp,
+@@ -751,6 +760,12 @@ static void print_symbol_for_c(FILE *fp,
case S_HEX:
if (val[0] != '0' || (val[1] != 'x' && val[1] != 'X'))
val_prefix = "0x";
@@ -65,7 +65,7 @@ Index: kconfig/confdata.c
break;
case S_STRING:
escaped = escape_string_value(val);
-@@ -1113,8 +1128,9 @@ static int __conf_write_autoconf(const c
+@@ -1108,8 +1123,9 @@ static int __conf_write_autoconf(const c
conf_write_heading(file, comment_style);
@@ -75,4 +75,4 @@ Index: kconfig/confdata.c
+ if (((sym->flags & SYMBOL_WRITE) || (print_negatives && sym->type != S_STRING)) && sym->name)
print_symbol(file, sym);
- /* check possible errors in conf_write_heading() and print_symbol() */
+ fflush(file);