util/kconfig: Uprev to Linux 6.1's kconfig

This also cleans up our patch queue.

TEST=`util/abuild/abuild -C` output (config.h and config.build) remains
the same

Change-Id: I79159130ba3515ede59e9fb9fbf087e2ed76257a
Signed-off-by: Patrick Georgi <patrick@coreboot.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79203
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>

8 files changed, 14 insertions, 45 deletions

diff --git a/util/kconfig/patches/0001-Kconfig-Add-KCONFIG_STRICT-mode.patch b/util/kconfig/patches/0001-Kconfig-Add-KCONFIG_STRICT-mode.patch
index e87aaf5eaf..9e50eb39a1 100644
--- a/util/kconfig/patches/0001-Kconfig-Add-KCONFIG_STRICT-mode.patch
+++ b/util/kconfig/patches/0001-Kconfig-Add-KCONFIG_STRICT-mode.patch
@@ -19,7 +19,7 @@ Index: kconfig/confdata.c
 ===================================================================
 --- kconfig.orig/confdata.c
 +++ kconfig/confdata.c
-@@ -430,6 +430,7 @@ load:
+@@ -437,6 +437,7 @@ load:
  			if (def == S_DEF_USER) {
  				sym = sym_find(line + 2 + strlen(CONFIG_));
  				if (!sym) {
@@ -27,7 +27,7 @@ Index: kconfig/confdata.c
  					conf_set_changed(true);
  					continue;
  				}
-@@ -512,6 +513,13 @@ load:
+@@ -519,6 +520,13 @@ load:
  	}
  	free(line);
  	fclose(in);
diff --git a/util/kconfig/patches/0002-Kconfig-Change-symbol-override-from-warning-to-notic.patch b/util/kconfig/patches/0002-Kconfig-Change-symbol-override-from-warning-to-notic.patch
index cc37c0712c..c1ce24970c 100644
--- a/util/kconfig/patches/0002-Kconfig-Change-symbol-override-from-warning-to-notic.patch
+++ b/util/kconfig/patches/0002-Kconfig-Change-symbol-override-from-warning-to-notic.patch
@@ -40,7 +40,7 @@ Index: kconfig/confdata.c
  static void conf_default_message_callback(const char *s)
  {
  	printf("#\n# ");
-@@ -440,7 +450,7 @@ load:
+@@ -447,7 +457,7 @@ load:
  					sym->type = S_BOOLEAN;
  			}
  			if (sym->flags & def_flags) {
@@ -49,7 +49,7 @@ Index: kconfig/confdata.c
  			}
  			switch (sym->type) {
  			case S_BOOLEAN:
-@@ -479,7 +489,7 @@ load:
+@@ -486,7 +496,7 @@ load:
  			}
  
  			if (sym->flags & def_flags) {
@@ -58,7 +58,7 @@ Index: kconfig/confdata.c
  			}
  			if (conf_set_sym_val(sym, def, def_flags, p))
  				continue;
-@@ -504,7 +514,7 @@ load:
+@@ -511,7 +521,7 @@ load:
  				break;
  			case yes:
  				if (cs->def[def].tri != no)
diff --git a/util/kconfig/patches/0005-util-kconfig-Ignore-extra-symbols-in-configs-instead.patch b/util/kconfig/patches/0005-util-kconfig-Ignore-extra-symbols-in-configs-instead.patch
index d8e2dfee38..c05e4a64bf 100644
--- a/util/kconfig/patches/0005-util-kconfig-Ignore-extra-symbols-in-configs-instead.patch
+++ b/util/kconfig/patches/0005-util-kconfig-Ignore-extra-symbols-in-configs-instead.patch
@@ -24,7 +24,7 @@ Index: kconfig/confdata.c
 ===================================================================
 --- kconfig.orig/confdata.c
 +++ kconfig/confdata.c
-@@ -440,7 +440,9 @@ load:
+@@ -447,7 +447,9 @@ load:
  			if (def == S_DEF_USER) {
  				sym = sym_find(line + 2 + strlen(CONFIG_));
  				if (!sym) {
diff --git a/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch b/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch
index 13e4d893d5..05a92d411d 100644
--- a/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch
+++ b/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch
@@ -62,7 +62,7 @@ Index: kconfig/confdata.c
 ===================================================================
 --- kconfig.orig/confdata.c
 +++ kconfig/confdata.c
-@@ -530,11 +530,7 @@ load:
+@@ -537,11 +537,7 @@ load:
  	free(line);
  	fclose(in);
  
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 c74ef67745..bfb89f94c2 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
@@ -14,7 +14,7 @@ Index: kconfig/confdata.c
 ===================================================================
 --- kconfig.orig/confdata.c
 +++ kconfig/confdata.c
-@@ -715,7 +715,12 @@ static void print_symbol_for_dotconfig(F
+@@ -725,7 +725,12 @@ static void print_symbol_for_dotconfig(F
  
  static void print_symbol_for_autoconf(FILE *fp, struct symbol *sym)
  {
@@ -28,7 +28,7 @@ Index: kconfig/confdata.c
  }
  
  void print_symbol_for_listconfig(struct symbol *sym)
-@@ -740,6 +745,10 @@ static void print_symbol_for_c(FILE *fp,
+@@ -750,6 +755,10 @@ static void print_symbol_for_c(FILE *fp,
  	case S_TRISTATE:
  		switch (*val) {
  		case 'n':
@@ -39,7 +39,7 @@ Index: kconfig/confdata.c
  			return;
  		case 'm':
  			sym_suffix = "_MODULE";
-@@ -751,6 +760,12 @@ static void print_symbol_for_c(FILE *fp,
+@@ -761,6 +770,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";
@@ -52,7 +52,7 @@ Index: kconfig/confdata.c
  		break;
  	case S_STRING:
  		escaped = escape_string_value(val);
-@@ -1108,8 +1123,9 @@ static int __conf_write_autoconf(const c
+@@ -1177,8 +1192,9 @@ static int __conf_write_autoconf(const c
  
  	conf_write_heading(file, comment_style);
  
diff --git a/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch b/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch
index 869adefc40..09079cde9f 100644
--- a/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch
+++ b/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch
@@ -21,8 +21,8 @@ Index: kconfig/confdata.c
 ===================================================================
 --- kconfig.orig/confdata.c
 +++ kconfig/confdata.c
-@@ -230,6 +230,13 @@ static const char *conf_get_autoheader_n
- 	return name ? name : "include/generated/autoconf.h";
+@@ -237,6 +237,13 @@ static const char *conf_get_rustccfg_nam
+ 	return name ? name : "include/generated/rustc_cfg";
  }
  
 +static const char *conf_get_autobase_name(void)
@@ -35,7 +35,7 @@ Index: kconfig/confdata.c
  static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
  {
  	char *p2;
-@@ -1024,19 +1031,19 @@ static int conf_write_autoconf_cmd(const
+@@ -1093,19 +1100,19 @@ static int conf_write_autoconf_cmd(const
  
  static int conf_touch_deps(void)
  {
diff --git a/util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch b/util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch
deleted file mode 100644
index 2b96723693..0000000000
--- a/util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 48ad5c23680c81614663e09c6586ebeb26bf8c18 Mon Sep 17 00:00:00 2001
-From: Richard Marko <srk@48.io>
-Date: Mon, 16 Oct 2023 15:26:33 +0200
-Subject: [PATCH] util/kconfig: chmod +w before savedefconfig
-
-This prevents a headscratcher when .config in root doesn't have a write
-permission bit set which causes a build failure of savedefconfig
-not able to write to copied file, for example
-
-*** Error while saving defconfig to:
-  build/mainboard/emulation/qemu-i440fx/cbfs-file.eU5E0t.out.tmp2
-
-Change-Id: I2e7d35c9f6e8add3e7438d163850bc5fda5a99b2
-Signed-off-by: Richard Marko <srk@48.io>
----
- util/kconfig/Makefile.inc | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: kconfig/Makefile.inc
-===================================================================
---- kconfig.orig/Makefile.inc
-+++ kconfig/Makefile.inc
-@@ -34,6 +34,7 @@ oldconfig: KCONFIG_STRICT=
- 
- savedefconfig: $(objk)/conf
- 	cp $(DOTCONFIG) $(DEFCONFIG)
-+	chmod +w $(DEFCONFIG)
- 	$< --savedefconfig=$(DEFCONFIG) $(KBUILD_KCONFIG)
- 
- FORCE:
diff --git a/util/kconfig/patches/series b/util/kconfig/patches/series
index 252eb64b9a..655c493868 100644
--- a/util/kconfig/patches/series
+++ b/util/kconfig/patches/series
@@ -10,4 +10,3 @@
 0010-reenable-source-in-choice.patch
 0013-util-kconfig-detect-ncurses-on-FreeBSD.patch
 0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch
-0015-util-kconfig-chmod-w-before-savedefconfig.patch