b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #86168 from lblasc/sof-firmware

Browse source 
Sound Open Firmware support, sof-firmware: init at 1.4.2, update kernel config
This commit is contained in:
Florian Klink 2020-04-29 12:36:53 +02:00 committed by GitHub
parent fbc63c4a7b 6fc9fd53db
commit f046de4210
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/hardware/all-firmware.nix
View file

@ -51,6 +51,7 @@ in {
rtlwifi_new-firmware
zd1211fw
alsa-firmware
sof-firmware
openelec-dvb-firmware
] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [

28
pkgs/os-specific/linux/firmware/sof-firmware/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "sof-firmware";
version = "1.4.2";
src = fetchurl {
url = "https://www.alsa-project.org/files/pub/misc/sof/${pname}-${version}.tar.bz2";
sha256 = "1nkh020gjm45vxd6fvmz63hj16ilff2nl5avvsklajjs6xci1sf5";
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
rm lib/firmware/intel/{sof/LICENCE,sof-tplg/LICENCE}
mkdir $out
cp -r lib $out/lib
'';
meta = with stdenv.lib; {
description = "Sound Open Firmware";
homepage = "https://www.sofproject.org/";
license = with licenses; [ bsd3 isc ];
maintainers = with maintainers; [ lblasc ];
platforms = with platforms; linux;
};
}

21
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -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 = {

2
pkgs/top-level/all-packages.nix
View file

@ -6639,6 +6639,8 @@ in
python = python3;
};
sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { };
softhsm = callPackage ../tools/security/softhsm {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Security;