Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49cbf625 authored by Cosmin Tanislav's avatar Cosmin Tanislav Committed by Łukasz Patron
Browse files

merge_dtbs: ignore not matching DTBOs when finding symbols for a fixup

Change-Id: I1705341d9ec68b46ac6f6c1007c6ea28f9c4e95d
parent 101451f3
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ def create_adjacency(devicetrees):

	for dt in devicetrees:
		for symbol in dt.list_props('/__symbols__'):
			symbol_map.setdefault(symbol, []).append(dt.filename)
			symbol_map.setdefault(symbol, []).append(dt)

	for dt in devicetrees:
		graph[dt.filename] = set()
@@ -482,7 +482,10 @@ def create_adjacency(devicetrees):
			if fixup not in symbol_map:
				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