config: revamp configuration to allow for Moorestown and Medfield
Subsystems (3)
PATCH 1/1 config: revamp configuration to allow for Moorestown and Medfield
From: Alan Cox <[email protected]>
This sets all up the other bits tha need to be INTEL_MID specific rather than Moorestown specific.
Signed-off-by Alan Cox <[email protected]>
---
arch/x86/Kconfig | 4 ++-- arch/x86/include/asm/fixmap.h | 2 +- arch/x86/include/asm/setup.h | 2 +- arch/x86/pci/Makefile | 2 +- arch/x86/platform/mrst/Makefile | 4 ++-- drivers/rtc/Kconfig | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-)
arch/x86/Kconfig +2 -2
@@ -713,8 +713,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 help APB timer is the replacement for 8254, HPET on X86 MID platforms.
arch/x86/include/asm/fixmap.h +1 -1
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@ -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
drivers/rtc/Kconfig +3 -3
@@ -498,9 +498,9 @@ config RTC_DRV_CMOS will be called rtc-cmos. config RTC_DRV_VRTC - tristate "Virtual RTC for Moorestown platforms" - depends on X86_MRST - default y if X86_MRST + tristate "Virtual RTC for Intel MID platforms" + depends on X86_INTEL_MID + default y if X86_INTEL_MID help Say "yes" here to get direct support for the real time clock
[tip:x86/platform] x86/intel config: Revamp configuration to allow for Moorestown and Medfield
Commit-ID: 933b9463a0ef75da681747b2dac06c1754465372 Gitweb: http://git.kernel.org/tip/933b9463a0ef75da681747b2dac06c1754465372 Author: Alan Cox <[email protected]> AuthorDate: Sat, 17 Dec 2011 17:43:40 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 18 Dec 2011 09:17:02 +0100
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 Alan Cox <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/Kconfig | 4 ++-- arch/x86/include/asm/fixmap.h | 2 +- arch/x86/include/asm/setup.h | 2 +- arch/x86/pci/Makefile | 2 +- arch/x86/platform/mrst/Makefile | 4 ++-- drivers/rtc/Kconfig | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-)
arch/x86/Kconfig +2 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@ -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
drivers/rtc/Kconfig +3 -3
@@ -498,9 +498,9 @@ config RTC_DRV_CMOS will be called rtc-cmos. config RTC_DRV_VRTC - tristate "Virtual RTC for Moorestown platforms" - depends on X86_MRST - default y if X86_MRST + tristate "Virtual RTC for Intel MID platforms" + depends on X86_INTEL_MID + default y if X86_INTEL_MID help Say "yes" here to get direct support for the real time clock