Skip to content

Commit 8a78b53

Browse files
committed
overlaycheck: Check all the base files
Run some basic checks on all the base files, including those such as the Pi 400 which have been excluded from overlay checks due to the lack of camera support, etc. Signed-off-by: Phil Elwell <[email protected]>
1 parent 9f493cc commit 8a78b53

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

overlaycheck/overlaycheck

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ my $MERGED_DTB = "$TMPDIR/merged.dtb";
1010

1111
my @base_files = (
1212
"bcm2712-rpi-5-b",
13+
"bcm2712-rpi-cm5-cm5io",
1314
"bcm2711-rpi-4-b",
14-
# "bcm2711-rpi-400",
1515
"bcm2711-rpi-cm4",
1616
"bcm2711-rpi-cm4s",
1717
"bcm2708-rpi-b",
@@ -21,11 +21,17 @@ my @base_files = (
2121
"bcm2708-rpi-zero-w",
2222
"bcm2708-rpi-cm",
2323
"bcm2709-rpi-2-b",
24-
"bcm2710-rpi-2-b",
2524
"bcm2710-rpi-3-b",
2625
"bcm2710-rpi-3-b-plus",
2726
"bcm2710-rpi-cm3",
28-
"bcm2710-rpi-zero-2",
27+
"bcm2710-rpi-zero-2-w",
28+
);
29+
30+
my @extra_base_files = (
31+
"bcm2709-rpi-cm2",
32+
"bcm2710-rpi-2-b",
33+
"bcm2711-rpi-400",
34+
"bcm2712-rpi-cm5-cm4io",
2935
);
3036

3137
my %platform_reps = (
@@ -219,10 +225,14 @@ $fail ||= (@$left_only || @$right_only);
219225

220226
chdir($dtssubdir);
221227

222-
foreach my $base (@base_files)
228+
foreach my $base (@base_files, @extra_base_files)
223229
{
224230
next if (!-f "$base.dts");
225231
dtc_cpp("$base.dts", "$TMPDIR/$base.dtb");
232+
if (system("ovmerge -q $base.dts") >> 8)
233+
{
234+
error(" Error ^ in base file $base.dts\n");
235+
}
226236
}
227237

228238
chdir($dtsdir."/overlays");

0 commit comments

Comments
 (0)