summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2022-01-28 23:33:38 +0100
committerGitHub <noreply@github.com>2022-01-28 23:33:38 +0100
commit6432cd1045babb9065b5a78d380c3d30d1f464d6 (patch)
tree113a51bde397a256e82c4a52eec3ac47e56d73b4
parentMerge pull request #157117 from NixOS/backport-157000-to-release-21.11 (diff)
parentlinux: enable FSL_MC_UAPI_SUPPORT (diff)
downloadnixpkgs-6432cd1045babb9065b5a78d380c3d30d1f464d6.tar.gz
Merge pull request #156307 from lheckemann/fsl-mc-uapi-21.11
[21.11] linux: enable FSL_MC_UAPI_SUPPORT
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index a22974c734ba..4030a78c70eb 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -883,6 +883,7 @@ let
ANDROID_BINDERFS = { optional = true; tristate = whenAtLeast "5.0" "y";};
ANDROID_BINDER_DEVICES = { optional = true; freeform = whenAtLeast "5.0" "binder,hwbinder,vndbinder";};
+ FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes);
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Enable CPU/memory hotplug support
# Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot