1 files changed, 55 insertions, 11 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index efb42949cc09..6c14ecd851d0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -26,6 +26,8 @@ config X86
         select HAVE_IOREMAP_PROT
         select HAVE_KPROBES
         select HAVE_MEMBLOCK
+        select HAVE_MEMBLOCK_NODE_MAP
+        select ARCH_DISCARD_MEMBLOCK
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARCH_WANT_FRAME_POINTERS
         select HAVE_DMA_ATTRS
@@ -58,8 +60,12 @@ config X86
         select PERF_EVENTS
         select HAVE_PERF_EVENTS_NMI
         select ANON_INODES
+        select HAVE_ALIGNED_STRUCT_PAGE if SLUB && !M386
+        select HAVE_CMPXCHG_LOCAL if !M386
+        select HAVE_CMPXCHG_DOUBLE
         select HAVE_ARCH_KMEMCHECK
         select HAVE_USER_RETURN_NOTIFIER
+        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
         select HAVE_ARCH_JUMP_LABEL
         select HAVE_TEXT_POKE_SMP
         select HAVE_GENERIC_HARDIRQS
@@ -75,6 +81,7 @@ config X86
         select HAVE_BPF_JIT if (X86_64 && NET)
         select CLKEVT_I8253
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
+        select GENERIC_IOMAP
 
 config INSTRUCTION_DECODER
         def_bool (KPROBES || PERF_EVENTS)
@@ -140,9 +147,6 @@ config NEED_SG_DMA_LENGTH
 config GENERIC_ISA_DMA
         def_bool ISA_DMA_API
 
-config GENERIC_IOMAP
-        def_bool y
-
 config GENERIC_BUG
         def_bool y
         depends on BUG
@@ -204,9 +208,6 @@ config ZONE_DMA32
         bool
         default X86_64
 
-config ARCH_POPULATES_NODE_MAP
-        def_bool y
-
 config AUDIT_ARCH
         bool
         default X86_64
@@ -343,6 +344,7 @@ config X86_EXTENDED_PLATFORM
 
           If you enable this option then you'll be able to select support
           for the following (non-PC) 64 bit x86 platforms:
+                Numascale NumaChip
                 ScaleMP vSMP
                 SGI Ultraviolet
 
@@ -351,6 +353,18 @@ config X86_EXTENDED_PLATFORM
 endif
 # This is an alphabetically sorted list of 64 bit extended platforms
 # Please maintain the alphabetic order if and when there are additions
+config X86_NUMACHIP
+        bool "Numascale NumaChip"
+        depends on X86_64
+        depends on X86_EXTENDED_PLATFORM
+        depends on NUMA
+        depends on SMP
+        depends on X86_X2APIC
+        depends on !EDAC_AMD64
+        ---help---
+          Adds support for Numascale NumaChip large-SMP systems. Needed to
+          enable more than ~168 cores.
+          If you don't have one of these, you should say N here.
 
 config X86_VSMP
         bool "ScaleMP vSMP"
@@ -409,12 +423,14 @@ config X86_MRST
         depends on PCI
         depends on PCI_GOANY
         depends on X86_IO_APIC
+        select X86_INTEL_MID
+        select SFI
+        select DW_APB_TIMER
         select APB_TIMER
         select I2C
         select SPI
         select INTEL_SCU_IPC
         select X86_PLATFORM_DEVICES
-        select X86_INTEL_MID
         ---help---
           Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
           Internet Device(MID) platform. Moorestown consists of two chips:
@@ -423,6 +439,26 @@ config X86_MRST
           nor standard legacy replacement devices/features. e.g. Moorestown does
           not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.
 
+config X86_MDFLD
+       bool "Medfield MID platform"
+        depends on PCI
+        depends on PCI_GOANY
+        depends on X86_IO_APIC
+        select X86_INTEL_MID
+        select SFI
+        select DW_APB_TIMER
+        select APB_TIMER
+        select I2C
+        select SPI
+        select INTEL_SCU_IPC
+        select X86_PLATFORM_DEVICES
+        ---help---
+          Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin
+          Internet Device(MID) platform. 
+          Unlike standard x86 PCs, Medfield does not have many legacy devices
+          nor standard legacy replacement devices/features. e.g. Medfield does
+          not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.
+
 endif
 
 config X86_RDC321X
@@ -620,7 +656,7 @@ config X86_SUMMIT_NUMA
 
 config X86_CYCLONE_TIMER
         def_bool y
-        depends on X86_32_NON_STANDARD
+        depends on X86_SUMMIT
 
 source "arch/x86/Kconfig.cpu"
 
@@ -648,9 +684,10 @@ config HPET_EMULATE_RTC
         depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)
 
 config APB_TIMER
-       def_bool y if MRST
-       prompt "Langwell APB Timer Support" if X86_MRST
+       def_bool y if X86_INTEL_MID
+       prompt "Intel MID APB Timer Support" if X86_INTEL_MID
        select DW_APB_TIMER
+       depends on X86_INTEL_MID && SFI
        help
          APB timer is the replacement for 8254, HPET on X86 MID platforms.
          The APBT provides a stable time base on SMP
@@ -1478,6 +1515,13 @@ config EFI
           resultant kernel should continue to boot on existing non-EFI
           platforms.
 
+config EFI_STUB
+       bool "EFI stub support"
+       depends on EFI
+       ---help---
+          This kernel feature allows a bzImage to be loaded directly
+          by EFI firmware without the use of a bootloader.
+
 config SECCOMP
         def_bool y
         prompt "Enable seccomp to safely compute untrusted bytecode"
@@ -1730,7 +1774,7 @@ source "drivers/sfi/Kconfig"
 
 config X86_APM_BOOT
         def_bool y
-        depends on APM || APM_MODULE
+        depends on APM
 
 menuconfig APM
         tristate "APM (Advanced Power Management) BIOS support"