diff options
-rw-r--r-- | arch/x86/Kconfig | 3 | ||||
-rw-r--r-- | arch/x86/kernel/head64.c | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 258965d56beb..07459a6b417d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -495,11 +495,10 @@ config X86_INTEL_CE | |||
495 | 495 | ||
496 | config X86_INTEL_MID | 496 | config X86_INTEL_MID |
497 | bool "Intel MID platform support" | 497 | bool "Intel MID platform support" |
498 | depends on X86_32 | ||
499 | depends on X86_EXTENDED_PLATFORM | 498 | depends on X86_EXTENDED_PLATFORM |
500 | depends on X86_PLATFORM_DEVICES | 499 | depends on X86_PLATFORM_DEVICES |
501 | depends on PCI | 500 | depends on PCI |
502 | depends on PCI_GOANY | 501 | depends on X86_64 || (PCI_GOANY && X86_32) |
503 | depends on X86_IO_APIC | 502 | depends on X86_IO_APIC |
504 | select SFI | 503 | select SFI |
505 | select I2C | 504 | select I2C |
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index f129a9af6357..2c0f3407bd1f 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c | |||
@@ -192,5 +192,13 @@ void __init x86_64_start_reservations(char *real_mode_data) | |||
192 | 192 | ||
193 | reserve_ebda_region(); | 193 | reserve_ebda_region(); |
194 | 194 | ||
195 | switch (boot_params.hdr.hardware_subarch) { | ||
196 | case X86_SUBARCH_INTEL_MID: | ||
197 | x86_intel_mid_early_setup(); | ||
198 | break; | ||
199 | default: | ||
200 | break; | ||
201 | } | ||
202 | |||
195 | start_kernel(); | 203 | start_kernel(); |
196 | } | 204 | } |