Merge branch 'master' into microsoft-surface/update-kernel-6.19.8

raspberry-pi/3/default.nix

@@ -1,6 +1,10 @@
 { lib, pkgs, ... }:
 
 {
+  imports = [
+    ../common/default.nix
+  ];
+
   boot = {
     kernelPackages = lib.mkDefault (
       pkgs.linuxPackagesFor (pkgs.callPackage ../common/kernel.nix { rpiVersion = 3; })

raspberry-pi/4/apply-overlays-dtmerge.nix

@@ -27,17 +27,12 @@ with lib;
           | xargs -0 cp -v --no-preserve=mode --target-directory "$out" --parents
 
         for dtb in $(find "$out" -type f -name '*.dtb'); do
-          dtbCompat=$(fdtget -t s "$dtb" / compatible 2>/dev/null || true)
           # skip files without `compatible` string
-          test -z "$dtbCompat" && continue
+          fdtget -t s "$dtb" / compatible 2>/dev/null || continue
 
           ${flip (concatMapStringsSep "\n") overlays (o: ''
-            overlayCompat="$(fdtget -t s "${o.dtboFile}" / compatible)"
-
-            # skip incompatible and non-matching overlays
-            if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then
-              echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")"
-            elif ${
+            # skip non-matching overlays
+            if ${
               if ((o.filter or null) == null) then
                 "false"
               else

raspberry-pi/common/default.nix

@@ -1,4 +1,9 @@
 {
+  imports = [
+    ./config-txt.nix
+    ./config-txt-defaults.nix
+  ];
+
   boot.initrd.availableKernelModules = [
     "usb-storage"
     "usbhid"