From df8450fa268551003c0b29abc455cd9a5c494d9d Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 2 Nov 2024 10:40:15 -0400 Subject: [PATCH] microsoft/surface: Remove old kernel version --- microsoft/surface/common/kernel/default.nix | 3 +- .../common/kernel/linux-6.10.x/default.nix | 31 ---- .../common/kernel/linux-6.10.x/patches.nix | 148 ------------------ .../default.nix | 0 .../patches.nix | 0 5 files changed, 1 insertion(+), 181 deletions(-) delete mode 100644 microsoft/surface/common/kernel/linux-6.10.x/default.nix delete mode 100644 microsoft/surface/common/kernel/linux-6.10.x/patches.nix rename microsoft/surface/common/kernel/{linux-6.11.x => linux-surface}/default.nix (100%) rename microsoft/surface/common/kernel/{linux-6.11.x => linux-surface}/patches.nix (100%) diff --git a/microsoft/surface/common/kernel/default.nix b/microsoft/surface/common/kernel/default.nix index 441b624..490ecd0 100644 --- a/microsoft/surface/common/kernel/default.nix +++ b/microsoft/surface/common/kernel/default.nix @@ -5,8 +5,7 @@ let in { imports = [ - ./linux-6.10.x - ./linux-6.11.x + ./linux-surface ]; options.microsoft-surface.kernelVersion = mkOption { diff --git a/microsoft/surface/common/kernel/linux-6.10.x/default.nix b/microsoft/surface/common/kernel/linux-6.10.x/default.nix deleted file mode 100644 index 484e162..0000000 --- a/microsoft/surface/common/kernel/linux-6.10.x/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - inherit (lib) mkIf mkOption; - - inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage surfacePatches isVersionOf versionsOfEnum; - - cfg = config.microsoft-surface; - - version = "6.10.5"; - kernelPatches = surfacePatches { - inherit version; - patchFn = ./patches.nix; - }; - kernelPackages = linuxPackage { - inherit version kernelPatches; - sha256 = "02yckkh6sxvcrwzbqgmw4jhqhxmbvz87xn9wm6bwwka3w2r9x41h"; - ignoreConfigErrors=true; - }; - -in { - options.microsoft-surface.kernelVersion = mkOption { - type = versionsOfEnum version; - }; - - config = mkIf (isVersionOf cfg.kernelVersion version) { - boot = { - inherit kernelPackages; - }; - }; -} diff --git a/microsoft/surface/common/kernel/linux-6.10.x/patches.nix b/microsoft/surface/common/kernel/linux-6.10.x/patches.nix deleted file mode 100644 index 9590b9e..0000000 --- a/microsoft/surface/common/kernel/linux-6.10.x/patches.nix +++ /dev/null @@ -1,148 +0,0 @@ -{ lib, - kernel ? lib.kernel, - patchSrc, - version, -}: - -[ - { - name = "microsoft-surface-patches-linux-${version}"; - patch = null; - extraStructuredConfig = with kernel; { - STAGING_MEDIA = yes; - - # - # Surface Aggregator Module - # - SURFACE_AGGREGATOR = module; - # SURFACE_AGGREGATOR_ERROR_INJECTION is not set - SURFACE_AGGREGATOR_BUS = yes; - SURFACE_AGGREGATOR_CDEV = module; - SURFACE_AGGREGATOR_HUB = module; - SURFACE_AGGREGATOR_REGISTRY = module; - SURFACE_AGGREGATOR_TABLET_SWITCH = 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 Hotplug - ## - SURFACE_HOTPLUG = module; - - ## - ## IPTS and ITHC touchscreen - ## - ## This only enables the user interface for IPTS/ITHC data. - ## For the touchscreen to work, you need to install iptsd. - ## - HID_IPTS = module; - HID_ITHC = module; - - ## - ## Cameras: IPU3 - ## - VIDEO_DW9719 = module; - VIDEO_IPU3_IMGU = module; - VIDEO_IPU3_CIO2 = module; - IPU_BRIDGE = module; - INTEL_SKL_INT3472 = module; - REGULATOR_TPS68470 = module; - COMMON_CLK_TPS68470 = module; - LEDS_TPS68470 = module; - - ## - ## Cameras: Sensor drivers - ## - VIDEO_OV5693 = module; - VIDEO_OV7251 = module; - VIDEO_OV8865 = module; - - ## - ## Surface 3: atomisp causes problems (see issue #1095). Disable it for now. - ## - # INTEL_ATOMISP is not set - - ## - ## ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7 - ## - APDS9960 = module; - - ## - ## Other Drivers - ## - INPUT_SOC_BUTTON_ARRAY = module; - SURFACE_3_POWER_OPREGION = module; - SURFACE_PRO3_BUTTON = module; - SURFACE_GPE = module; - SURFACE_BOOK1_DGPU_SWITCH = module; - }; - } - { - name = "ms-surface/0001-secureboot"; - patch = patchSrc + "/0001-secureboot.patch"; - } - { - name = "ms-surface/0002-surface3-oemb"; - patch = patchSrc + "/0002-surface3-oemb.patch"; - } - { - name = "ms-surface/0003-mwifiex"; - patch = patchSrc + "/0003-mwifiex.patch"; - } - { - name = "ms-surface/0004-ath10k"; - patch = patchSrc + "/0004-ath10k.patch"; - } - { - name = "ms-surface/0005-ipts"; - patch = patchSrc + "/0005-ipts.patch"; - } - { - name = "ms-surface/0006-ithc"; - patch = patchSrc + "/0006-ithc.patch"; - } - { - name = "ms-surface/0007-surface-sam"; - patch = patchSrc + "/0007-surface-sam.patch"; - } - { - name = "ms-surface/0008-surface-sam-over-hid"; - patch = patchSrc + "/0008-surface-sam-over-hid.patch"; - } - { - name = "ms-surface/0009-surface-button"; - patch = patchSrc + "/0009-surface-button.patch"; - } - { - name = "ms-surface/0010-surface-typecover"; - patch = patchSrc + "/0010-surface-typecover.patch"; - } - { - name = "ms-surface/0011-surface-shutdown"; - patch = patchSrc + "/0011-surface-shutdown.patch"; - } - { - name = "ms-surface/0012-surface-gpe"; - patch = patchSrc + "/0012-surface-gpe.patch"; - } - { - name = "ms-surface/0013-cameras"; - patch = patchSrc + "/0013-cameras.patch"; - } - { - name = "ms-surface/0014-amd-gpio"; - patch = patchSrc + "/0014-amd-gpio.patch"; - } - { - name = "ms-surface/0015-rtc"; - patch = patchSrc + "/0015-rtc.patch"; - } -] diff --git a/microsoft/surface/common/kernel/linux-6.11.x/default.nix b/microsoft/surface/common/kernel/linux-surface/default.nix similarity index 100% rename from microsoft/surface/common/kernel/linux-6.11.x/default.nix rename to microsoft/surface/common/kernel/linux-surface/default.nix diff --git a/microsoft/surface/common/kernel/linux-6.11.x/patches.nix b/microsoft/surface/common/kernel/linux-surface/patches.nix similarity index 100% rename from microsoft/surface/common/kernel/linux-6.11.x/patches.nix rename to microsoft/surface/common/kernel/linux-surface/patches.nix