merge_dtbs: ignore not matching DTBOs when finding symbols for a fixup
Change-Id: I1705341d9ec68b46ac6f6c1007c6ea28f9c4e95d
This commit is contained in:
committed by
Łukasz Patron
parent
101451f332
commit
49cbf625f2
@@ -473,7 +473,7 @@ def create_adjacency(devicetrees):
|
|||||||
|
|
||||||
for dt in devicetrees:
|
for dt in devicetrees:
|
||||||
for symbol in dt.list_props('/__symbols__'):
|
for symbol in dt.list_props('/__symbols__'):
|
||||||
symbol_map.setdefault(symbol, []).append(dt.filename)
|
symbol_map.setdefault(symbol, []).append(dt)
|
||||||
|
|
||||||
for dt in devicetrees:
|
for dt in devicetrees:
|
||||||
graph[dt.filename] = set()
|
graph[dt.filename] = set()
|
||||||
@@ -482,7 +482,10 @@ def create_adjacency(devicetrees):
|
|||||||
if fixup not in symbol_map:
|
if fixup not in symbol_map:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
graph[dt.filename].update(symbol_map[fixup])
|
for symbol_dt in symbol_map[fixup]:
|
||||||
|
if dt == symbol_dt:
|
||||||
|
assert not len(graph[dt.filename])
|
||||||
|
graph[dt.filename].add(symbol_dt)
|
||||||
|
|
||||||
return graph
|
return graph
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user