overlaycheck: Support reading arm64 dts files

Previously it has been assumed that all dts files live in the arch/arm
tree, but now the bcm2712-* files are moving to arch/arm64 where they
belong. Adjust overlaycheck accordingly.

Signed-off-by: Phil Elwell <[email protected]>

Author: pelwell

overlaycheck/overlaycheck

@@ -32,6 +32,8 @@ my @extra_base_files = (
     "bcm2710-rpi-2-b",
     "bcm2711-rpi-400",
     "bcm2712-rpi-cm5-cm4io",
+    "bcm2712-rpi-cm5l-cm5io",
+    "bcm2712-rpi-cm5l-cm4io",
 );
 
 my %platform_reps = (
@@ -96,10 +98,52 @@ my $kerndir = `git rev-parse --show-toplevel 2>/dev/null`;
 chomp($kerndir);
 fatal_error("This isn't a Linux repository") if (!-d "$kerndir/kernel");
 
-my $dtsdir = $kerndir."/arch/arm/boot/dts";
-my $dtssubdir = $dtsdir;
-$dtssubdir .= "/broadcom" if (-f $dtsdir."/broadcom/Makefile");
-chdir($dtssubdir);
+# 32-bit first, to avoid the #include "arm/broadcom..." versions in the arm64 tree
+my $dtspath = (-f $kerndir."/arch/arm/boot/dts/broadcom/Makefile") ?
+        $kerndir."/arch/arm/boot/dts/broadcom" :
+        $kerndir."/arch/arm/boot/dts";
+
+my $dts64path = (-f $kerndir."/arch/arm64/boot/dts/broadcom/Makefile") ?
+        $kerndir."/arch/arm64/boot/dts/broadcom" :
+        $kerndir."/arch/arm64/boot/dts";
+
+my (@base32_files, @base64_files, @extra_base32_files, @extra_base64_files);
+
+foreach my $base (@base_files)
+{
+        if (-f $dtspath."/".$base.".dts")
+        {
+                push @base32_files, $base;
+        }
+        elsif (-f $dts64path."/".$base.".dts")
+        {
+                push @base64_files, $base;
+        }
+}
+
+foreach my $base (@extra_base_files)
+{
+        if (-f $dtspath."/".$base.".dts")
+        {
+                push @extra_base32_files, $base;
+        }
+        elsif (-f $dts64path."/".$base.".dts")
+        {
+                push @extra_base64_files, $base;
+        }
+}
+
+my @dtsgroups = (
+        [ $dts64path, \@base64_files ],
+        [ $dtspath, \@base32_files ],
+);
+
+my @extra_dtsgroups = (
+        [ $dts64path, \@extra_base64_files ],
+        [ $dtspath, \@extra_base32_files ],
+);
+
+my $overlaysdir = $kerndir."/arch/arm/boot/dts/overlays";
 
 my @cpp_cmd =
     (
@@ -147,19 +191,19 @@ foreach my $warn (@warnings_to_suppress)
 
 my $dtc_opts = join(' ', @dtc_opts);
 
+# Parse the exclusions
+
 my ($ignore_missing, $ignore_vestigial) = parse_exclusions($exclusions_file);
 
 # Parse the README
 
-chdir($dtsdir);
-
-my $readme = parse_readme("overlays/README");
+chdir($overlaysdir);
 
-# Parse the base dts's and overlays
+my $readme = parse_readme("README");
 
-my $source = parse_source_files($dtsdir, $dtssubdir);
+# Parse the base dts files and overlays
 
-# Parse the exclusions
+my $source = parse_source_files($overlaysdir, @dtsgroups, @extra_dtsgroups);
 
 # Compare the two
 
@@ -217,9 +261,9 @@ foreach my $overlay (@$common)
 
 # Parse the Makefile
 
-chdir($dtsdir);
+chdir($overlaysdir);
 
-my $makefile = parse_makefile("overlays/Makefile");
+my $makefile = parse_makefile("Makefile");
 
 ($left_only, $common, $right_only) =
     compare_sets([keys(%$source)], $makefile);
@@ -231,19 +275,20 @@ $fail ||= (@$left_only || @$right_only);
 
 # Now some build/runtime checks
 
-chdir($dtssubdir);
-
-foreach my $base (@base_files, @extra_base_files)
+foreach my $group (@dtsgroups, @extra_dtsgroups)
 {
-    next if (!-f "$base.dts");
-    dtc_cpp("$base.dts", "$TMPDIR/$base.dtb");
-    if (system("ovmerge -q $base.dts") >> 8)
+    chdir($group->[0]);
+    foreach my $base (@{$group->[1]})
     {
-        error("  Error ^ in base file $base.dts\n");
+        dtc_cpp("$base.dts", "$TMPDIR/$base.dtb");
+        if (system("ovmerge -q $base.dts") >> 8)
+        {
+            error("  Error ^ in base file $base.dts\n");
+        }
     }
 }
 
-chdir($dtsdir."/overlays");
+chdir($overlaysdir);
 
 dtc_cpp("overlay_map.dts", "$TMPDIR/overlay_map.dtb") if (-r "overlay_map.dts");
 
@@ -281,7 +326,7 @@ if ($try_all)
         foreach my $base (@base_files)
         {
             next if (!-f "$TMPDIR/$base.dtb");
-            next if (($overlay =~ /(wifi|bt)/) && ($base !~ /^(bcm2708-rpi-zero-w|bcm2709-rpi-zero-2|bcm2710-rpi-3-|bcm2711-rpi-(4|cm4$)|bcm2712-rpi-5)/));
+            next if (($overlay =~ /(wifi|bt)/) && ($base !~ /^(bcm2708-rpi-zero-w|bcm2709-rpi-zero-2|bcm2710-rpi-3-|bcm2711-rpi-(4|cm4$)|bcm2712-rpi-(5|cm5))/));
             next if ($overlay_props->{'bcm2711'} && $base !~ /^bcm2711/);
             next if ($overlay_props->{'bcm2712'} && $base !~ /^bcm2712/);
             next if (system("$DTMERGE $TMPDIR/$base.dtb $MERGED_DTB $TMPDIR/$overlay.dtbo >/dev/null 2>&1") == ((-2 & 0xff) << 8));
@@ -361,35 +406,38 @@ sub list_print
 
 sub parse_source_files
 {
-    my ($dtsdir, $dtssubdir) = @_;
+    my ($overlaydir, @dtsgroups) = @_;
     my $overlays = {};
 
     my %params;
 
-    chdir($dtssubdir);
-
-    foreach my $file (glob("bcm2708*.dts bcm2709*.dts bcm2710*.dts bcm2711*.dts bcm2712*.dts"))
+    foreach my $group (@dtsgroups)
     {
-        foreach my $param (get_params($file))
+        chdir($group->[0]);
+
+        foreach my $file (@{$group->[1]})
         {
-            next if (ref $param);
-            $params{$param} = 1;
+            foreach my $param (get_params($file.".dts"))
+            {
+                next if (ref $param);
+                $params{$param} = 1;
+            }
         }
     }
 
-    chdir($dtsdir);
+    chdir($overlaydir);
 
     $overlays->{'<The base DTB>'} = [ sort(keys(%params)) ];
 
-    foreach my $file (glob("overlays/*-overlay.dts"))
+    foreach my $file (glob("*-overlay.dts"))
     {
-        my $overlay = ($file =~ /^overlays\/(.*)-overlay.dts$/)[0];
+        my $overlay = ($file =~ /^(.*)-overlay.dts$/)[0];
 
         my $redo_cmd = `grep '// redo: ' $file`;
         if ($redo_cmd =~ /\/\/ redo: ([^\r\n]+)/)
         {
             system("cp $file overlaycheck.dts");
-            system("cd overlays; ovmerge -r ../overlaycheck.dts > $overlay-overlay.dts");
+            system("ovmerge -r overlaycheck.dts > $overlay-overlay.dts");
             system("rm overlaycheck.dts");
             if (system("git diff --quiet $file") >> 8)
             {