From 153829c749cfb2356997f548b1fe447d2899cc16 Mon Sep 17 00:00:00 2001
From: Nicolas Hiillos <nicolashiillos@gmail.com>
Date: Wed, 27 Sep 2023 08:27:12 +0300
Subject: [PATCH] Upgrade to 6.1

---
 .../default.nix                                  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
 rename packages/{linux_rpi4_rt_5_15 => linux_rpi4_rt_6_1}/default.nix (69%)

diff --git a/packages/linux_rpi4_rt_5_15/default.nix b/packages/linux_rpi4_rt_6_1/default.nix
similarity index 69%
rename from packages/linux_rpi4_rt_5_15/default.nix
rename to packages/linux_rpi4_rt_6_1/default.nix
index ac0a6dc..2788c1d 100644
--- a/packages/linux_rpi4_rt_5_15/default.nix
+++ b/packages/linux_rpi4_rt_6_1/default.nix
@@ -1,23 +1,23 @@
 { lib, linuxKernel, linuxPackagesFor, writeText, buildPackages, fetchurl, fetchFromGitHub, raspberrypifw, ... }: rec {
   kernel = linuxKernel.kernels.linux_rpi4.override {
     argsOverride = rec {
-      modDirVersion = "5.15.43-rt45";
+      modDirVersion = "6.1.54-rt15";
       version = "${modDirVersion}-notag";
       src = fetchFromGitHub {
         owner = "raspberrypi";
         repo = "linux";
-        rev = "97be5486aeff2253079e75fc3222fbe66118cf12";
-        sha256 = "7D4B68n3diMYU/1ugQ/8nESR5dRIsYfmGSNmbq3rKkM=";
+        rev = "cc08810f89e52337a99cc6ae5f53f08588357c5f";
+        sha256 = "";
       };
       kernelPatches = [{
         name = "rt";
         patch = fetchurl {
-          url = "https://cdn.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.43-rt45.patch.xz";
-          sha256 = "veAJl5zb5SEYQoGzoZtURFncHD42hQ8cX7zeS36CQvk=";
+          url = "https://cdn.kernel.org/pub/linux/kernel/projects/rt/6.1/patch-6.1.54-rt15.patch.xz";
+          sha256 = "";
         };
       }] ++ linuxKernel.kernels.linux_rpi4.kernelPatches;
       structuredExtraConfig = with lib.kernel; {
-        KVM = lib.mkForce no; # Not compatible with PREEMPT_RT. NOTE: this conflict shoulb be fixed in 5.16
+        #KVM = lib.mkForce no; # Not compatible with PREEMPT_RT. NOTE: this conflict shoulb be fixed in 5.16
         PREEMPT_RT = yes;
         EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)
         PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.
@@ -33,8 +33,8 @@
     src = fetchFromGitHub {
       owner = "raspberrypi";
       repo = "firmware";
-      rev = "f145afcfdc76157622588d5c58b95da24acea1e8";
-      sha256 = "dvUl3su9brcZ9Xamr/0UJWXuJG1FyDFPS5x5tYcJkl8=";
+      rev = "6b37a457122714aa14b2c7df0926455173fd04f1";
+      sha256 = "";
     };
   });
 }