Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 933b9463 authored by Alan Cox's avatar Alan Cox Committed by Ingo Molnar
Browse files

x86/intel config: Revamp configuration to allow for Moorestown and Medfield 



This sets all up the other bits that need to be INTEL_MID
specific rather than Moorestown specific.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Link: http://lkml.kernel.org/r/20111217174318.7207.91543.stgit@bob.linux.org.uk


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c95aaeff

arch/x86/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -662,8 +662,8 @@ 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

arch/x86/include/asm/fixmap.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ enum fixed_addresses { 
#endif

	FIX_TEXT_POKE1,	/* reserve 2 pages for text_poke() */

	FIX_TEXT_POKE0, /* first page is last, because allocation is backward */

#ifdef	CONFIG_X86_MRST

#ifdef	CONFIG_X86_INTEL_MID

	FIX_LNW_VRTC,

#endif

	__end_of_permanent_fixed_addresses,

arch/x86/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ extern void reserve_standard_io_resources(void); 
extern void i386_reserve_resources(void);

extern void setup_default_timer_irq(void);



#ifdef CONFIG_X86_MRST

#ifdef CONFIG_X86_INTEL_MID

extern void x86_mrst_early_setup(void);

#else

static inline void x86_mrst_early_setup(void) { }

arch/x86/pci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ obj-$(CONFIG_X86_VISWS) += visws.o 


obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o



obj-$(CONFIG_X86_MRST)		+= mrst.o

obj-$(CONFIG_X86_INTEL_MID)	+= mrst.o



obj-y				+= common.o early.o

obj-y				+= amd_bus.o bus_numa.o

arch/x86/platform/mrst/Makefile

+2 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_X86_MRST)		+= mrst.o

obj-$(CONFIG_X86_MRST)		+= vrtc.o

obj-$(CONFIG_X86_INTEL_MID)	+= mrst.o

obj-$(CONFIG_X86_INTEL_MID)	+= vrtc.o

obj-$(CONFIG_EARLY_PRINTK_INTEL_MID)	+= early_printk_mrst.o

obj-$(CONFIG_X86_MRST)		+= pmu.o