Merge branch 'x86/microcode' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-beck.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ff0e5f3c844e352b7e0c505875c5c39c57790262..4ebc7a6e6724b3cbbd0a2d159a27cdab2a043181 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1054,6 +1054,24 @@ config MICROCODE_OLD_INTERFACE
        def_bool y
        depends on MICROCODE
 
+config MICROCODE_INTEL_LIB
+       def_bool y
+       depends on MICROCODE_INTEL
+
+config MICROCODE_INTEL_EARLY
+       bool "Early load microcode"
+       depends on MICROCODE_INTEL && BLK_DEV_INITRD
+       default y
+       help
+         This option provides functionality to read additional microcode data
+         at the beginning of initrd image. The data tells kernel to load
+         microcode to CPU's as early as possible. No functional change if no
+         microcode data is glued to the initrd, therefore it's safe to say Y.
+
+config MICROCODE_EARLY
+       def_bool y
+       depends on MICROCODE_INTEL_EARLY
+
 config X86_MSR
        tristate "/dev/cpu/*/msr - Model-specific register support"
        ---help---