Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9359d23e6a535b84230aad23713477e02896250b..d98b665e6536ad03552abcdd648d5fa02f69e60b 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1060,8 +1060,16 @@ config MICROCODE_INTEL_LIB
        depends on MICROCODE_INTEL
 
 config MICROCODE_INTEL_EARLY
+       def_bool n
+
+config MICROCODE_AMD_EARLY
+       def_bool n
+
+config MICROCODE_EARLY
        bool "Early load microcode"
-       depends on MICROCODE_INTEL && BLK_DEV_INITRD
+       depends on MICROCODE=y && BLK_DEV_INITRD
+       select MICROCODE_INTEL_EARLY if MICROCODE_INTEL
+       select MICROCODE_AMD_EARLY if MICROCODE_AMD
        default y
        help
          This option provides functionality to read additional microcode data
@@ -1069,10 +1077,6 @@ config MICROCODE_INTEL_EARLY
          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---
@@ -1727,7 +1731,7 @@ config PHYSICAL_ALIGN
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
-       depends on SMP && HOTPLUG
+       depends on SMP
        ---help---
          Say Y here to allow turning CPUs off and on. CPUs can be
          controlled through /sys/devices/system/cpu.
@@ -2267,6 +2271,7 @@ source "fs/Kconfig.binfmt"
 config IA32_EMULATION
        bool "IA32 Emulation"
        depends on X86_64
+       select BINFMT_ELF
        select COMPAT_BINFMT_ELF
        select HAVE_UID16
        ---help---