From bf4c36af777a4c254f93d8ed66a624e9600afa84 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Tue, 7 Feb 2012 18:46:54 +0800 Subject: [PATCH] rk30: add early printk --- arch/arm/mach-rk30/Makefile | 4 ++++ arch/arm/mach-rk30/common.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-rk30/Makefile b/arch/arm/mach-rk30/Makefile index e58b689aebf4..b629368edd25 100644 --- a/arch/arm/mach-rk30/Makefile +++ b/arch/arm/mach-rk30/Makefile @@ -5,5 +5,9 @@ obj-y += io.o obj-y += iomux.o obj-y += reset.o obj-y += timer.o +obj-y += ../mach-rk29/early_printk.o +ifndef CONFIG_DEBUG_LL +obj-y += ../kernel/debug.o +endif obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o obj-$(CONFIG_MACH_RK30_SDK) += board-rk30-sdk.o diff --git a/arch/arm/mach-rk30/common.c b/arch/arm/mach-rk30/common.c index 3ec0c2d558b7..0fe7be5a7be0 100755 --- a/arch/arm/mach-rk30/common.c +++ b/arch/arm/mach-rk30/common.c @@ -10,6 +10,8 @@ #include #include +extern void __init rk29_setup_early_printk(void); + void __init rk30_init_irq(void) { gic_init(0, IRQ_LOCALTIMER, RK30_GICD_BASE, RK30_GICC_BASE); @@ -19,7 +21,8 @@ void __init rk30_init_irq(void) void __init rk30_map_io(void) { rk30_map_common_io(); - rk30_iomux_init(); + rk29_setup_early_printk(); + rk30_iomux_init(); } void __init rk30_fixup(struct machine_desc *desc, struct tag *tags, -- 2.34.1