diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-04-15 16:55:51 +0200 |
---|---|---|
committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-04-15 16:55:51 +0200 |
commit | 469b5b99ba3aa3e3c66d8381508196bc96c18f89 (patch) | |
tree | 4d0500cc3dc77d2a9e375dc0376d0a689363c857 /arch/x86/Kconfig | |
parent | 640eca2901f3435e616157b11379d3223a44b391 (diff) | |
parent | b40108b826ed9e1c558f73b9dbabb8d80ded268b (diff) |
Merge tag 'v4.4.7' into linux-4.4.y-rt
This is the 4.4.7 stable release
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d8a1650a0f67..6ee1dd0deadc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1130,22 +1130,23 @@ config MICROCODE bool "CPU microcode loading support" default y depends on CPU_SUP_AMD || CPU_SUP_INTEL - depends on BLK_DEV_INITRD select FW_LOADER ---help--- - If you say Y here, you will be able to update the microcode on - certain Intel and AMD processors. The Intel support is for the - IA32 family, e.g. Pentium Pro, Pentium II, Pentium III, Pentium 4, - Xeon etc. The AMD support is for families 0x10 and later. You will - obviously need the actual microcode binary data itself which is not - shipped with the Linux kernel. - - This option selects the general module only, you need to select - at least one vendor specific module as well. - - To compile this driver as a module, choose M here: the module - will be called microcode. + Intel and AMD processors. The Intel support is for the IA32 family, + e.g. Pentium Pro, Pentium II, Pentium III, Pentium 4, Xeon etc. The + AMD support is for families 0x10 and later. You will obviously need + the actual microcode binary data itself which is not shipped with + the Linux kernel. + + The preferred method to load microcode from a detached initrd is described + in Documentation/x86/early-microcode.txt. For that you need to enable + CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the + initrd for microcode blobs. + + In addition, you can build-in the microcode into the kernel. For that you + need to enable FIRMWARE_IN_KERNEL and add the vendor-supplied microcode + to the CONFIG_EXTRA_FIRMWARE config option. config MICROCODE_INTEL bool "Intel microcode loading support" |