Skip to content

Commit 783b8a9

Browse files
committed
overlaycheck: Compile all overlays before merging
The possibility of renaming an overlay means that it isn't safe to try merging them as they are compiled, just in case the new overlay has not been compiled yet. Signed-off-by: Phil Elwell <[email protected]>
1 parent ccf747c commit 783b8a9

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

overlaycheck/overlaycheck

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,11 @@ foreach my $overlay (sort(keys(%$source)))
322322
error(" Error ^ in overlay $overlay\n");
323323
}
324324
dtc_cpp("${overlay}-overlay.dts", "$TMPDIR/$overlay.dtbo");
325+
}
325326

327+
foreach my $overlay (sort(keys(%$source)))
328+
{
329+
next if ($overlay =~ /^</);
326330
my $overlay_props = $source->{$overlay}[0];
327331
my $base;
328332
while (my ($plat, $dts) = each(%platform_reps))

0 commit comments

Comments
 (0)