rk30: add early printk

diff --git a/arch/arm/mach-rk30/Makefile b/arch/arm/mach-rk30/Makefile
index e58b689aebf41bda381fedefe4962a8551235b9f..b629368edd25819cf8536ffe6ebe5c2440b56d61 100644 (file)
--- 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 3ec0c2d558b7a0993d17cb5978c0bd7c31b1c613..0fe7be5a7be0650812af536f4036363a7b255b60 100755 (executable)
--- a/arch/arm/mach-rk30/common.c
+++ b/arch/arm/mach-rk30/common.c
@@ -10,6 +10,8 @@
 #include <mach/gpio.h>
 #include <mach/iomux.h>
 
+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,