eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-12-25 19:19:44 +01:00
Code Issues Releases Wiki Activity

Merge pull request #961 from NixOS/revert-958-visionfive2-mainline

Browse source 
Revert "starfive visionfive2: use mainline kernel"
This commit is contained in:
Jörg Thalheim 2024-05-29 14:51:56 +02:00 committed by GitHub
commit 8251761f93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
starfive/visionfive/v2/default.nix
View file

@ -1,16 +1,12 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
boot = { 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; consoleLogLevel = lib.mkDefault 7;
kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; kernelPackages = lib.mkDefault (pkgs.callPackage ./linux-6.6.nix {
kernelPatches = [{ inherit (config.boot) kernelPatches;
name = "JH7110"; });
patch = pkgs.fetchpatch {
# https://patchwork.kernel.org/project/linux-riscv/patch/20240506034627.66765-1-hal.feng@starfivetech.com/
name = "v2-riscv-defconfig-Enable-StarFive-JH7110-drivers.patch";
url = "https://patchwork.kernel.org/series/850668/mbox/";
hash = "sha256-81Brj61TOUoyVBxrXQh2VU3gTh/1V3uo33ic3sJPk2w=";
};
}];
kernelParams = kernelParams =
lib.mkDefault [ "console=tty0" "console=ttyS0,115200n8" "earlycon=sbi" ]; lib.mkDefault [ "console=tty0" "console=ttyS0,115200n8" "earlycon=sbi" ];

26
starfive/visionfive/v2/linux-6.6.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, callPackage, linuxPackagesFor, kernelPatches, ... }:
let
modDirVersion = "6.6.0";
linuxPkg = { lib, fetchFromGitHub, buildLinux, ... }@args:
buildLinux (args // {
version = "${modDirVersion}-starfive-visionfive2";
src = fetchFromGitHub {
owner = "starfive-tech";
repo = "linux";
rev = "13eb70da2a73187c8c7aece13d23d68928aa8210";
hash = "sha256-bwB7Pc+Z+MWXPfWYdgtRGuhqjiNHLDGNCY62e4lBGvE=";
};
inherit modDirVersion kernelPatches;
structuredExtraConfig = with lib.kernel; {
PINCTRL_STARFIVE_JH7110_SYS = yes;
SERIAL_8250_DW = yes;
};
extraMeta.branch = "JH7110_VisionFive2_upstream";
} // (args.argsOverride or { }));
in lib.recurseIntoAttrs (linuxPackagesFor (callPackage linuxPkg { }))