mainline experiments

NixOS · Jun 2, 2024 · c1f4966 · c1f4966
1 parent f1478c1
commit c1f4966
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/starfive/visionfive/v2/linux-6.6.nix b/starfive/visionfive/v2/linux-6.6.nix
@@ -1,23 +1,28 @@
 { lib, callPackage, linuxPackagesFor, kernelPatches, ... }:
 
 let
-  modDirVersion = "6.10.0-rc1";
+  modDirVersion = "6.9.2";
   linuxPkg = { lib, fetchFromGitHub, buildLinux, ... }@args:
     buildLinux (args // {
       version = "${modDirVersion}-starfive-visionfive2";
 
       src = fetchFromGitHub {
         owner = "orangecms";
         repo = "linux-starfive";
-        rev = "d10a10d28eb5c1fd14acaf55e1050306963d8d9b";
-        hash = "sha256-B+zyphZzas74FbhHmCFgwkQpr5FS6xjmGHbp+If6XQo=";
+        # Linux 6.9.2 commit
+        rev = "c8eef176690851911d8b70d798152e7314b0f7dc";
+        hash = "sha256-8SyfBmjLSWsBPvboCMh4qBAjaQ7yPT+AvMd3FTeYzMM=";
+        #latest with custom dirty hacks
+        #rev = "d10a10d28eb5c1fd14acaf55e1050306963d8d9b";
+        #hash = "sha256-B+zyphZzas74FbhHmCFgwkQpr5FS6xjmGHbp+If6XQo=";
       };
 
       inherit modDirVersion kernelPatches;
 
       structuredExtraConfig = with lib.kernel; {
         PINCTRL_STARFIVE_JH7110_SYS = yes;
         SERIAL_8250_DW = yes;
+        CONFIG_STARFIVE_JH7110_TIMER = yes;
       };
 
       extraMeta.branch = "6.9-jh7110-cpu";