eeva/wip-pinebook-pro
1
0
Fork 0
mirror of https://github.com/samueldr/wip-pinebook-pro.git synced 2024-11-23 03:19:43 +01:00
Code Issues Releases Wiki Activity

Drop customized lts kernel too

Browse source
This commit is contained in:
Samuel Dionne-Riel 2022-02-20 20:06:48 -05:00
parent 4ea68e5f19
commit f6549f41f3
3 changed files with 2 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
default.nix
View file

@ -28,8 +28,6 @@ in
{ {
inherit (base) pkgs; inherit (base) pkgs;
kernel_lts = base.pkgs.linuxPackages_pinebookpro_lts.kernel;
isoImage = (buildConfig { isoImage = (buildConfig {
configuration = (fromPkgs "nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"); configuration = (fromPkgs "nixos/modules/installer/cd-dvd/installation-cd-minimal.nix");
}).config.system.build.isoImage; }).config.system.build.isoImage;

68
kernel/lts/default.nix
View file

@ -1,68 +0,0 @@
# By design this is only softly "pinning" to a particular major version.
# By design, this will track the kernel upgrades in Nixpkgs.
# It is unlikely patches won't apply on the LTS version.
{ pkgs, lib, linux_5_10, kernelPatches, fetchpatch, ... } @ args:
let
nhp = patch: sha256: let rev = "ded66e50064c55a56a958558ab35bc6bae444e72"; in {
name = patch;
patch = (fetchpatch {
url = "https://raw.githubusercontent.com/nadiaholmquist/pbp-packages/${rev}/linux-pbp/${patch}";
inherit sha256;
});
};
in
linux_5_10.override({
kernelPatches = lib.lists.unique (kernelPatches ++ [
pkgs.kernelPatches.bridge_stp_helper
pkgs.kernelPatches.request_key_helper
# Kernel configuration
{
# None of these *need* to be set to `y`.
# But eh, it works too
name = "pinebookpro-config";
patch = null;
extraConfig = ''
PCIE_ROCKCHIP y
PCIE_ROCKCHIP_HOST y
PCIE_DW_PLAT y
PCIE_DW_PLAT_HOST y
PHY_ROCKCHIP_PCIE y
PHY_ROCKCHIP_INNO_HDMI y
PHY_ROCKCHIP_DP y
ROCKCHIP_MBOX y
USB_DWC2_PCI y
ROCKCHIP_LVDS y
ROCKCHIP_RGB y
'';
}
{
name = "video-hantro-config";
patch = null;
extraConfig = ''
STAGING_MEDIA y
VIDEO_HANTRO m
VIDEO_HANTRO_ROCKCHIP y
'';
}
# Misc. community patches
# None are *required* for basic function.
# https://github.com/nadiaholmquist/pbp-packages/tree/master/linux-pbp
(nhp "0007-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch" "1d16gjgds670dzpkb8jjlymcpp1inab3mlzbpfdinrgvfy4pywhi")
(nhp "0011-typec-displayport-some-devices-have-pin-assignments-reversed.patch" "02dbkjkr4x407cysr9b0ps34izhq7p3gk9q7rz5abmazgcz62y4g")
(nhp "0012-usb-typec-tcpm-Add-generic-extcon-for-tcpm-enabled-devices.patch" "1icfy8vmwm0f825bgndhmdiskrryzpsbnrfhgvpbxwjrvwmkvlar")
(nhp "0013-usb-typec-tcpm-Add-generic-extcon-to-tcpm.patch" "0qiyf42g9jd8inb85gkj6bacbid88wb3hbn3144ja3xfss1l04cw")
(nhp "0014-arm64-rockchip-add-DP-ALT-rockpro64.patch" "03k13jgcnz7wmks1y1fgzpjj2yvi114cbvprmnkyf8xrjns7x5q0")
(nhp "0015-ayufan-drm-rockchip-add-support-for-modeline-32MHz-e.patch" "0z51whv0bjj45l5z3q4v0rqdvz62dh4qg8ccd87la9ga8y1v14cy")
(nhp "0021-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch" "0a4zd7ihd9pj6djgcj4ayaw7ff0xs9wqgmcvhwchwy766js3l5rp")
(nhp "0022-phy-rockchip-typec-Set-extcon-capabilities.patch" "0pqq856g0yndxvg9ipbx1jv6j4ldvapgzvxzvpirygc7f0wdrz49")
(nhp "0023-usb-typec-altmodes-displayport-Add-hacky-generic-altmode.patch" "1vldwg3zwrx2ppqgbhc91l48nfmjkmwwdsyq6mq6f3l1cwfdn62q")
(nhp "0024-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch" "0zwwyhryghafga36mgnazn6gk88m2rvs8ng5ykk4hhg9pi5bgzh9")
(nhp "0026-arm64-dts-rockchip-add-typec-extcon-hack.patch" "1kri47nkm6qgsqgkxzgy6iwhpajcx9xwd4rf8dldr6prb9f6iv3p")
(nhp "pbp-2d-fix.patch" "1hwd6clk1qnjyd4jl7kjn9pnilijz4brh1p5dnv8jzr2ajx2346j")
]);
})
//
(args.argsOverride or {})

5
overlay.nix
View file

@ -4,12 +4,11 @@ let
inherit (final) callPackage kernelPatches linuxPackagesFor; inherit (final) callPackage kernelPatches linuxPackagesFor;
in in
{ {
# The unqualified kernel attr is deprecated.
linuxPackages_pinebookpro_latest = throw "Use the mainline kernel directly instead (linuxPackages_latest)."; linuxPackages_pinebookpro_latest = throw "Use the mainline kernel directly instead (linuxPackages_latest).";
linux_pinebookpro_latest = throw "Use the mainline kernel directly instead (linuxPackages_latest)."; linux_pinebookpro_latest = throw "Use the mainline kernel directly instead (linuxPackages_latest).";
linux_pinebookpro_lts = callPackage ./kernel/lts { kernelPatches = []; }; linuxPackages_pinebookpro_lts = throw "Use the mainline kernel directly instead (linuxPackages_latest).";
linuxPackages_pinebookpro_lts = linuxPackagesFor final.linux_pinebookpro_lts; linux_pinebookpro_lts = throw "Use the mainline kernel directly instead (linuxPackages_latest).";
pinebookpro-ap6256-firmware = callPackage ./firmware/ap6256-firmware.nix {}; pinebookpro-ap6256-firmware = callPackage ./firmware/ap6256-firmware.nix {};
pinebookpro-keyboard-updater = callPackage ./keyboard-updater {}; pinebookpro-keyboard-updater = callPackage ./keyboard-updater {};