From 6d1bd5bc2e8b9992a3f57e416ba50fbed5516db6 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 1 Apr 2022 19:07:06 +0200 Subject: [PATCH] Custom patched kernel is not the default anymore --- pine64/pinebook-pro/README.md | 5 +-- pine64/pinebook-pro/default.nix | 2 +- pine64/pinebook-pro/kernel/default.nix | 42 +------------------------- pine64/pinebook-pro/overlay.nix | 2 +- 4 files changed, 6 insertions(+), 45 deletions(-) diff --git a/pine64/pinebook-pro/README.md b/pine64/pinebook-pro/README.md index bde456e..178d637 100644 --- a/pine64/pinebook-pro/README.md +++ b/pine64/pinebook-pro/README.md @@ -20,8 +20,9 @@ Currently everything seems to work but this is not guaranteed it will be forever ### Kernel -This uses a pinned kernel that imitates a manually tested version of [Manjaro ARM kernel](https://gitlab.manjaro.org/manjaro-arm/packages/core/linux/-/blob/master/PKGBUILD), this way one can update `nixpkgs` without worrying too much. -This is default kernel but the current mainline kernel `linuxPackages_latest` seems to work too. +By default this uses the latest upstream kernel but the overlay makes available `pinebookpro-unstable-manjaro-kernel` +which is built from a pinned kernel version and makes available the DP alt mode over Type-C. +This kernel is unstable and some sporadic kernel panics may occur, use at your own risk. ### Known issues diff --git a/pine64/pinebook-pro/default.nix b/pine64/pinebook-pro/default.nix index 692c56d..a570d6e 100644 --- a/pine64/pinebook-pro/default.nix +++ b/pine64/pinebook-pro/default.nix @@ -6,7 +6,7 @@ (import ./overlay.nix) ]; - boot.kernelPackages = lib.mkDefault pkgs.pinebookpro-manjaro-kernel; + boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; # This list of modules is not entirely minified, but represents # a set of modules that is required for the display to work in stage-1. diff --git a/pine64/pinebook-pro/kernel/default.nix b/pine64/pinebook-pro/kernel/default.nix index a900df7..72880ea 100644 --- a/pine64/pinebook-pro/kernel/default.nix +++ b/pine64/pinebook-pro/kernel/default.nix @@ -12,40 +12,6 @@ let }; patches = [ - # Assorted Manjaro ARM patches - "1001-arm64-dts-allwinner-add-hdmi-sound-to-pine-devices.patch" # Pine64 - "1002-arm64-dts-allwinner-add-ohci-ehci-to-h5-nanopi.patch" # Nanopi Neo Plus 2 - "1003-drm-bridge-analogix_dp-Add-enable_psr-param.patch" # Pinebook Pro - "1004-gpu-drm-add-new-display-resolution-2560x1440.patch" # Odroid - "1005-panfrost-Silence-Panfrost-gem-shrinker-loggin.patch" # Panfrost - "1006-arm64-dts-rockchip-Add-Firefly-Station-p1-support.patch" # Firelfy Station P1 - "1007-drm-rockchip-add-support-for-modeline-32MHz-e.patch" # DP Alt Mode - "1008-rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch" # RockPro64 - "1010-arm64-dts-amlogic-add-initial-Beelink-GT1-Ultimate-dev.patch" # Beelink - "1011-arm64-dts-amlogic-add-meson-g12b-ugoos-am6-plus.patch" # Meson Ugoos - "1012-drm-panfrost-scheduler-improvements.patch" # Panfrost - "1013-arm64-dts-rockchip-Add-PCIe-bus-scan-delay-to-RockPr.patch" # RockPro64 - "1014-drm-rockchip-support-gamma-control-on-RK3399.patch" # RK3399 VOP - "1015-media-rockchip-rga-do-proper-error-checking-in-probe.patch" # Rockchip RGA - "1016-arm64-dts-rockchip-switch-to-hs200-on-rockpi4.patch" # Radxa Rock Pi 4 - "1017-arm64-dts-meson-remove-CPU-opps-below-1GHz-for-G12B-boards.patch" # AMLogic [1/2] - "1018-arm64-dts-meson-remove-CPU-opps-below-1GHz-for-SM1-boards.patch" # AMLogic [2/2] - "1019-arm64-dts-rockchip-Add-PCIe-bus-scan-delay-to-Rock-P.patch" # Radxa Rock Pi 4 - - # Assorted Pinebook, PinePhone and PineTab patches - "2001-Bluetooth-Add-new-quirk-for-broken-local-ext-features.patch" # Bluetooth - "2002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch" # Bluetooth - "2003-arm64-allwinner-a64-enable-Bluetooth-On-Pinebook.patch" # Bluetooth - "2004-arm64-dts-allwinner-enable-bluetooth-pinetab-pinepho.patch" # Bluetooth - "2005-staging-add-rtl8723cs-driver.patch" # Realtek WiFi - "2006-arm64-dts-allwinner-pinetab-add-accelerometer.patch" # Accelerometer - "2007-arm64-dts-allwinner-pinetab-enable-jack-detection.patch" # Audio - "2008-brcmfmac-USB-probing-provides-no-board-type.patch" # Bluetooth - "2009-dts-rockchip-Adapt-and-adopt-Type-C-support-from-Pin.patch" # DP Alt Mode - - # Pinebook Pro Type-C patches from megous; original patch numbers found - # on https://xff.cz/kernels/5.17/patches/ are retained, with just the first - # digit changed from 0 to 3, to make tracking easier "3170-arm64-dts-rk3399-pinebook-pro-Fix-USB-PD-charging.patch" "3172-arm64-dts-rk3399-pinebook-pro-Improve-Type-C-support.patch" "3174-arm64-dts-rk3399-pinebook-pro-Remove-redundant-pinct.patch" @@ -76,15 +42,9 @@ let manjaro-kernel = pinnedNixpkgs.linuxPackagesFor (pinnedNixpkgs.linuxKernel.kernels.linux_5_16.override { argsOverride = rec { kernelPatches = map create-patch patches; - version = "5.16.18"; - modDirVersion = version; - src = builtins.fetchurl { - url = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "sha256:096f80m2czj8khvil7s037pqdf1s6pklqn5d9419jqkz7v70piry"; - }; }; }); in { - inherit manjaro-kernel; + inherit unstable-manjaro-kernel; } diff --git a/pine64/pinebook-pro/overlay.nix b/pine64/pinebook-pro/overlay.nix index 9cc4f50..d540d72 100644 --- a/pine64/pinebook-pro/overlay.nix +++ b/pine64/pinebook-pro/overlay.nix @@ -5,7 +5,7 @@ let kernels = callPackage ./kernel { }; in { - pinebookpro-manjaro-kernel = kernels.manjaro-kernel; + pinebookpro-unstable-manjaro-kernel = kernels.manjaro-kernel; pinebookpro-ap6256-firmware = callPackage ./firmware/ap6256-firmware { }; pinebookpro-keyboard-updater = callPackage ./keyboard-updater { }; }