starfive visionfive2: Fix kernel on nixos-unstable
This commit is contained in:
parent
4fb7708a20
commit
f5298eb1d7
|
@ -3,9 +3,7 @@
|
||||||
Create and configure the `flake.nix` file:
|
Create and configure the `flake.nix` file:
|
||||||
``` nix
|
``` nix
|
||||||
{
|
{
|
||||||
# Kernel is broken on riscv64 see https://github.com/NixOS/nixpkgs/issues/225756
|
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
inputs.nixpkgs.url =
|
|
||||||
"github:nixos/nixpkgs/c3e12e57c3e3d5c84cc500420be4507b3de33e90";
|
|
||||||
inputs.nixos-hardware.url = "github:nixos/nixos-hardware";
|
inputs.nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||||
inputs.flake-utils.url = "github:numtide/flake-utils";
|
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||||
outputs = { self, nixpkgs, nixos-hardware, flake-utils }:
|
outputs = { self, nixpkgs, nixos-hardware, flake-utils }:
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
|
lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
|
||||||
consoleLogLevel = lib.mkDefault 7;
|
consoleLogLevel = lib.mkDefault 7;
|
||||||
kernelPackages =
|
kernelPackages =
|
||||||
lib.mkDefault (pkgs.callPackage ./linux_6_3.nix { inherit (config.boot) kernelPatches; });
|
lib.mkDefault (pkgs.callPackage ./linux-6.3.nix { inherit (config.boot) kernelPatches; });
|
||||||
|
|
||||||
kernelParams =
|
kernelParams =
|
||||||
lib.mkDefault [ "console=tty0" "console=ttyS0,115200n8" "earlycon=sbi" ];
|
lib.mkDefault [ "console=tty0" "console=ttyS0,115200n8" "earlycon=sbi" ];
|
||||||
|
|
|
@ -14,7 +14,16 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit modDirVersion;
|
inherit modDirVersion;
|
||||||
kernelPatches = [{ patch = ./fix-memory-size.patch; }] ++ kernelPatches;
|
kernelPatches = [
|
||||||
|
{ patch = ./fix-memory-size.patch; }
|
||||||
|
{
|
||||||
|
patch = fetchpatch {
|
||||||
|
url =
|
||||||
|
"https://github.com/torvalds/linux/commit/d83806c4c0cccc0d6d3c3581a11983a9c186a138.diff";
|
||||||
|
hash = "sha256-xUnEJkzQRIIBF/0GIpS0Cd+h6OdSiJlyva5xwxtleE0=";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
] ++ kernelPatches;
|
||||||
|
|
||||||
structuredExtraConfig = with lib.kernel; {
|
structuredExtraConfig = with lib.kernel; {
|
||||||
PL330_DMA = no;
|
PL330_DMA = no;
|
Loading…
Reference in a new issue