diff options
author | Alan Cox <alan@linux.intel.com> | 2011-07-12 12:49:29 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-07-21 04:35:14 -0400 |
commit | 43605ef188cd39708ddc5e3adc47b337b6ebe40e (patch) | |
tree | a5c9ec0c95e3c5d5a50b44cd926aaf99f856a9a6 /arch/x86/Kconfig | |
parent | cf6ace16a3cd8b728fb0afa68368fd40bbeae19f (diff) |
x86, config: Introduce an INTEL_MID configuration
We need to carve up the configuration between:
- MID general
- Moorestown specific
- Medfield specific
- Future devices
As a base point create an INTEL_MID configuration property. We
make the existing MRST configuration a sub-option. This means
that the rest of the kernel config can still use X86_MRST checks
without anything going backwards.
After this is merged future patches will tidy up which devices
are MID and which are X86_MRST, as well as add options for
Medfield.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Link: http://lkml.kernel.org/r/20110712164859.7642.84136.stgit@bob.linux.org.uk
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 37357a599dca..80ef4196d3bf 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -384,12 +384,21 @@ config X86_INTEL_CE | |||
384 | This option compiles in support for the CE4100 SOC for settop | 384 | This option compiles in support for the CE4100 SOC for settop |
385 | boxes and media devices. | 385 | boxes and media devices. |
386 | 386 | ||
387 | config X86_INTEL_MID | ||
388 | bool "Intel MID platform support" | ||
389 | depends on X86_32 | ||
390 | depends on X86_EXTENDED_PLATFORM | ||
391 | ---help--- | ||
392 | Select to build a kernel capable of supporting Intel MID platform | ||
393 | systems which do not have the PCI legacy interfaces (Moorestown, | ||
394 | Medfield). If you are building for a PC class system say N here. | ||
395 | |||
396 | if X86_INTEL_MID | ||
397 | |||
387 | config X86_MRST | 398 | config X86_MRST |
388 | bool "Moorestown MID platform" | 399 | bool "Moorestown MID platform" |
389 | depends on PCI | 400 | depends on PCI |
390 | depends on PCI_GOANY | 401 | depends on PCI_GOANY |
391 | depends on X86_32 | ||
392 | depends on X86_EXTENDED_PLATFORM | ||
393 | depends on X86_IO_APIC | 402 | depends on X86_IO_APIC |
394 | select APB_TIMER | 403 | select APB_TIMER |
395 | select I2C | 404 | select I2C |
@@ -404,6 +413,8 @@ config X86_MRST | |||
404 | nor standard legacy replacement devices/features. e.g. Moorestown does | 413 | nor standard legacy replacement devices/features. e.g. Moorestown does |
405 | not contain i8259, i8254, HPET, legacy BIOS, most of the io ports. | 414 | not contain i8259, i8254, HPET, legacy BIOS, most of the io ports. |
406 | 415 | ||
416 | endif | ||
417 | |||
407 | config X86_RDC321X | 418 | config X86_RDC321X |
408 | bool "RDC R-321x SoC" | 419 | bool "RDC R-321x SoC" |
409 | depends on X86_32 | 420 | depends on X86_32 |