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

Commit 1ea7c673 authored by Alan Cox's avatar Alan Cox Committed by Ingo Molnar
Browse files

x86/config: Revamp configuration for MID devices 



This follows on from the patch applied in 3.2rc1 which creates
an INTEL_MID configuration. We can now add the entry for
Medfield specific code. After this is merged the final patch
will be submitted which moves the rest of the device Kconfig
dependancies to MRST/MEDFIELD/INTEL_MID as appropriate.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 54b0264e

arch/x86/Kconfig

+17 −0
Original line number Original line Diff line number Diff line
@@ -419,6 +419,23 @@ config X86_MRST 
	  nor standard legacy replacement devices/features. e.g. Moorestown does

	  nor standard legacy replacement devices/features. e.g. Moorestown does

	  not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.

	  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

endif





config X86_RDC321X

config X86_RDC321X

arch/x86/Kconfig.debug

+3 −3
Original line number Original line Diff line number Diff line
@@ -43,9 +43,9 @@ config EARLY_PRINTK 
	  with klogd/syslogd or the X server. You should normally N here,

	  with klogd/syslogd or the X server. You should normally N here,

	  unless you want to debug such a crash.

	  unless you want to debug such a crash.





config EARLY_PRINTK_MRST

config EARLY_PRINTK_INTEL_MID

	bool "Early printk for MRST platform support"

	bool "Early printk for Intel MID platform support"

	depends on EARLY_PRINTK && X86_MRST

	depends on EARLY_PRINTK && X86_INTEL_MID





config EARLY_PRINTK_DBGP

config EARLY_PRINTK_DBGP

	bool "Early printk via EHCI debug port"

	bool "Early printk via EHCI debug port"

arch/x86/kernel/early_printk.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -240,7 +240,7 @@ static int __init setup_early_printk(char *buf) 
		if (!strncmp(buf, "xen", 3))

		if (!strncmp(buf, "xen", 3))

			early_console_register(&xenboot_console, keep);

			early_console_register(&xenboot_console, keep);

#endif

#endif

#ifdef CONFIG_EARLY_PRINTK_MRST

#ifdef CONFIG_EARLY_PRINTK_INTEL_MID

		if (!strncmp(buf, "mrst", 4)) {

		if (!strncmp(buf, "mrst", 4)) {

			mrst_early_console_init();

			mrst_early_console_init();

			early_console_register(&early_mrst_console, keep);

			early_console_register(&early_mrst_console, keep);

arch/x86/platform/mrst/Makefile

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

obj-$(CONFIG_X86_MRST)		+= mrst.o

obj-$(CONFIG_X86_MRST)		+= vrtc.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
 
obj-$(CONFIG_X86_MRST)		+= pmu.o