eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-26 21:09:42 +01:00
Code Issues Releases Wiki Activity

Switch to using prepatched kernel

Browse source
This commit is contained in:
kiana.a.sheibani@gmail.com 2022-02-24 16:54:29 -07:00
parent ac37abec89
commit a80936a62e
5 changed files with 5 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
microsoft/surface/hardware_configuration.nix
View file

@ -6,7 +6,7 @@
options snd_ac97_codec power_save=1
options iwlwifi power_save=Y
options iwldvm force_cam=N
'';
s '';
boot.kernelParams = [ "mem_sleep_default=deep" ];

2
microsoft/surface/kernel/default.nix
View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }:
{
boot.kernelPackages = pkgs.callPackage ./linux-5.16.2 { };
boot.kernelPackages = pkgs.callPackage ./linux-5.16.11.nix { };
}

130
microsoft/surface/kernel/linux-5.16.2/default.nix
View file

@ -1,130 +0,0 @@
{ config, lib, pkgs, ... }:
let
repos = (pkgs.callPackage ../../repos.nix { });
patches = repos.linux-surface + "/patches";
surface_kernelPatches = [
{
name = "microsoft-surface-patches-linux-5.16.2";
patch = null;
structuredExtraConfig = with lib.kernel; {
#
# Surface Aggregator Module
#
SURFACE_AGGREGATOR = module;
SURFACE_AGGREGATOR_ERROR_INJECTION = no;
SURFACE_AGGREGATOR_BUS = yes;
SURFACE_AGGREGATOR_CDEV = module;
SURFACE_AGGREGATOR_REGISTRY = module;
SURFACE_ACPI_NOTIFY = module;
SURFACE_DTX = module;
SURFACE_PLATFORM_PROFILE = module;
SURFACE_HID = module;
SURFACE_KBD = module;
BATTERY_SURFACE = module;
CHARGER_SURFACE = module;
#
# Surface laptop 1 keyboard
#
SERIAL_DEV_BUS = yes;
SERIAL_DEV_CTRL_TTYPORT = yes;
#
# Surface Hotplug
#
SURFACE_HOTPLUG = module;
#
# IPTS touchscreen
#
# This only enables the user interface for IPTS data.
# For the touchscreen to work, you need to install iptsd.
#
MISC_IPTS = module;
#
# Cameras: IPU3
#
VIDEO_IPU3_IMGU = module;
VIDEO_IPU3_CIO2 = module;
CIO2_BRIDGE = yes;
INTEL_SKL_INT3472 = module;
#
# Cameras: Sensor drivers
#
VIDEO_OV5693 = module;
VIDEO_OV8865 = module;
#
# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
#
APDS9960 = module;
#
# Other Drivers
#
INPUT_SOC_BUTTON_ARRAY = module;
SURFACE_3_BUTTON = module;
SURFACE_3_POWER_OPREGION = module;
SURFACE_PRO3_BUTTON = module;
SURFACE_GPE = module;
SURFACE_BOOK1_DGPU_SWITCH = module;
};
}
{
name = "ms-surface/0001-surface3-oemb";
patch = patches + "/5.16/0001-surface3-oemb.patch";
}
{
name = "ms-surface/0002-mwifiex";
patch = patches + "/5.16/0002-mwifiex.patch";
}
{
name = "ms-surface/0003-ath10k";
patch = patches + "/5.16/0003-ath10k.patch";
}
{
name = "ms-surface/0004-ipts";
patch = patches + "/5.16/0004-ipts.patch";
}
{
name = "ms-surface/0005-surface-sam";
patch = patches + "/5.16/0005-surface-sam.patch";
}
{
name = "ms-surface/0006-surface-sam-over-hid";
patch = patches + "/5.16/0006-surface-sam-over-hid.patch";
}
{
name = "ms-surface/0007-surface-gpe";
patch = patches + "/5.16/0007-surface-gpe.patch";
}
{
name = "ms-surface/0008-surface-button";
patch = patches + "/5.16/0008-surface-button.patch";
}
{
name = "ms-surface/0009-surface-typecover";
patch = patches + "/5.16/0009-surface-typecover.patch";
}
{
name = "ms-surface/0010-cameras";
patch = patches + "/5.16/0010-cameras.patch";
}
{
name = "ms-surface/0011-amd-gpio";
patch = patches + "/5.16/0011-amd-gpio.patch";
}
{
name = "ms-surface/0012-misc-fixes";
patch = patches + "/5.16/0012-misc-fixes.patch";
}
];
in (with pkgs;
recurseIntoAttrs (linuxPackagesFor (callPackage ./linux-5.16.2.nix {
kernelPatches = surface_kernelPatches;
})))

22
microsoft/surface/kernel/linux-5.16.2/linux-5.16.2.nix
View file

@ -1,22 +0,0 @@
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux
, modDirVersionArg ? null, ... }@args:
with lib;
buildLinux (args // rec {
version = "5.16.2";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then
concatStringsSep "." (take 3 (splitVersion "${version}.0"))
else
modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0i1vcv2zi80ixmgjdcq6yk8qhwaqlbbmmrq0prxk41339lx87zh9";
};
} // (args.argsOverride or { }))

8
microsoft/surface/repos.nix
View file

@ -1,9 +1,7 @@
{ lib, pkgs, fetchFromGitHub, fetchurl }: {
linux-surface = fetchFromGitHub {
owner = "linux-surface";
repo = "linux-surface";
rev = "2943260699f48472f1f5138127a1779497f890d8";
sha256 = "1qcr4ynn3dz4xqmfnajk7cdianwdy008d8i7n4f8v9y5yswr9h7q";
linux-surface-kernel = fetchurl {
url = "https://github.com/linux-surface/kernel/archive/v5.16-surface.tar.gz";
sha256 = "060dz5bqd339w7731vgbkmd3inmw6andbzycx94xs84sdlv0363l";
};
ath10k-firmware = fetchFromGitHub {