Skip to content

dtoverlay: allow top-level phandles to optionally be preserved #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 1 commit into from
Jun 12, 2026
+9 −3
Merged

dtoverlay: allow top-level phandles to optionally be preserved #198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions dtmerge/dtoverlay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ int dtoverlay_merge_fragment(DTBLOB_T *base_dtb, int target_off,
int overlay_off, int depth)
{
int prop_off, subnode_off;
int preserve_phandles;
int err = 0;

if (dtoverlay_debug_enabled)
Expand All @@ -578,6 +579,10 @@ int dtoverlay_merge_fragment(DTBLOB_T *base_dtb, int target_off,
overlay_path);
}

// Check for a property flag to indicate preserving top-level phandles
preserve_phandles = depth > 0 ||
fdt_getprop(overlay_dtb->fdt, overlay_off, "dtoverlay,preserve-phandle", NULL);

// Merge each property of the node
for (prop_off = fdt_first_property_offset(overlay_dtb->fdt, overlay_off);
(prop_off >= 0) && (err == 0);
Expand All @@ -592,10 +597,11 @@ int dtoverlay_merge_fragment(DTBLOB_T *base_dtb, int target_off,
prop_val = fdt_getprop_by_offset(overlay_dtb->fdt, prop_off,
&prop_name, &prop_len);

/* Skip these system properties (only phandles in the first level) */
// Skip system properties and top-level phandles unless preserved
if ((strcmp(prop_name, "name") == 0) ||
((depth == 0) && ((strcmp(prop_name, "phandle") == 0) ||
(strcmp(prop_name, "linux,phandle") == 0))))
(strcmp(prop_name, "dtoverlay,preserve-phandle") == 0) ||
(!preserve_phandles && ((strcmp(prop_name, "phandle") == 0) ||
(strcmp(prop_name, "linux,phandle") == 0))))
continue;

dtoverlay_debug(" +prop(%s)", prop_name);
Expand Down
Loading