summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-03-25 11:29:57 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-03-25 11:30:03 -0700
commit4d47c0dd24e9a47f66d350daa2c7666483ff3209 (patch)
tree09e084734ff5de9724e48cfd58cf69d20e364c17 /pkgs/os-specific/linux/kernel
parenta040e15a48fe5c4e1f8ad7f50cfbc321044857e3 (diff)
downloadnixlib-4d47c0dd24e9a47f66d350daa2c7666483ff3209.tar
nixlib-4d47c0dd24e9a47f66d350daa2c7666483ff3209.tar.gz
nixlib-4d47c0dd24e9a47f66d350daa2c7666483ff3209.tar.bz2
nixlib-4d47c0dd24e9a47f66d350daa2c7666483ff3209.tar.lz
nixlib-4d47c0dd24e9a47f66d350daa2c7666483ff3209.tar.xz
nixlib-4d47c0dd24e9a47f66d350daa2c7666483ff3209.tar.zst
nixlib-4d47c0dd24e9a47f66d350daa2c7666483ff3209.zip
kernel-config: Add microcode support + early loading on new kernels
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index e6d45af7c599..f2d510828113 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -222,6 +222,16 @@ with stdenv.lib;
   SECURITY_APPARMOR y
   DEFAULT_SECURITY_APPARMOR y
 
+  # Microcode loading support
+  MICROCODE y
+  MICROCODE_INTEL y
+  MICROCODE_AMD y
+  ${optionalString (versionAtLeast version "3.11") ''
+    MICROCODE_EARLY y
+    MICROCODE_INTEL_EARLY y
+    MICROCODE_AMD_EARLY y
+  ''}
+
   # Misc. options.
   8139TOO_8129 y
   8139TOO_PIO n # PIO is slower
@@ -264,7 +274,6 @@ with stdenv.lib;
   LOGO n # not needed
   MEDIA_ATTACH y
   MEGARAID_NEWGEN y
-  MICROCODE_AMD y
   MODVERSIONS y
   MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
   MTRR_SANITIZER y