starfive visionfive2: update kernel to 6.4.0-rc4

NixOS · May 31, 2023 · 3c13c3c · 3c13c3c
1 parent 4cc688e
commit 3c13c3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/starfive/visionfive/v2/default.nix b/starfive/visionfive/v2/default.nix
@@ -4,7 +4,7 @@
     supportedFilesystems =
       lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
     consoleLogLevel = lib.mkDefault 7;
-    kernelPackages = lib.mkDefault (pkgs.callPackage ./linux-6.3.nix {
+    kernelPackages = lib.mkDefault (pkgs.callPackage ./linux-6.4.nix {
       inherit (config.boot) kernelPatches;
     });
 

diff --git a/starfive/visionfive/v2/linux-6.3.nix → starfive/visionfive/v2/linux-6.4.nix b/starfive/visionfive/v2/linux-6.3.nix → starfive/visionfive/v2/linux-6.4.nix
@@ -1,27 +1,20 @@
-{ lib, callPackage, linuxPackagesFor, kernelPatches, fetchpatch, ... }:
+{ lib, callPackage, linuxPackagesFor, kernelPatches, ... }:
 
 let
-  modDirVersion = "6.3.0-rc4";
+  modDirVersion = "6.4.0-rc4";
   linuxPkg = { lib, fetchFromGitHub, buildLinux, ... }@args:
     buildLinux (args // {
       version = "${modDirVersion}-starfive-visionfive2";
 
       src = fetchFromGitHub {
         owner = "starfive-tech";
         repo = "linux";
-        rev = "a57bdb1d13f93c8fc1b3c668cc74d585bb20f3f8";
-        sha256 = "sha256-jnQnJChIGCyJt+zwGfUTsMhrwmWek/ngIM6Pae6OXuI=";
+        rev = "d0bfa67ad26dd9e76a5cd13d68599066ec9ad955";
+        sha256 = "sha256-kJCM9WxrCsZIk7noccTNPwuh5/+3ZK2T60vjS6+8IrM=";
       };
 
       inherit modDirVersion;
       kernelPatches = [
-        {
-          patch = fetchpatch {
-            url =
-              "https://github.com/torvalds/linux/commit/d83806c4c0cccc0d6d3c3581a11983a9c186a138.diff";
-            hash = "sha256-xUnEJkzQRIIBF/0GIpS0Cd+h6OdSiJlyva5xwxtleE0=";
-          };
-        }
       ] ++ kernelPatches;
 
       structuredExtraConfig = with lib.kernel; {