Skip to content

Commit

Permalink
starfive visionfive2: use mainline kernel
Browse files Browse the repository at this point in the history
Co-authored-by: NickCao <[email protected]>
  • Loading branch information
onny and NickCao committed Sep 18, 2024
1 parent 14c3331 commit a60f705
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 34 deletions.
21 changes: 13 additions & 8 deletions starfive/visionfive/v2/default.nix
Original file line number Diff line number Diff line change
@@ -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;
});
# Switch to default as soon they reach >= 6.11
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" ];

Expand All @@ -18,4 +13,14 @@
generic-extlinux-compatible.enable = lib.mkDefault true;
};
};

hardware.deviceTree.name =
lib.mkDefault "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";

assertions = [
{
assertion = (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.11");
message = "The VisionFive 2 requires at least mainline kernel version 6.11 for minimum hardware support.";
}
];
}
26 changes: 0 additions & 26 deletions starfive/visionfive/v2/linux-6.6.nix

This file was deleted.

0 comments on commit a60f705

Please sign in to comment.