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:46:03 +0000 |
| commit | 7eb03cb6574ed873f59a2c559e5ab079b9256b64 (patch) | |
| tree | 2e69c522f8e5e87d4a6b8db7211b0c7eb0465b15 /util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch | |
| parent | 4c9b9e9709cef4937d012d6950e5e2932042c587 (diff) | |
util/kconfig: Uprev to Linux 5.17's kconfig
Another upstream refactoring, another local patch gone!
TEST=`util/abuild/abuild -C` output (build.h and build.conf) remains
the same
Change-Id: I0f99dcbd8ecc7256551f0a6e2c83c060cb1999b6
Signed-off-by: Patrick Georgi <patrick@coreboot.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66046
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Diffstat (limited to 'util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch')
| -rw-r--r-- | util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch | 12 |
1 files changed, 6 insertions, 6 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 aae6c97ab9..f05c620950 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,21 +27,21 @@ Index: kconfig/confdata.c =================================================================== --- kconfig.orig/confdata.c +++ kconfig/confdata.c -@@ -720,7 +720,12 @@ static void print_symbol_for_dotconfig(F +@@ -722,7 +722,12 @@ static void print_symbol_for_dotconfig(F static void print_symbol_for_autoconf(FILE *fp, struct symbol *sym) { -- __print_symbol(fp, sym, OUTPUT_N_NONE, true); +- __print_symbol(fp, sym, OUTPUT_N_NONE, false); + int print_negatives = getenv("KCONFIG_NEGATIVES") != NULL; + enum output_n out = OUTPUT_N_NONE; + if (print_negatives) { + out = OUTPUT_N; + } -+ __print_symbol(fp, sym, out, true); ++ __print_symbol(fp, sym, out, false); } void print_symbol_for_listconfig(struct symbol *sym) -@@ -745,6 +750,10 @@ static void print_symbol_for_c(FILE *fp, +@@ -747,6 +752,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"; -@@ -756,6 +765,12 @@ static void print_symbol_for_c(FILE *fp, +@@ -758,6 +767,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); -@@ -1106,8 +1121,9 @@ static int __conf_write_autoconf(const c +@@ -1113,8 +1128,9 @@ static int __conf_write_autoconf(const c conf_write_heading(file, comment_style); |