diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2022-03-23 16:11:09 -0600 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2022-03-23 21:23:14 -0600 |
| commit | 11e697c3d7f8da7f11165ff85a8db633c8724c1e (patch) | |
| tree | f79b3d66d653417666fa25ba4df7319dcd50a6c5 /pkgs/os-specific | |
| parent | cc8456effe723a6489b6f89fdafa7e877245742d (diff) | |
| download | nixlib-11e697c3d7f8da7f11165ff85a8db633c8724c1e.tar nixlib-11e697c3d7f8da7f11165ff85a8db633c8724c1e.tar.gz nixlib-11e697c3d7f8da7f11165ff85a8db633c8724c1e.tar.bz2 nixlib-11e697c3d7f8da7f11165ff85a8db633c8724c1e.tar.lz nixlib-11e697c3d7f8da7f11165ff85a8db633c8724c1e.tar.xz nixlib-11e697c3d7f8da7f11165ff85a8db633c8724c1e.tar.zst nixlib-11e697c3d7f8da7f11165ff85a8db633c8724c1e.zip | |
linux: common-config cleanup older options
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2b065151f4ae..3856a223e2c0 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -269,8 +269,6 @@ let DRM_GMA600 = whenOlder "5.13" yes; DRM_GMA3600 = whenOlder "5.12" yes; DRM_VMWGFX_FBCON = yes; - # necessary for amdgpu polaris support - DRM_AMD_POWERPLAY = whenBetween "4.5" "4.9" yes; # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets @@ -383,7 +381,7 @@ let EXT4_FS_POSIX_ACL = yes; EXT4_FS_SECURITY = yes; - EXT4_ENCRYPTION = { optional = true; tristate = if (versionOlder version "4.8") then "m" else "y"; }; + EXT4_ENCRYPTION = option yes; REISERFS_FS_XATTR = option yes; REISERFS_FS_POSIX_ACL = option yes; @@ -461,7 +459,7 @@ let # https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html DEBUG_LIST = yes; # Detect writes to read-only module pages - DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; }; + DEBUG_SET_MODULE_RONX = whenOlder "4.11" (option yes); RANDOMIZE_BASE = option yes; STRICT_DEVMEM = mkDefault yes; # Filter access to /dev/mem IO_STRICT_DEVMEM = mkDefault yes; @@ -560,8 +558,8 @@ let PARAVIRT_SPINLOCKS = option yes; KVM_ASYNC_PF = yes; - KVM_COMPAT = { optional = true; tristate = whenBetween "4.0" "4.12" "y"; }; - KVM_DEVICE_ASSIGNMENT = { optional = true; tristate = whenBetween "3.10" "4.12" "y"; }; + KVM_COMPAT = whenOlder "4.12" (option yes); + KVM_DEVICE_ASSIGNMENT = whenOlder "4.12" (option yes); KVM_GENERIC_DIRTYLOG_READ_PROTECT = yes; KVM_GUEST = yes; KVM_MMIO = yes; @@ -769,7 +767,6 @@ let AIC79XX_DEBUG_ENABLE = no; AIC7XXX_DEBUG_ENABLE = no; AIC94XX_DEBUG = no; - B43_PCMCIA = { optional=true; tristate = whenOlder "4.4" "y";}; BLK_DEV_INTEGRITY = yes; |