Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...

[~andy/linux] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 191c4e34722d17595ac849944802403a53a18a3e..b094816a7e0fb723a476060f69f4edd0a3af226e 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -342,6 +342,7 @@ config X86_EXTENDED_PLATFORM
 
          If you enable this option then you'll be able to select support
          for the following (non-PC) 32 bit x86 platforms:
 
          If you enable this option then you'll be able to select support
          for the following (non-PC) 32 bit x86 platforms:

+               Goldfish (Android emulator)

                AMD Elan
                NUMAQ (IBM/Sequent)
                RDC R-321x SoC
                AMD Elan
                NUMAQ (IBM/Sequent)
                RDC R-321x SoC


@@ -416,6 +417,7 @@ config X86_UV
 config X86_GOLDFISH
        bool "Goldfish (Virtual Platform)"
        depends on X86_32
 config X86_GOLDFISH
        bool "Goldfish (Virtual Platform)"
        depends on X86_32

+       depends on X86_EXTENDED_PLATFORM

        ---help---
         Enable support for the Goldfish virtual platform used primarily
         for Android development. Unless you are building for the Android
        ---help---
         Enable support for the Goldfish virtual platform used primarily
         for Android development. Unless you are building for the Android


@@ -1064,8 +1066,16 @@ config MICROCODE_INTEL_LIB
        depends on MICROCODE_INTEL
 
 config MICROCODE_INTEL_EARLY
        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"
        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
        default y
        help
          This option provides functionality to read additional microcode data


@@ -1073,10 +1083,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.
 
          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---
 config X86_MSR
        tristate "/dev/cpu/*/msr - Model-specific register support"
        ---help---


@@ -1731,7 +1737,7 @@ config PHYSICAL_ALIGN
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
 
 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.
        ---help---
          Say Y here to allow turning CPUs off and on. CPUs can be
          controlled through /sys/devices/system/cpu.


@@ -2271,6 +2277,7 @@ source "fs/Kconfig.binfmt"
 config IA32_EMULATION
        bool "IA32 Emulation"
        depends on X86_64
 config IA32_EMULATION
        bool "IA32 Emulation"
        depends on X86_64

+       select BINFMT_ELF

        select COMPAT_BINFMT_ELF
        select HAVE_UID16
        ---help---
        select COMPAT_BINFMT_ELF
        select HAVE_UID16
        ---help---