Skip to content
Merged
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
11 changes: 11 additions & 0 deletions ovmerge/ovmerge
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,17 @@ foreach my $overlay (@ARGV)
foreach my $fragment (get_fragments($dt))
{
delete_node($fragment) if (get_child($fragment, '__dormant__'));

# Treat a dtoverlay,preserve-phandle property as an export of any label on the node
my $payload = get_child($fragment, '__overlay__');
if (get_prop($payload, "dtoverlay,preserve-phandle"))
{
foreach my $label (get_labels($payload))
{
adj_ref(1, $label);
}
delete_prop($payload, "dtoverlay,preserve-phandle");
}
}
}
$cur_dt = undef;
Expand Down
Loading