set linux and firmware to latest release tag

disable KUNIT in kernel config

flake.lock

@@ -62,15 +62,16 @@
     "rpi-firmware-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1686136390,
+        "lastModified": 1680694337,
-        "narHash": "sha256-Uq1yIp8zgexz2hwgAxEtmo9paytel4VPof5VMys01UM=",
+        "narHash": "sha256-UtUd1MbsrDFxd/1C3eOAMDKPZMx+kSMFYOJP+Kc6IU8=",
         "owner": "raspberrypi",
         "repo": "firmware",
-        "rev": "13fbbc4f5ea698353486915986de8b48f18018f6",
+        "rev": "055e044d5359ded1aacc5a17a8e35365373d0b8b",
         "type": "github"
       },
       "original": {
         "owner": "raspberrypi",
+        "ref": "stable",
         "repo": "firmware",
         "type": "github"
       }
@@ -78,16 +79,16 @@
     "rpi-linux-6_1-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1686133523,
+        "lastModified": 1680464256,
-        "narHash": "sha256-r5L3hqk0wlefqkgO8jH4mupeUkbx9cSjHskLOxQQdZw=",
+        "narHash": "sha256-ILwecHZ1BN6GhZAUB6/UwiN/rZ8gHndKON6DUhidtxI=",
         "owner": "raspberrypi",
         "repo": "linux",
-        "rev": "bb63dc31e48948bc2649357758c7a152210109c4",
+        "rev": "0afb5e98488aed7017b9bf321b575d0177feb7ed",
         "type": "github"
       },
       "original": {
         "owner": "raspberrypi",
-        "ref": "rpi-6.1.y",
+        "ref": "1.20230405",
         "repo": "linux",
         "type": "github"
       }

flake.nix

@@ -8,11 +8,11 @@
     };
     rpi-linux-6_1-src = {
       flake = false;
-      url = "github:raspberrypi/linux/rpi-6.1.y";
+      url = "github:raspberrypi/linux/1.20230405";
     };
     rpi-firmware-src = {
       flake = false;
-      url = "github:raspberrypi/firmware";
+      url = "github:raspberrypi/firmware/1.20230405";
     };
     rpi-firmware-nonfree-src = {
       flake = false;

overlay/default.nix

@@ -8,7 +8,7 @@
 final: prev:
 let
   # The version to stick at `pkgs.rpi-kernels.latest'
-  latest = "v6_1_32";
+  latest = "v6_1_21";
 
   # Helpers for building the `pkgs.rpi-kernels' map.
   rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }:
@@ -35,10 +35,6 @@ let
 in
 {
 
-  # disable firmware compression so that brcm firmware can be found at
-  # the path expected by raspberry pi firmware/device tree
-  compressFirmwareXz = x: x;
-
   # A recent known working version of libcamera-apps
   libcamera-apps =
     final.callPackage ./libcamera-apps.nix { inherit libcamera-apps-src; };
@@ -76,13 +72,18 @@ in
   #
   # For example: `pkgs.rpi-kernels.v5_15_87.kernel'
   rpi-kernels = rpi-kernels [{
-    version = "6.1.32";
+    version = "6.1.21";
     kernel = rpi-linux-6_1-src;
     fw = rpi-firmware-src;
     wireless-fw = import ./raspberrypi-wireless-firmware.nix {
       bluez-firmware = rpi-bluez-firmware-src;
       firmware-nonfree = rpi-firmware-nonfree-src;
     };
+    argsOverride = {
+      structuredExtraConfig = with prev.lib.kernel; {
+        KUNIT = no;
+      };
+    };
   }] // {
     latest = final.rpi-kernels."${latest}";
   };

overlay/libcamera-apps.nix

@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libcamera-apps";
-  version = "v1.1.0";
+  version = "v1.1.2";
 
   src = libcamera-apps-src;
 

rpi/default.nix

@@ -8,91 +8,92 @@
     "raspberry-pi-firmware-migrate" = {
       description = "update the firmware partition";
       wantedBy = [ "multi-user.target" ];
-      serviceConfig = let firmware-path = "/boot/firmware";
+      serviceConfig =
-      in {
+        let firmware-path = "/boot/firmware";
-        Type = "oneshot";
+        in {
-        MountImages =
+          Type = "oneshot";
-          "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}:${firmware-path}";
+          MountImages =
-        StateDirectory = "raspberrypi-firmware";
+            "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}:${firmware-path}";
-        ExecStart = pkgs.writeShellScript "migrate-rpi-firmware" ''
+          StateDirectory = "raspberrypi-firmware";
-          shopt -s nullglob
+          ExecStart = pkgs.writeShellScript "migrate-rpi-firmware" ''
+            shopt -s nullglob
 
-          TARGET_FIRMWARE_DIR="${firmware-path}"
+            TARGET_FIRMWARE_DIR="${firmware-path}"
-          TARGET_OVERLAYS_DIR="$TARGET_FIRMWARE_DIR/overlays"
+            TARGET_OVERLAYS_DIR="$TARGET_FIRMWARE_DIR/overlays"
-          TMPFILE="$TARGET_FIRMWARE_DIR/tmp"
+            TMPFILE="$TARGET_FIRMWARE_DIR/tmp"
-          UBOOT="${pkgs.uboot_rpi_arm64}/u-boot.bin"
+            UBOOT="${pkgs.uboot_rpi_arm64}/u-boot.bin"
-          SRC_FIRMWARE_DIR="${pkgs.raspberrypifw}/share/raspberrypi/boot"
+            SRC_FIRMWARE_DIR="${pkgs.raspberrypifw}/share/raspberrypi/boot"
-          STARTFILES=("$SRC_FIRMWARE_DIR"/start*.elf)
+            STARTFILES=("$SRC_FIRMWARE_DIR"/start*.elf)
-          DTBS=("$SRC_FIRMWARE_DIR"/*.dtb)
+            DTBS=("$SRC_FIRMWARE_DIR"/*.dtb)
-          BOOTCODE="$SRC_FIRMWARE_DIR/bootcode.bin"
+            BOOTCODE="$SRC_FIRMWARE_DIR/bootcode.bin"
-          FIXUPS=("$SRC_FIRMWARE_DIR"/fixup*.dat)
+            FIXUPS=("$SRC_FIRMWARE_DIR"/fixup*.dat)
-          SRC_OVERLAYS_DIR="$SRC_FIRMWARE_DIR/overlays"
+            SRC_OVERLAYS_DIR="$SRC_FIRMWARE_DIR/overlays"
-          SRC_OVERLAYS=("$SRC_OVERLAYS_DIR"/*)
+            SRC_OVERLAYS=("$SRC_OVERLAYS_DIR"/*)
-          CONFIG="${config.hardware.raspberry-pi.config-output}"
+            CONFIG="${config.hardware.raspberry-pi.config-output}"
 
-          migrate_uboot() {
+            migrate_uboot() {
-            echo "migrating uboot"
+              echo "migrating uboot"
-            touch "$STATE_DIRECTORY/uboot-migration-in-progress"
+              touch "$STATE_DIRECTORY/uboot-migration-in-progress"
-            cp "$UBOOT" "$TMPFILE"
+              cp "$UBOOT" "$TMPFILE"
-            mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/u-boot-rpi-arm64.bin"
+              mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/u-boot-rpi-arm64.bin"
-            echo "${
+              echo "${
+                builtins.toString pkgs.uboot_rpi_arm64
+              }" > "$STATE_DIRECTORY/uboot-version"
+              rm "$STATE_DIRECTORY/uboot-migration-in-progress"
+            }
+
+            migrate_config() {
+              echo "migrating config.txt"
+              touch "$STATE_DIRECTORY/config-migration-in-progress"
+              cp "$CONFIG" "$TMPFILE"
+              mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/config.txt"
+              echo "${config.hardware.raspberry-pi.config-output}" > "$STATE_DIRECTORY/config-version"
+              rm "$STATE_DIRECTORY/config-migration-in-progress"
+            }
+
+            migrate_firmware() {
+              echo "migrating raspberrypi firmware"
+              touch "$STATE_DIRECTORY/firmware-migration-in-progress"
+              for SRC in "''${STARTFILES[@]}" "''${DTBS[@]}" "$BOOTCODE" "''${FIXUPS[@]}"
+              do
+                cp "$SRC" "$TMPFILE"
+                mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/$(basename "$SRC")"
+              done
+
+              if [[ ! -d "$TARGET_OVERLAYS_DIR" ]]; then
+                mkdir "$TARGET_OVERLAYS_DIR"
+              fi
+
+              for SRC in "''${SRC_OVERLAYS[@]}"
+              do
+                cp "$SRC" "$TMPFILE"
+                mv -T "$TMPFILE" "$TARGET_OVERLAYS_DIR/$(basename "$SRC")"
+              done
+              echo "${
+                builtins.toString pkgs.raspberrypifw
+              }" > "$STATE_DIRECTORY/firmware-version"
+              rm "$STATE_DIRECTORY/firmware-migration-in-progress"
+            }
+
+            if [[ -f "$STATE_DIRECTORY/uboot-migration-in-progress" || ! -f "$STATE_DIRECTORY/uboot-version" || $(< "$STATE_DIRECTORY/uboot-version") != ${
               builtins.toString pkgs.uboot_rpi_arm64
-            }" > "$STATE_DIRECTORY/uboot-version"
+            } ]]; then
-            rm "$STATE_DIRECTORY/uboot-migration-in-progress"
+              migrate_uboot
-          }
-
-          migrate_config() {
-            echo "migrating config.txt"
-            touch "$STATE_DIRECTORY/config-migration-in-progress"
-            cp "$CONFIG" "$TMPFILE"
-            mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/config.txt"
-            echo "${config.hardware.raspberry-pi.config-output}" > "$STATE_DIRECTORY/config-version"
-            rm "$STATE_DIRECTORY/config-migration-in-progress"
-          }
-
-          migrate_firmware() {
-            echo "migrating raspberrypi firmware"
-            touch "$STATE_DIRECTORY/firmware-migration-in-progress"
-            for SRC in "''${STARTFILES[@]}" "''${DTBS[@]}" "$BOOTCODE" "''${FIXUPS[@]}"
-            do
-              cp "$SRC" "$TMPFILE"
-              mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/$(basename "$SRC")"
-            done
-
-            if [[ ! -d "$TARGET_OVERLAYS_DIR" ]]; then
-              mkdir "$TARGET_OVERLAYS_DIR"
             fi
 
-            for SRC in "''${SRC_OVERLAYS[@]}"
+            if [[ -f "$STATE_DIRECTORY/config-migration-in-progress" || ! -f "$STATE_DIRECTORY/config-version" || $(< "$STATE_DIRECTORY/config-version") != ${
-            do
+              builtins.toString config.hardware.raspberry-pi.config-output
-              cp "$SRC" "$TMPFILE"
+            } ]]; then
-              mv -T "$TMPFILE" "$TARGET_OVERLAYS_DIR/$(basename "$SRC")"
+              migrate_config
-            done
+            fi
-            echo "${
+
+            if [[ -f "$STATE_DIRECTORY/firmware-migration-in-progress" || ! -f "$STATE_DIRECTORY/firmware-version" || $(< "$STATE_DIRECTORY/firmware-version") != ${
               builtins.toString pkgs.raspberrypifw
-            }" > "$STATE_DIRECTORY/firmware-version"
+            } ]]; then
-            rm "$STATE_DIRECTORY/firmware-migration-in-progress"
+              migrate_firmware
-          }
+            fi
-
+          '';
-          if [[ -f "$STATE_DIRECTORY/uboot-migration-in-progress" || ! -f "$STATE_DIRECTORY/uboot-version" || $(< "$STATE_DIRECTORY/uboot-version") != ${
+        };
-            builtins.toString pkgs.uboot_rpi_arm64
-          } ]]; then
-            migrate_uboot
-          fi
-
-          if [[ -f "$STATE_DIRECTORY/config-migration-in-progress" || ! -f "$STATE_DIRECTORY/config-version" || $(< "$STATE_DIRECTORY/config-version") != ${
-            builtins.toString config.hardware.raspberry-pi.config-output
-          } ]]; then
-            migrate_config
-          fi
-
-          if [[ -f "$STATE_DIRECTORY/firmware-migration-in-progress" || ! -f "$STATE_DIRECTORY/firmware-version" || $(< "$STATE_DIRECTORY/firmware-version") != ${
-            builtins.toString pkgs.raspberrypifw
-          } ]]; then
-            migrate_firmware
-          fi
-        '';
-      };
     };
   };