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

Commit 991cfffa authored by Feng Tang's avatar Feng Tang Committed by Thomas Gleixner
Browse files

x86, earlyprintk: Move mrst early console to platform/ and fix a typo 



Move the code to arch/x86/platform/mrst/. Also fix a typo to use
the correct config option: ONFIG_EARLY_PRINTK_MRST

Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
Cc: alan@linux.intel.com
LKML-Reference: <1291348298-21263-1-git-send-email-feng.tang@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e4d2ebca

arch/x86/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o 
obj-$(CONFIG_KGDB)		+= kgdb.o

obj-$(CONFIG_VM86)		+= vm86_32.o

obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o

obj-$(CONFIG_EARLY_PRINTK_MRST)	+= early_printk_mrst.o



obj-$(CONFIG_HPET_TIMER) 	+= hpet.o

obj-$(CONFIG_APB_TIMER)		+= apb_timer.o

arch/x86/kernel/early_printk.c

+1 −2
Original line number Diff line number Diff line
@@ -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_X86_MRST_EARLY_PRINTK

#ifdef CONFIG_EARLY_PRINTK_MRST

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

			mrst_early_console_init();

			early_console_register(&early_mrst_console, keep);
@@ -250,7 +250,6 @@ static int __init setup_early_printk(char *buf) 
			hsu_early_console_init();

			early_console_register(&early_hsu_console, keep);

		}



#endif

		buf++;

	}

arch/x86/platform/mrst/Makefile

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

obj-$(CONFIG_X86_MRST)		+= vrtc.o

obj-$(CONFIG_EARLY_PRINTK_MRST)	+= early_printk_mrst.o