Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions pyfdt/pyfdt.py
Original file line number Diff line number Diff line change
Expand Up @@ -624,10 +624,18 @@ def merge(self, node):
if isinstance(obj, (FdtNode, FdtProperty))]:
index = self._find(subnode.get_name())
if index is None:
dup = deepcopy(subnode)
if isinstance(subnode, FdtNode):
dup.set_parent_node(self)
self.append(dup)
# avoid deepcopy for large binary blobs
if isinstance(subnode, FdtPropertyBytes):
# shallow copy of bytes for FdtPropertyBytes
dup = FdtPropertyBytes(subnode.name, list(subnode.bytes))
elif isinstance(subnode, FdtNode):
dup = FdtNode(subnode.name)
for child in subnode.subdata:
dup.append(child)
dup.set_parent_node(self)
else:
dup = copy(subnode)
self.append(dup)
elif isinstance(subnode, FdtNode):
self.subdata[index].merge(subnode)
else:
Expand Down