starfive visionfive2: use mainline kernel

NixOS · Jun 3, 2024 · cc461df · cc461df
1 parent b55712d
commit cc461df
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 32 deletions.
diff --git a/starfive/visionfive/v2/default.nix b/starfive/visionfive/v2/default.nix
@@ -1,12 +1,16 @@
 { config, lib, pkgs, ... }: {
   boot = {
-    # Force no ZFS (from nixos/modules/profiles/base.nix) until updated to kernel 6.0
-    supportedFilesystems =
-      lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
     consoleLogLevel = lib.mkDefault 7;
-    kernelPackages = lib.mkDefault (pkgs.callPackage ./linux-6.6.nix {
-      inherit (config.boot) kernelPatches;
-    });
+    # Require at least Linux >= 6.9
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+    # Enable some required flags for JH7110 arch
+    kernelPatches = [{
+      name = "enable_serial_8250_dw";
+      patch = null;
+      extraStructuredConfig = {
+        SERIAL_8250_DW = lib.kernel.yes;
+      };
+    }];
 
     kernelParams =
       lib.mkDefault [ "console=tty0" "console=ttyS0,115200n8" "earlycon=sbi" ];

diff --git a/starfive/visionfive/v2/linux-6.6.nix b/starfive/visionfive/v2/linux-6.6.nix