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 <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3962 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
21c8b5ab5c
commit
9987ad806f
|
@ -330,6 +330,7 @@ class romimage:
|
||||||
if (object_name[0] == '.'):
|
if (object_name[0] == '.'):
|
||||||
source = base + suffix
|
source = base + suffix
|
||||||
object = base + '.o'
|
object = base + '.o'
|
||||||
|
rel_base = base
|
||||||
else:
|
else:
|
||||||
rel_base = re.sub(treetop, "", os.path.join(dirstack.tos(), base))
|
rel_base = re.sub(treetop, "", os.path.join(dirstack.tos(), base))
|
||||||
source = "$(TOP)/" + rel_base + suffix
|
source = "$(TOP)/" + rel_base + suffix
|
||||||
|
@ -337,11 +338,11 @@ class romimage:
|
||||||
rel_base = re.sub("^/", "", rel_base)
|
rel_base = re.sub("^/", "", rel_base)
|
||||||
object = rel_base + '.o'
|
object = rel_base + '.o'
|
||||||
|
|
||||||
debug.info(debug.object, "add object %s source %s" % (object_name, source))
|
debug.info(debug.object, "add object %s source %s" % (object, source))
|
||||||
l = getdict(dict, base)
|
l = getdict(dict, rel_base)
|
||||||
if (l):
|
if (l):
|
||||||
warning("object/driver %s previously defined" % base)
|
warning("object/driver %s previously defined" % rel_base)
|
||||||
setdict(dict, base, [object, source, type, base])
|
setdict(dict, rel_base, [object, source, type, rel_base])
|
||||||
|
|
||||||
def addinitobjectrule(self, name):
|
def addinitobjectrule(self, name):
|
||||||
self.addobjectdriver(self.initobjectrules, name)
|
self.addobjectdriver(self.initobjectrules, name)
|
||||||
|
|
Loading…
Reference in New Issue