Skip to content

Commit 28a6fa0

Browse files
committed
dtoverlay: Make remapping stop at the first rename
Now that it's possible to add parameters when renamei an overlay to another, explitly stop the remap after the first rename, otherwise it would be necessary to handle the parameters from/across multiple renames. Note that is possible to work around this limitation by always mapping directly to the final name, but perhaps at the cost of more entries in the map. Signed-off-by: Phil Elwell <[email protected]>
1 parent f0b1860 commit 28a6fa0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

dtmerge/dtoverlay.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2855,7 +2855,8 @@ const char *dtoverlay_remap_overlay(const char *overlay)
28552855
dtoverlay_warn("overlay '%s' has been renamed '%s'",
28562856
overlay, new_name);
28572857
overlay = new_name;
2858-
continue;
2858+
// Stop at a rename, rather than have to deal with multiple sets of parameters
2859+
break;
28592860
}
28602861

28612862
deprecated_msg = fdt_getprop_namelen(overlay_map->fdt, overlay_off,

0 commit comments

Comments
 (0)