x86, intel-mid: Remove deprecated X86_MDFLD and X86_WANT_INTEL_MID configs

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

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0952ecd60ecaf7e8fcadb4360731ba22dea22c22..edcf80eda566be3ee56075acba1a42f5abd9a5fc 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -438,42 +438,26 @@ config X86_INTEL_CE
          This option compiles in support for the CE4100 SOC for settop
          boxes and media devices.
 
          This option compiles in support for the CE4100 SOC for settop
          boxes and media devices.
 

-config X86_WANT_INTEL_MID
+config X86_INTEL_MID

        bool "Intel MID platform support"
        depends on X86_32
        depends on X86_EXTENDED_PLATFORM
        bool "Intel MID platform support"
        depends on X86_32
        depends on X86_EXTENDED_PLATFORM

-       ---help---
-         Select to build a kernel capable of supporting Intel MID platform
-         systems which do not have the PCI legacy interfaces (Moorestown,
-         Medfield). If you are building for a PC class system say N here.
-
-if X86_WANT_INTEL_MID
-
-config X86_INTEL_MID
-       bool
-
-config X86_MDFLD
-       bool "Medfield MID platform"

        depends on PCI
        depends on PCI_GOANY
        depends on X86_IO_APIC
        depends on PCI
        depends on PCI_GOANY
        depends on X86_IO_APIC

-       select X86_INTEL_MID

        select SFI
        select SFI

+       select I2C

        select DW_APB_TIMER
        select APB_TIMER
        select DW_APB_TIMER
        select APB_TIMER

-       select I2C
-       select SPI

        select INTEL_SCU_IPC
        select INTEL_SCU_IPC

-       select X86_PLATFORM_DEVICES

        select MFD_INTEL_MSIC
        ---help---
        select MFD_INTEL_MSIC
        ---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.
+         Select to build a kernel capable of supporting Intel MID (Mobile
+         Internet Device) platform systems which do not have the PCI legacy
+         interfaces. If you are building for a PC class system say N here.

 
 

-endif
+         Intel MID platforms are based on an Intel processor and chipset which
+         consume less power than most of the x86 derivatives.

 
 config X86_INTEL_LPSS
        bool "Intel Low Power Subsystem Support"
 
 config X86_INTEL_LPSS
        bool "Intel Low Power Subsystem Support"