[coreboot-gerrit] Patch set updated for coreboot: Kconfig: Change symbol override from warning to notice

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16691

-gerrit

commit b27bd8f8a6fb374aa45510a2fcb5026c6bfb38b7
Author: Martin Roth <martinroth at google.com>
Date:   Wed Sep 21 14:27:26 2016 -0600

    Kconfig: Change symbol override from warning to notice
    
    Overriding symbols within a .config is pretty common when doing
    automated builds with various different options.  The warning
    text makes it sound like this is an issue, so change it to say
    'notice' instead.  We could get rid of it completely, but it's
    not a bad thing to know that we have two copies of the same symbol
    in the .config.
    
    BUG=chrome-os-partner:54059
    TEST=copy a disabled kconfig option to the end and set it to y.
    See notice text instead of warning.
    
    Change-Id: I9f575b2275233f638e42676263348c807e6515bd
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 util/kconfig/confdata.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c
index 436d735..fc4a07a 100644
--- a/util/kconfig/confdata.c
+++ b/util/kconfig/confdata.c
@@ -42,6 +42,16 @@ static void conf_warning(const char *fmt, ...)
 	conf_warnings++;
 }
 
+static void conf_notice(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	fprintf(stderr, "%s:%d:notice: ", conf_filename, conf_lineno);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, "\n");
+	va_end(ap);
+}
+
 static void conf_default_message_callback(const char *fmt, va_list ap)
 {
 	printf("#\n# ");
@@ -337,7 +347,7 @@ load:
 					sym->type = S_BOOLEAN;
 			}
 			if (sym->flags & def_flags) {
-				conf_warning("override: reassigning to symbol %s", sym->name);
+				conf_notice("override: reassigning to symbol %s", sym->name);
 			}
 			switch (sym->type) {
 			case S_BOOLEAN:
@@ -374,7 +384,7 @@ load:
 					sym->type = S_OTHER;
 			}
 			if (sym->flags & def_flags) {
-				conf_warning("override: reassigning to symbol %s", sym->name);
+				conf_notice("override: reassigning to symbol %s", sym->name);
 			}
 			if (conf_set_sym_val(sym, def, def_flags, p))
 				continue;
@@ -397,7 +407,7 @@ setsym:
 				break;
 			case yes:
 				if (cs->def[def].tri != no)
-					conf_warning("override: %s changes choice state", sym->name);
+					conf_notice("override: %s changes choice state", sym->name);
 				cs->def[def].val = sym;
 				break;
 			}