Skip to contentSkip to conversation

x86/intel config: Fix the APB_TIMER selection

tip:x86/platform tip-bot for Alan Cox 1 participant 1 message Dec 30, 2011 x86

lore
Share & tools
lore
#0 lore raw
Commit-ID:  7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda
Gitweb:     http://git.kernel.org/tip/7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda
Author:     Alan Cox <[email protected]>
AuthorDate: Thu, 29 Dec 2011 14:43:16 +0000
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 29 Dec 2011 21:53:17 +0100

x86/intel config: Fix the APB_TIMER selection

Seems Kconfig SELECT isn't selecting things hierarchically when selected.

config APB_TIMER
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

when we select APB_TIMER doesn't select DW_APB_TIMER so do it by hand.

---
 arch/x86/Kconfig |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
arch/x86/Kconfig +6 -2
index 07620bc..78fbb34 100644
@@ -409,12 +409,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:
@@ -428,12 +430,14 @@ config X86_MDFLD
 	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---
 	  Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin
 	  Internet Device(MID) platform.