53ea1d44f0
This was originally several commits that had to be squashed into one because the intermediate states weren't able to build coreboot: - one to remove everything that wasn't our own code, leaving only regex.[ch], toada.c, description.md and Makefile.inc. - one to copy in Linux 5.13's scripts/kconfig and adapt Makefile.inc to make the original Makefile work again. - adapt abuild to use olddefconfig, simplifying matters. - apply patches in util/kconfig/patches. - Some more adaptations to the libpayload build system. The patches are now in util/kconfig/patches/, reverse applying them should lead to a util/kconfig/ tree that contains exactly the Linux version + our own 5 files. Change-Id: Ia0e8fe4e9022b278f34ab113a433ef4d45e5c355 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37152 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 2796443d5a2194400e56e6762e0f748ed0f0470c Mon Sep 17 00:00:00 2001
|
|
From: Martin Roth <martinroth@google.com>
|
|
Date: Wed, 10 Feb 2016 16:06:00 -0700
|
|
Subject: [PATCH] util/kconfig: Ignore extra symbols in configs instead of
|
|
failing
|
|
|
|
When updating an old .config file that has a symbol that has been
|
|
removed from the current Kconfig tree, kconfig will generate a warning
|
|
and fail to save the updated file. This is incredibly annoying, and
|
|
not the goal when trying to eliminate Kconfig warnings.
|
|
|
|
Instead of generating a warning, just print a message that it's being
|
|
ignored. This will remove the offending symbol, while allowing the
|
|
updated config file to be saved.
|
|
|
|
Split the change from 1 line to 3 lines to keep it at 80 characters.
|
|
|
|
Signed-off-by: Martin Roth <martinroth@google.com>
|
|
---
|
|
util/kconfig/confdata.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
Index: kconfig/confdata.c
|
|
===================================================================
|
|
--- kconfig.orig/confdata.c
|
|
+++ kconfig/confdata.c
|
|
@@ -449,7 +449,9 @@ load:
|
|
if (def == S_DEF_USER) {
|
|
sym = sym_find(line + 2 + strlen(CONFIG_));
|
|
if (!sym) {
|
|
- conf_warning("trying to assign non-existent symbol %s", line + strlen(CONFIG_));
|
|
+ conf_message(
|
|
+ "ignoring nonexistent symbol %s",
|
|
+ line + 2 + strlen(CONFIG_));
|
|
conf_set_changed(true);
|
|
continue;
|
|
}
|