From bd17dc47068f10ee794da890092c5db5e265594e Mon Sep 17 00:00:00 2001 From: mexisme Date: Tue, 10 Jan 2023 15:22:06 +1300 Subject: [PATCH] Move files around... - "kernel" and "repos.nix" --> "common/" - "firmware/surface-go/ath10k" --> "surface-go/firmware/ath10k" - Update where "kernel", "firmware/surface-go" and "repos.nix" can be found --- microsoft/surface/common/default.nix | 7 ++ .../surface/{ => common}/kernel/default.nix | 0 .../kernel/linux-5.19.17/default.nix | 0 .../kernel/linux-5.19.17/patches.nix | 0 .../kernel/linux-6.0.11/default.nix | 0 .../{ => common}/kernel/linux-package.nix | 0 microsoft/surface/{ => common}/repos.nix | 0 microsoft/surface/default.nix | 4 +- .../surface/kernel/linux-6.0.11/patches.nix | 118 ------------------ .../firmware}/ath10k/ath10k-replace.nix | 2 +- .../firmware}/ath10k/default.nix | 0 11 files changed, 10 insertions(+), 121 deletions(-) create mode 100644 microsoft/surface/common/default.nix rename microsoft/surface/{ => common}/kernel/default.nix (100%) rename microsoft/surface/{ => common}/kernel/linux-5.19.17/default.nix (100%) rename microsoft/surface/{ => common}/kernel/linux-5.19.17/patches.nix (100%) rename microsoft/surface/{ => common}/kernel/linux-6.0.11/default.nix (100%) rename microsoft/surface/{ => common}/kernel/linux-package.nix (100%) rename microsoft/surface/{ => common}/repos.nix (100%) delete mode 100644 microsoft/surface/kernel/linux-6.0.11/patches.nix rename microsoft/surface/{firmware/surface-go => surface-go/firmware}/ath10k/ath10k-replace.nix (93%) rename microsoft/surface/{firmware/surface-go => surface-go/firmware}/ath10k/default.nix (100%) diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix new file mode 100644 index 0000000..d7e1cfa --- /dev/null +++ b/microsoft/surface/common/default.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + imports = [ + ./kernel + ]; +} diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/common/kernel/default.nix similarity index 100% rename from microsoft/surface/kernel/default.nix rename to microsoft/surface/common/kernel/default.nix diff --git a/microsoft/surface/kernel/linux-5.19.17/default.nix b/microsoft/surface/common/kernel/linux-5.19.17/default.nix similarity index 100% rename from microsoft/surface/kernel/linux-5.19.17/default.nix rename to microsoft/surface/common/kernel/linux-5.19.17/default.nix diff --git a/microsoft/surface/kernel/linux-5.19.17/patches.nix b/microsoft/surface/common/kernel/linux-5.19.17/patches.nix similarity index 100% rename from microsoft/surface/kernel/linux-5.19.17/patches.nix rename to microsoft/surface/common/kernel/linux-5.19.17/patches.nix diff --git a/microsoft/surface/kernel/linux-6.0.11/default.nix b/microsoft/surface/common/kernel/linux-6.0.11/default.nix similarity index 100% rename from microsoft/surface/kernel/linux-6.0.11/default.nix rename to microsoft/surface/common/kernel/linux-6.0.11/default.nix diff --git a/microsoft/surface/kernel/linux-package.nix b/microsoft/surface/common/kernel/linux-package.nix similarity index 100% rename from microsoft/surface/kernel/linux-package.nix rename to microsoft/surface/common/kernel/linux-package.nix diff --git a/microsoft/surface/repos.nix b/microsoft/surface/common/repos.nix similarity index 100% rename from microsoft/surface/repos.nix rename to microsoft/surface/common/repos.nix diff --git a/microsoft/surface/default.nix b/microsoft/surface/default.nix index 2952dae..795262b 100644 --- a/microsoft/surface/default.nix +++ b/microsoft/surface/default.nix @@ -5,8 +5,8 @@ let in { imports = [ - ./kernel - ./firmware/surface-go/ath10k + ./common + ./surface-go/firmware/ath10k ]; microsoft-surface.kernelVersion = mkDefault "6.0.11"; diff --git a/microsoft/surface/kernel/linux-6.0.11/patches.nix b/microsoft/surface/kernel/linux-6.0.11/patches.nix deleted file mode 100644 index e111c26..0000000 --- a/microsoft/surface/kernel/linux-6.0.11/patches.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ kernel, - patchDir, - version, -}: - -[ - { - name = "microsoft-surface-patches-linux-${version}"; - patch = null; - structuredExtraConfig = with kernel; { - # - # Surface Aggregator Module - # - CONFIG_SURFACE_AGGREGATOR = module; - CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION = no; - CONFIG_SURFACE_AGGREGATOR_BUS = yes; - CONFIG_SURFACE_AGGREGATOR_CDEV = module; - CONFIG_SURFACE_AGGREGATOR_HUB = module; - CONFIG_SURFACE_AGGREGATOR_REGISTRY = module; - CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH = module; - - CONFIG_SURFACE_ACPI_NOTIFY = module; - CONFIG_SURFACE_DTX = module; - CONFIG_SURFACE_PLATFORM_PROFILE = module; - - CONFIG_SURFACE_HID = module; - CONFIG_SURFACE_KBD = module; - - CONFIG_BATTERY_SURFACE = module; - CONFIG_CHARGER_SURFACE = module; - - # - # Surface Hotplug - # - CONFIG_SURFACE_HOTPLUG = module; - - # - # IPTS touchscreen - # - # This only enables the user interface for IPTS data. - # For the touchscreen to work, you need to install iptsd. - # - CONFIG_MISC_IPTS = module; - - # - # Cameras: IPU3 - # - CONFIG_VIDEO_DW9719 = module; - CONFIG_VIDEO_IPU3_IMGU = module; - CONFIG_VIDEO_IPU3_CIO2 = module; - CONFIG_CIO2_BRIDGE = yes; - CONFIG_INTEL_SKL_INT3472 = module; - CONFIG_REGULATOR_TPS68470 = module; - CONFIG_COMMON_CLK_TPS68470 = module; - - # - # Cameras: Sensor drivers - # - CONFIG_VIDEO_OV5693 = module; - CONFIG_VIDEO_OV7251 = module; - CONFIG_VIDEO_OV8865 = module; - - # - # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7 - # - CONFIG_APDS9960 = module; - - # - # Other Drivers - # - CONFIG_INPUT_SOC_BUTTON_ARRAY = module; - CONFIG_SURFACE_3_POWER_OPREGION = module; - CONFIG_SURFACE_PRO3_BUTTON = module; - CONFIG_SURFACE_GPE = module; - CONFIG_SURFACE_BOOK1_DGPU_SWITCH = module; - }; - } - { - name = "ms-surface/0001-surface3-oemb"; - patch = patchDir + "/0001-surface3-oemb.patch"; - } - { - name = "ms-surface/0002-mwifiex"; - patch = patchDir + "/0002-mwifiex.patch"; - } - { - name = "ms-surface/0003-ath10k"; - patch = patchDir + "/0003-ath10k.patch"; - } - { - name = "ms-surface/0004-ipts"; - patch = patchDir + "/0004-ipts.patch"; - } - { - name = "ms-surface/0005-surface-sam"; - patch = patchDir + "/0005-surface-sam.patch"; - } - { - name = "ms-surface/0006-surface-sam-over-hid"; - patch = patchDir + "/0006-surface-sam-over-hid.patch"; - } - { - name = "ms-surface/0007-surface-button"; - patch = patchDir + "/0007-surface-button.patch"; - } - { - name = "ms-surface/0008-surface-typecover"; - patch = patchDir + "/0008-surface-typecover.patch"; - } - { - name = "ms-surface/0009-cameras"; - patch = patchDir + "/0009-cameras.patch"; - } - # { - # name = "ms-surface/0010-amd-gpio"; - # patch = patchDir + "/0010-amd-gpio.patch"; - # } -] diff --git a/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix b/microsoft/surface/surface-go/firmware/ath10k/ath10k-replace.nix similarity index 93% rename from microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix rename to microsoft/surface/surface-go/firmware/ath10k/ath10k-replace.nix index e6b84e1..6cc55fa 100644 --- a/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix +++ b/microsoft/surface/surface-go/firmware/ath10k/ath10k-replace.nix @@ -1,7 +1,7 @@ { stdenv, lib, pkgs, firmwareLinuxNonfree, ... }: let - repos = pkgs.callPackage ../../../repos.nix {}; + repos = pkgs.callPackage ../../../common/repos.nix {}; killernetworking_firmware = repos.surface-go-ath10k-firmware_backup + "/K1535_Debian"; in stdenv.mkDerivation { diff --git a/microsoft/surface/firmware/surface-go/ath10k/default.nix b/microsoft/surface/surface-go/firmware/ath10k/default.nix similarity index 100% rename from microsoft/surface/firmware/surface-go/ath10k/default.nix rename to microsoft/surface/surface-go/firmware/ath10k/default.nix