From patchwork Fri Mar 26 09:40:15 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: make sconfig less alarmist
Date: Fri, 26 Mar 2010 09:40:15 -0000
From: Patrick Georgi <patrick@georgi-clan.de>
X-Patchwork-Id: 1162
Message-Id: <4BAC80FF.20301@georgi-clan.de>
To: coreboot@coreboot.org

Hi,

sconfig, the tool to convert devicetree.cb into our internal
representation, warned about naming conflicts even if they were uncritical.

Make sconfig only complain about real conflicts.


Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


Index: util/sconfig/config.g
===================================================================
--- util/sconfig/config.g	(revision 5300)
+++ util/sconfig/config.g	(working copy)
@@ -602,8 +602,8 @@
 
 def setdict(dict, name, value):
 	debug.info(debug.dict, "setdict sets %s to %s" % (name, value))
-	if name in dict.keys():
-		print "Duplicate in dict: %s" % name
+	if name in dict.keys() and not dict[name] == value:
+		print "Collision in dict: %s is %s, shall be set to %s" % (name, dict[name], value)
 	dict[name] = value