summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-02-10 16:06:00 -0700
committerMartin Roth <martinroth@google.com>2016-02-12 17:03:36 +0100
commitc37c7c8b1f3977e362e05945a48ddecf803e20a7 (patch)
treeb1d24138380ae5b09546aef34dd8a7929806d251
parent5cde0cb0a72b60b9e6bf83253708652c3dc5025e (diff)
downloadcoreboot-c37c7c8b1f3977e362e05945a48ddecf803e20a7.tar.xz
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. Change-Id: I09d5775c9ed14bde80077b51b862a7f41bee098a Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/13674 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--util/kconfig/confdata.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c
index e58246369f..436d735fc3 100644
--- a/util/kconfig/confdata.c
+++ b/util/kconfig/confdata.c
@@ -362,7 +362,9 @@ load:
if (def == S_DEF_USER) {
sym = sym_find(line + strlen(CONFIG_));
if (!sym) {
- conf_warning("trying to assign non-existent symbol %s", line + strlen(CONFIG_));
+ conf_message(
+ "ignoring nonexistent symbol %s",
+ line + strlen(CONFIG_));
sym_add_change_count(1);
goto setsym;
}