GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <nic.c3.14@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69952
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
This commit is contained in:
Nicholas Chin 2022-11-23 10:18:32 -07:00 committed by Martin L Roth
parent 6e902bcfcb
commit 8ef2f7c77c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/kconfig/confdata.c
View File

@ -1035,6 +1035,11 @@ static int conf_touch_deps(void)
struct symbol *sym; struct symbol *sym;
int res, i; 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()); strcpy(depfile_path, conf_get_autobase_name());
depfile_prefix_len = strlen(depfile_path); depfile_prefix_len = strlen(depfile_path);

7
util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch
View File

@ -35,7 +35,7 @@ Index: kconfig/confdata.c
static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
{ {
char *p2; 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) static int conf_touch_deps(void)
{ {
@ -52,6 +52,11 @@ Index: kconfig/confdata.c
- -
- strncpy(depfile_path, name, depfile_prefix_len); - strncpy(depfile_path, name, depfile_prefix_len);
- depfile_path[depfile_prefix_len] = 0; - 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()); + strcpy(depfile_path, conf_get_autobase_name());
+ depfile_prefix_len = strlen(depfile_path); + depfile_prefix_len = strlen(depfile_path);