diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-05-06 08:12:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-05-06 08:20:05 +0200 |
| commit | 54eb2d10184124a8bd6cc01ff815c30aa8aebf35 (patch) | |
| tree | 2152ad58471446689a35e1466ef865baac1f8964 /pkgs/os-specific/linux/kernel | |
| parent | ee8cde8d1cc4faea6502ffac90af20bfe86328a2 (diff) | |
| parent | 1906fc5bd10a7bbab35136325fa3251a043361b2 (diff) | |
| download | nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.gz nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.bz2 nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.lz nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.xz nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.zst nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.zip | |
Merge branch 'staging-next'
Status on Hydra for linuxes seems good enough: https://hydra.nixos.org/eval/1585703?filter=linux&compare=1585482&full=#tabs-now-fail
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 21 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 6 |
2 files changed, 24 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e254891b0017..636d174b1551 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -254,6 +254,27 @@ let SND_USB_CAIAQ_INPUT = yes; # Enable PSS mixer (Beethoven ADSP-16 and other compatible) PSS_MIXER = whenOlder "4.12" yes; + # Enable Sound Open Firmware support + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" && + versionAtLeast version "5.5") { + SND_SOC_SOF_TOPLEVEL = yes; + SND_SOC_SOF_ACPI = module; + SND_SOC_SOF_PCI = module; + SND_SOC_SOF_APOLLOLAKE_SUPPORT = yes; + SND_SOC_SOF_CANNONLAKE_SUPPORT = yes; + SND_SOC_SOF_COFFEELAKE_SUPPORT = yes; + SND_SOC_SOF_COMETLAKE_H_SUPPORT = yes; + SND_SOC_SOF_COMETLAKE_LP_SUPPORT = yes; + SND_SOC_SOF_ELKHARTLAKE_SUPPORT = yes; + SND_SOC_SOF_GEMINILAKE_SUPPORT = yes; + SND_SOC_SOF_HDA_AUDIO_CODEC = yes; + SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = yes; + SND_SOC_SOF_HDA_LINK = yes; + SND_SOC_SOF_ICELAKE_SUPPORT = yes; + SND_SOC_SOF_INTEL_TOPLEVEL = yes; + SND_SOC_SOF_JASPERLAKE_SUPPORT = yes; + SND_SOC_SOF_MERRIFIELD_SUPPORT = yes; + SND_SOC_SOF_TIGERLAKE_SUPPORT = yes; }; usb-serial = { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 71505840b869..d73e0a8ac909 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,6 +1,6 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio -, utillinux +, utillinuxMinimal , writeTextFile }: @@ -281,7 +281,7 @@ let in assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; -assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null; +assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { pname = "linux"; inherit version; @@ -292,7 +292,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux + ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ; |