From 196c7f8e4b2dce3510abdb10296ea8f6032e73bc Mon Sep 17 00:00:00 2001
From: adminy <marinbivol10@gmail.com>
Date: Fri, 28 Jun 2024 07:53:31 +0100
Subject: [PATCH] chore: build latest kernel

---
 flake.lock           | 36 ++++++++++++++++++------------------
 flake.nix            |  4 ++--
 overlays/default.nix | 19 +++++++++++++------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 99b2d11..9c5513e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,8 +58,8 @@
         "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
         "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
         "rpi-firmware-src": "rpi-firmware-src",
+        "rpi-linux-6_10_0-rc5-src": "rpi-linux-6_10_0-rc5-src",
         "rpi-linux-6_6_31-src": "rpi-linux-6_6_31-src",
-        "rpi-linux-6_6_34-src": "rpi-linux-6_6_34-src",
         "rpicam-apps-src": "rpicam-apps-src",
         "u-boot-src": "u-boot-src"
       }
@@ -115,6 +115,23 @@
         "type": "github"
       }
     },
+    "rpi-linux-6_10_0-rc5-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1719265450,
+        "narHash": "sha256-xd/Pz/uZFYW9hJIFKryWDE9Aks6f2EIvEDCmfk0C70c=",
+        "owner": "raspberrypi",
+        "repo": "linux",
+        "rev": "f61d3aca8045e70d64b55f7b98f083738f639ad2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "rpi-6.10.y",
+        "repo": "linux",
+        "type": "github"
+      }
+    },
     "rpi-linux-6_6_31-src": {
       "flake": false,
       "locked": {
@@ -132,23 +149,6 @@
         "type": "github"
       }
     },
-    "rpi-linux-6_6_34-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1718967581,
-        "narHash": "sha256-RMKvgdhHQQPSmGjAOpYYB7YpClPVks6f6Dw381qDYHY=",
-        "owner": "raspberrypi",
-        "repo": "linux",
-        "rev": "7af85d54e39733bb9a236b95ea5ed1ab8277d560",
-        "type": "github"
-      },
-      "original": {
-        "owner": "raspberrypi",
-        "ref": "rpi-6.6.y",
-        "repo": "linux",
-        "type": "github"
-      }
-    },
     "rpicam-apps-src": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 7289281..d127311 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,9 +11,9 @@
       flake = false;
       url = "github:raspberrypi/linux/stable_20240529";
     };
-    rpi-linux-6_6_34-src = {
+    rpi-linux-6_10_0-rc5-src = {
       flake = false;
-      url = "github:raspberrypi/linux/rpi-6.6.y";
+      url = "github:raspberrypi/linux/rpi-6.10.y";
     };
     rpi-firmware-src = {
       flake = false;
diff --git a/overlays/default.nix b/overlays/default.nix
index 4b7a5f5..058ef30 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,6 +1,6 @@
 { u-boot-src
 , rpi-linux-6_6_31-src
-, rpi-linux-6_6_34-src
+, rpi-linux-6_10_0-rc5-src
 , rpi-firmware-src
 , rpi-firmware-nonfree-src
 , rpi-bluez-firmware-src
@@ -30,7 +30,18 @@ let
         }
       ];
     };
-    v6_6_34.src = rpi-linux-6_6_34-src;
+    v6_10_0-rc5 = {
+      src = rpi-linux-6_10_0-rc5-src;
+      patches = [
+        {
+          name = "remove-readme-target.patch";
+          patch = final.fetchpatch {
+            url = "https://github.com/raspberrypi/linux/commit/3c0fd51d184f1748b83d28e1113265425c19bcb5.patch";
+            hash = "sha256-v7uZOmPCUp2i7NGVgjqnQYe6dEBD+aATuP/oRs9jfuk=";
+          };
+        }
+      ];
+    };
   };
   boards = [ "bcmrpi" "bcm2709" "bcmrpi3" "bcm2711" "bcm2712" ];
 
@@ -48,10 +59,6 @@ let
         src = kernel.src;
         defconfig = "${board}_defconfig";
         structuredExtraConfig = with final.lib.kernel; {
-          # Workaround https://github.com/raspberrypi/linux/issues/6198
-          # Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in
-          # DRM_KMS_HELPER=y.
-          BACKLIGHT_CLASS_DEVICE = yes;
           # The perl script to generate kernel options sets unspecified
           # parameters to `m` if possible [1]. This results in the
           # unspecified config option KUNIT [2] getting set to `m` which