Patchwork make sconfig less alarmist

login
register
about
Submitter Patrick Georgi
Date 2010-03-26 09:40:15
Message ID <4BAC80FF.20301@georgi-clan.de>
Download mbox | patch
Permalink /patch/1162/
State Accepted
Commit r5301
Headers show

Comments

Patrick Georgi - 2010-03-26 09:40:15
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>
Stefan Reinauer - 2010-03-26 10:10:44
On 3/26/10 10:40 AM, Patrick Georgi wrote:
> 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>
ron minnich - 2010-03-26 16:45:44
Should it be a fatal error if they are critical?

ron

Patch

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