darkkirb/nix-packages
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix kernels

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2023-06-25 16:58:48 +01:00
parent b64f8ae10a
commit 98aeca0067
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
3 changed files with 79 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
linux/bcachefs/default.nix
View file

@ -7,7 +7,7 @@
modDirVersion = "6.3.0"; modDirVersion = "6.3.0";
source = builtins.fromJSON (builtins.readFile ./source.json); source = builtins.fromJSON (builtins.readFile ./source.json);
in in
(buildLinux (args buildLinux (args
// { // {
inherit modDirVersion; inherit modDirVersion;
version = "6.3.0+${source.rev}"; version = "6.3.0+${source.rev}";
@ -25,11 +25,4 @@ in
DYNAMIC_FTRACE = yes; DYNAMIC_FTRACE = yes;
FTRACE = yes; FTRACE = yes;
}; };
})) })
.overrideAttrs (_: {
passthru.updateScript = [
../../scripts/update-git.sh
"https://github.com/koverstreet/bcachefs"
"linux/bcachefs/source.json"
];
})

154
linux/vf2/default.nix
View file

@ -9,94 +9,84 @@
modDirVersion = "6.4.0-rc6"; modDirVersion = "6.4.0-rc6";
source = builtins.fromJSON (builtins.readFile ./source.json); source = builtins.fromJSON (builtins.readFile ./source.json);
in in
( buildLinux (args
buildLinux (args // {
// { inherit modDirVersion;
inherit modDirVersion; version = "${modDirVersion}-vf2";
version = "${modDirVersion}-vf2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "starfive-tech"; owner = "starfive-tech";
repo = "linux"; repo = "linux";
inherit (source) rev sha256; inherit (source) rev sha256;
}; };
kernelPatches = [ kernelPatches = [
# https://lore.kernel.org/all/20230524000012.15028-1-andre.przywara@arm.com/ # https://lore.kernel.org/all/20230524000012.15028-1-andre.przywara@arm.com/
rec { rec {
name = "axp15060-1.patch"; name = "axp15060-1.patch";
patch = fetchpatch { patch = fetchpatch {
inherit name; inherit name;
url = "https://lore.kernel.org/all/20230524000012.15028-2-andre.przywara@arm.com/raw"; url = "https://lore.kernel.org/all/20230524000012.15028-2-andre.przywara@arm.com/raw";
hash = "sha256-kj4vQaT4CV29EHv8MtuTgM/semIPDdv2dmveo/X27vU="; hash = "sha256-kj4vQaT4CV29EHv8MtuTgM/semIPDdv2dmveo/X27vU=";
}; };
} }
rec { rec {
name = "axp15060-2.patch"; name = "axp15060-2.patch";
patch = fetchpatch { patch = fetchpatch {
inherit name; inherit name;
url = "https://lore.kernel.org/all/20230524000012.15028-3-andre.przywara@arm.com/raw"; url = "https://lore.kernel.org/all/20230524000012.15028-3-andre.przywara@arm.com/raw";
hash = "sha256-QCPQyKqoapMtqEDB9QgAuXA7n8e1OtG+YlIgeSQBxXM="; hash = "sha256-QCPQyKqoapMtqEDB9QgAuXA7n8e1OtG+YlIgeSQBxXM=";
}; };
} }
rec { rec {
name = "axp15060-3.patch"; name = "axp15060-3.patch";
patch = fetchpatch { patch = fetchpatch {
inherit name; inherit name;
url = "https://lore.kernel.org/all/20230524000012.15028-4-andre.przywara@arm.com/raw"; url = "https://lore.kernel.org/all/20230524000012.15028-4-andre.przywara@arm.com/raw";
hash = "sha256-SpKDm4PXR6qs7kX5SGVpFF/EPBijMhX1NsFUHrlCynM="; hash = "sha256-SpKDm4PXR6qs7kX5SGVpFF/EPBijMhX1NsFUHrlCynM=";
}; };
} }
]; ];
structuredExtraConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
CPU_FREQ = yes; CPU_FREQ = yes;
CPUFREQ_DT = yes; CPUFREQ_DT = yes;
CPUFREQ_DT_PLATDEV = yes; CPUFREQ_DT_PLATDEV = yes;
DMADEVICES = yes; DMADEVICES = yes;
GPIO_SYSFS = yes; GPIO_SYSFS = yes;
HIBERNATION = yes; HIBERNATION = yes;
NO_HZ_IDLE = yes; NO_HZ_IDLE = yes;
POWER_RESET_GPIO_RESTART = yes; POWER_RESET_GPIO_RESTART = yes;
PROC_KCORE = yes; PROC_KCORE = yes;
PWM = yes; PWM = yes;
PWM_STARFIVE_PTC = yes; PWM_STARFIVE_PTC = yes;
RD_GZIP = yes; RD_GZIP = yes;
SENSORS_SFCTEMP = yes; SENSORS_SFCTEMP = yes;
SERIAL_8250_DW = yes; SERIAL_8250_DW = yes;
SIFIVE_CCACHE = yes; SIFIVE_CCACHE = yes;
SIFIVE_PLIC = yes; SIFIVE_PLIC = yes;
RTC_DRV_STARFIVE = yes; RTC_DRV_STARFIVE = yes;
SPI_PL022 = yes; SPI_PL022 = yes;
SPI_PL022_STARFIVE = yes; SPI_PL022_STARFIVE = yes;
I2C = yes; I2C = yes;
MFD_AXP20X = yes; MFD_AXP20X = yes;
MFD_AXP20X_I2C = yes; MFD_AXP20X_I2C = yes;
REGULATOR_AXP20X = yes; REGULATOR_AXP20X = yes;
# FATAL: modpost: drivers/gpu/drm/verisilicon/vs_drm: struct of_device_id is not terminated with a NULL entry! # FATAL: modpost: drivers/gpu/drm/verisilicon/vs_drm: struct of_device_id is not terminated with a NULL entry!
DRM_VERISILICON = no; DRM_VERISILICON = no;
PL330_DMA = no; PL330_DMA = no;
}; };
preferBuiltin = true; preferBuiltin = true;
extraMeta = { extraMeta = {
branch = "JH7110_VisionFive2_upstream"; branch = "JH7110_VisionFive2_upstream";
description = "Linux kernel for StarFive's VisionFive2"; description = "Linux kernel for StarFive's VisionFive2";
platforms = ["riscv64-linux"]; platforms = ["riscv64-linux"];
}; };
} }
// (args.argsOverride or {})) // (args.argsOverride or {}))
)
.overrideAttrs (_: {
passthru.updateScript = [
../../scripts/update-git.sh
"https://github.com/starfive-tech/linux"
"linux/bcachefs/source.json"
"--rev refs/heads/JH7110_VisionFive2_upstream"
];
})

5
update.sh Executable file
View file

@ -0,0 +1,5 @@
#!/bin/sh
./scripts/update-git.sh https://github.com/starfive-tech/linux linux/vf2/source.json "--rev refs/heads/JH7110_VisionFive2_upstream"
./scripts/update-git.sh https://github.com/koverstreet/bcachefs linux/bcachefs/source.json
nix-shell ./scripts/update.sh