[S] Change in coreboot[master]: util/kconfig: Add comment explaining difference from upstream

[Martin L Roth (Code Review)]

Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/69952 )

Change subject: util/kconfig: Add comment explaining difference from upstream
......................................................................

util/kconfig: Add comment explaining difference from upstream

coreboot adds a patch on top of upstream Kconfig which allows the
generated Kconfig dependency files to be placed in a separate
directory than the autoconfig files based on the KCONFIG_SPLITCONFIG
variable. Add a comment to explain this difference.

Change-Id: Ief38ab84f852ff24f896ec8bbf094aa737a172d9
Signed-off-by: Nicholas Chin 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69952
Tested-by: build bot (Jenkins) 
Reviewed-by: Fred Reitberger 
Reviewed-by: Paul Menzel 
Reviewed-by: Angel Pons 
Reviewed-by: Martin L Roth 
---
M util/kconfig/confdata.c
M util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch
2 files changed, 32 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Martin L Roth: Looks good to me, approved
  Paul Menzel: Looks good to me, but someone else must approve
  Angel Pons: Looks good to me, but someone else must approve
  Fred Reitberger: Looks good to me, but someone else must approve

diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c
index 3da9e8b..1300ab6 100644
--- a/util/kconfig/confdata.c
+++ b/util/kconfig/confdata.c
@@ -1035,6 +1035,11 @@
    struct symbol *sym;
    int res, i;

+	/*
+	 * Upstream Kconfig sets depfile_path based on the directory
+	 * prefix of the autoconfig path, but coreboot overrides this
+	 * using the KCONFIG_SPLITCONFIG environment variable
+	 */
    strcpy(depfile_path, conf_get_autobase_name());
    depfile_prefix_len = strlen(depfile_path);

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 b4db86e..869adef 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
@@ -35,7 +35,7 @@
  static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
  {
    char *p2;
-@@ -1024,19 +1031,14 @@ static int conf_write_autoconf_cmd(const
+@@ -1024,19 +1031,19 @@ static int conf_write_autoconf_cmd(const

static int conf_touch_deps(void)
  {
@@ -52,6 +52,11 @@
 -
 -	strncpy(depfile_path, name, depfile_prefix_len);
 -	depfile_path[depfile_prefix_len] = 0;
++	/*
++	 * Upstream Kconfig sets depfile_path based on the directory
++	 * prefix of the autoconfig path, but coreboot overrides this
++	 * using the KCONFIG_SPLITCONFIG environment variable
++	 */
 +	strcpy(depfile_path, conf_get_autobase_name());
 +	depfile_prefix_len = strlen(depfile_path);