From 9987ad806f23a20cf2f8aced190ff3d2e50dcd0c Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Sat, 28 Feb 2009 17:09:29 +0000 Subject: This is a small fix for the last checkin (does not fix those two boards) that caused same filenames to still cause objects being dropped from the build list - which was the whole purpose of the patch. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3962 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/newconfig/config.g | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'util') diff --git a/util/newconfig/config.g b/util/newconfig/config.g index 75d46793f1..074ad0be1e 100644 --- a/util/newconfig/config.g +++ b/util/newconfig/config.g @@ -330,6 +330,7 @@ class romimage: if (object_name[0] == '.'): source = base + suffix object = base + '.o' + rel_base = base else: rel_base = re.sub(treetop, "", os.path.join(dirstack.tos(), base)) source = "$(TOP)/" + rel_base + suffix @@ -337,11 +338,11 @@ class romimage: rel_base = re.sub("^/", "", rel_base) object = rel_base + '.o' - debug.info(debug.object, "add object %s source %s" % (object_name, source)) - l = getdict(dict, base) + debug.info(debug.object, "add object %s source %s" % (object, source)) + l = getdict(dict, rel_base) if (l): - warning("object/driver %s previously defined" % base) - setdict(dict, base, [object, source, type, base]) + warning("object/driver %s previously defined" % rel_base) + setdict(dict, rel_base, [object, source, type, rel_base]) def addinitobjectrule(self, name): self.addobjectdriver(self.initobjectrules, name) -- cgit v1.2.3