starfive visionfive2: use mainline kernel

Co-authored-by: NickCao <[email protected]>
NixOS · Jun 3, 2024 · 56039df · 56039df
1 parent b55712d
commit 56039df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 34 deletions.
diff --git a/starfive/visionfive/v2/default.nix b/starfive/visionfive/v2/default.nix
@@ -1,15 +1,10 @@
 { 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;
 
-    kernelParams =
-      lib.mkDefault [ "console=tty0" "console=ttyS0,115200n8" "earlycon=sbi" ];
+    kernelParams = [ "console=tty0" "console=ttyS0,115200n8" "earlycon=sbi" ];
 
     initrd.availableKernelModules = [ "dw_mmc_starfive" ];
 

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