tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Feng 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: Thomas Gleixner <tglx@linutronix.de>

authored by Feng Tang and committed by Thomas Gleixner 991cfffa e4d2ebca

+2 -3
unified split
-1
arch/x86/kernel/Makefile
··· 84 84 obj-$(CONFIG_KGDB) += kgdb.o 85 85 obj-$(CONFIG_VM86) += vm86_32.o 86 86 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 87 - obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o 88 87 89 88 obj-$(CONFIG_HPET_TIMER) += hpet.o 90 89 obj-$(CONFIG_APB_TIMER) += apb_timer.o
+1 -2
arch/x86/kernel/early_printk.c
··· 240 240 if (!strncmp(buf, "xen", 3)) 241 241 early_console_register(&xenboot_console, keep); 242 242 #endif 243 - #ifdef CONFIG_X86_MRST_EARLY_PRINTK 243 + #ifdef CONFIG_EARLY_PRINTK_MRST 244 244 if (!strncmp(buf, "mrst", 4)) { 245 245 mrst_early_console_init(); 246 246 early_console_register(&early_mrst_console, keep); ··· 250 250 hsu_early_console_init(); 251 251 early_console_register(&early_hsu_console, keep); 252 252 } 253 - 254 253 #endif 255 254 buf++; 256 255 }
arch/x86/kernel/early_printk_mrst.c arch/x86/platform/mrst/early_printk_mrst.c
+1
arch/x86/platform/mrst/Makefile
··· 1 1 obj-$(CONFIG_X86_MRST) += mrst.o 2 2 obj-$(CONFIG_X86_MRST) += vrtc.o 3 + obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o