Update to kernel 5.10.19
- Add kernel 5.10.19 and latest linux-surface patches - Remove kernel 5.10.2 commit 7250b8cbb40bc001109b1032b426ce9923335de0 Author: mexisme <wildjim+dev@kiwinet.org> Date: Fri Feb 5 08:38:10 2021 +1300 commit 90b210dfeeaf6f625e1b7f47dfc3a0b60f4172a6 Author: mexisme <wildjim+dev@kiwinet.org> Date: Fri Feb 5 08:37:41 2021 +1300 commit bbb5dec0e353f841612a1c3a3f933c56ede418b2 Author: mexisme <wildjim+dev@kiwinet.org> Date: Tue Feb 2 23:58:51 2021 +1300 commit bde79616d2795fcedc2d88161933713a9f37e3a7 Author: mexisme <wildjim+dev@kiwinet.org> Date: Tue Feb 2 23:58:35 2021 +1300 commit be5b9c91acaebe1e17d582a1f364995dadcc339d Author: mexisme <wildjim+dev@kiwinet.org> Date: Tue Feb 2 23:57:54 2021 +1300
This commit is contained in:
parent
3caaa0588e
commit
61210f5e44
|
@ -3,9 +3,10 @@
|
||||||
- Latest from linux-surface
|
- Latest from linux-surface
|
||||||
- [X] Download github.com/linux-surface/linux-surface kernel patches
|
- [X] Download github.com/linux-surface/linux-surface kernel patches
|
||||||
- [X] Build kernel using downloaded patches
|
- [X] Build kernel using downloaded patches
|
||||||
** TODO Create a function for selecting preferred kernel
|
** CANCELLED Create a function for selecting preferred kernel
|
||||||
** DONE Fix how Keyboard & Trackpad are not being enabled on SL3
|
** DONE Fix how Keyboard & Trackpad are not being enabled on SL3
|
||||||
- https://github.com/linux-surface/surface-aggregator-module/wiki/Testing-and-Installing
|
- https://github.com/linux-surface/surface-aggregator-module/wiki/Testing-and-Installing
|
||||||
|
** DOING Update to kernel 5.10.19
|
||||||
* Firmware
|
* Firmware
|
||||||
** DONE Remove old firmware binaries
|
** DONE Remove old firmware binaries
|
||||||
- Looks like the ath10k files aren't needed, any more
|
- Looks like the ath10k files aren't needed, any more
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
boot.kernelPackages = pkgs.callPackage ./linux-5.10.2 {};
|
boot.kernelPackages = pkgs.callPackage ./linux-5.10.19 {};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
repos = (pkgs.callPackage ../../repos.nix {});
|
repos = (pkgs.callPackage ../../repos.nix {});
|
||||||
# TODO: Can I append the path ./patches instead of a string?
|
|
||||||
patches = repos.linux-surface + "/patches";
|
patches = repos.linux-surface + "/patches";
|
||||||
surface_kernelPatches = [
|
surface_kernelPatches = [
|
||||||
{ name = "microsoft-surface-patches-linux-5.10.2";
|
{ name = "microsoft-surface-patches-linux-5.10.19";
|
||||||
patch = null;
|
patch = null;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
#
|
#
|
||||||
|
@ -44,8 +43,8 @@ let
|
||||||
#
|
#
|
||||||
# Cameras: IPU3
|
# Cameras: IPU3
|
||||||
#
|
#
|
||||||
## TODO: Fix for kernel 5.10.2:
|
## Not yet supported in the patches?
|
||||||
##VIDEO_IPU3_IMGU m
|
# VIDEO_IPU3_IMGU m
|
||||||
VIDEO_IPU3_CIO2 m
|
VIDEO_IPU3_CIO2 m
|
||||||
CIO2_BRIDGE y
|
CIO2_BRIDGE y
|
||||||
INT3472 m
|
INT3472 m
|
||||||
|
@ -54,8 +53,13 @@ let
|
||||||
# Cameras: Sensor drivers
|
# Cameras: Sensor drivers
|
||||||
#
|
#
|
||||||
VIDEO_OV5693 m
|
VIDEO_OV5693 m
|
||||||
## TODO: Fix for kernel 5.10.2:
|
## Not yet supported in the patches?
|
||||||
##VIDEO_OV8865 m
|
# VIDEO_OV8865 m
|
||||||
|
|
||||||
|
#
|
||||||
|
# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
|
||||||
|
#
|
||||||
|
APDS9960 m
|
||||||
|
|
||||||
#
|
#
|
||||||
# Other Drivers
|
# Other Drivers
|
||||||
|
@ -101,12 +105,16 @@ let
|
||||||
patch = patches + "/5.10/0008-surface-typecover.patch";
|
patch = patches + "/5.10/0008-surface-typecover.patch";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "ms-surface/0009-cameras";
|
name = "ms-surface/0009-surface-sensors";
|
||||||
patch = patches + "/5.10/0009-cameras.patch";
|
patch = patches + "/5.10/0009-surface-sensors.patch";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "ms-surface/0010-cameras";
|
||||||
|
patch = patches + "/5.10/0010-cameras.patch";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
in (with pkgs; recurseIntoAttrs (linuxPackagesFor (
|
in (with pkgs; recurseIntoAttrs (linuxPackagesFor (
|
||||||
callPackage ./linux-5.10.2.nix {
|
callPackage ./linux-5.10.19.nix {
|
||||||
kernelPatches = surface_kernelPatches;
|
kernelPatches = surface_kernelPatches;
|
||||||
}
|
}
|
||||||
)))
|
)))
|
|
@ -3,7 +3,7 @@
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "5.10.2";
|
version = "5.10.19";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# 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;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||||
sha256 = "18l1ywp99inm90434fm74w8rjfl4yl974kfcpizg2sp2p8xf311v";
|
sha256 = "1mml5a30ky0khzj3r6ahybycbbszk86agq62qclwq2kzvsqbprr7";
|
||||||
};
|
};
|
||||||
} // (args.argsOverride or {}))
|
} // (args.argsOverride or {}))
|
|
@ -2,7 +2,7 @@
|
||||||
{
|
{
|
||||||
linux-surface = fetchgit {
|
linux-surface = fetchgit {
|
||||||
url="https://github.com/linux-surface/linux-surface.git";
|
url="https://github.com/linux-surface/linux-surface.git";
|
||||||
rev="25ab2cf75e5eda5ab9739db1907300010c06dacf";
|
rev="f8fab978a480a4ed57e9ebb6928683b2e443c1c5";
|
||||||
sha256="0h8624d7ix1p6ysw9bllmnnwnv164z8xkx56zj3vdczn91vmqcf9";
|
sha256="0zwybprwjckpapxm6gxzh6hwdd1w91g5sjxn6z52zlvvjpkmw959";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue