config: build on the MRST/MID config change
Subsystems (5)
PATCH 1/2 config: build on the MRST/MID config change
From: Alan Cox <[email protected]>
We can now introduce the definitions for the Medfield platform and update the core bits accordingly.
Signed-off-by Alan Cox <[email protected]>
---
arch/x86/Kconfig | 17 +++++++++++++++++ arch/x86/Kconfig.debug | 6 +++--- arch/x86/kernel/early_printk.c | 2 +- arch/x86/platform/mrst/Makefile | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-)
arch/x86/Kconfig +17 -0
@@ -421,6 +421,23 @@ config X86_MRST nor standard legacy replacement devices/features. e.g. Moorestown does not contain i8259, i8254, HPET, legacy BIOS, most of the io ports. +config X86_MDFLD + bool "Medfield MID platform" + depends on PCI + depends on PCI_GOANY + depends on X86_IO_APIC + select APB_TIMER + select I2C + select SPI + select INTEL_SCU_IPC + select X86_PLATFORM_DEVICES + ---help--- + Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin + Internet Device(MID) platform. + Unlike standard x86 PCs, Medfield does not have many legacy devices + nor standard legacy replacement devices/features. e.g. Medfield does + not contain i8259, i8254, HPET, legacy BIOS, most of the io ports. + endif config X86_RDC321X
arch/x86/Kconfig.debug +3 -3
@@ -43,9 +43,9 @@ config EARLY_PRINTK with klogd/syslogd or the X server. You should normally N here, unless you want to debug such a crash. -config EARLY_PRINTK_MRST - bool "Early printk for MRST platform support" - depends on EARLY_PRINTK && X86_MRST +config EARLY_PRINTK_INTEL_MID + bool "Early printk for Intel MID platform support" + depends on EARLY_PRINTK && X86_INTEL_MID config EARLY_PRINTK_DBGP bool "Early printk via EHCI debug port"
arch/x86/kernel/early_printk.c +1 -1
@@ -240,7 +240,7 @@ static int __init setup_early_printk(char *buf)if (!strncmp (buf,"xen" ,3 ))early_console_register (&xenboot_console, keep);#endif -#ifdef CONFIG_EARLY_PRINTK_MRST +#ifdef CONFIG_EARLY_PRINTK_INTEL_MID if (!strncmp (buf,"mrst" ,4 )) {mrst_early_console_init ();early_console_register (&early_mrst_console, keep);
arch/x86/platform/mrst/Makefile +1 -1
@@ -1,4 +1,4 @@ obj-$(CONFIG_X86_MRST) += mrst.o obj-$(CONFIG_X86_MRST) += vrtc.o -obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o +obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_mrst.o obj-$(CONFIG_X86_MRST) += pmu.o
PATCH 2/2 config: Update device configurations for MID generic devices
From: Alan Cox <[email protected]>
Some of our support is not Moorestown specific. We can now use the new symbols to untangle this.
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/platform/x86/Kconfig | 2 +- drivers/rtc/Kconfig | 4 ++-- drivers/staging/gma500/mrst_lvds.c | 1 - 8 files changed, 10 insertions(+), 11 deletions(-)
arch/x86/Kconfig +2 -2
@@ -663,8 +663,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 platform 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/platform/x86/Kconfig +1 -1
@@ -637,7 +637,7 @@ config ACPI_CMPC config INTEL_SCU_IPC bool "Intel SCU IPC Support" - depends on X86_MRST + depends on X86_INTEL_MID default y ---help--- IPC is used to bridge the communications between kernel and SCU on
drivers/rtc/Kconfig +2 -2
@@ -499,8 +499,8 @@ config RTC_DRV_CMOS config RTC_DRV_VRTC tristate "Virtual RTC for Moorestown platforms" - depends on X86_MRST - default y if X86_MRST + depends on X86_INTEL_MID + default y if X86_INTEL_MID help Say "yes" here to get direct support for the real time clock
drivers/staging/gma500/mrst_lvds.c +0 -1
@@ -348,7 +348,6 @@ void mrst_lvds_init(struct drm_device *dev,*/ i2c_adap =i2c_get_adapter (dev_priv->ops->i2c_bus); -if (i2c_adap ==NULL )dev_err (dev->dev,"No ddc adapter available!\n" );/*