mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-09 12:17:12 +09:00
rk: move early_printk.c from mach-rk29 to plat-rk and add RK_EARLY_PRINTK config
This commit is contained in:
@@ -1,9 +1,5 @@
|
||||
obj-y += timer.o io.o devices.o iomux.o clock.o rk29-pl330.o dma.o ddr.o memcpy_dma.o reset.o
|
||||
obj-y += tests.o memtester.o
|
||||
obj-y += early_printk.o
|
||||
ifndef CONFIG_DEBUG_LL
|
||||
obj-y += ../kernel/debug.o
|
||||
endif
|
||||
obj-$(CONFIG_PM) += pm.o
|
||||
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
|
||||
obj-$(CONFIG_DDR_FREQ) += ddrfreq.o
|
||||
|
||||
@@ -6,9 +6,5 @@ obj-y += iomux.o
|
||||
obj-y += reset.o
|
||||
obj-y += timer.o
|
||||
obj-$(CONFIG_FIQ) += fiq.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 board-rk30-sdk-key.o
|
||||
|
||||
@@ -12,8 +12,6 @@
|
||||
#include <mach/iomux.h>
|
||||
#include <mach/fiq.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);
|
||||
|
||||
@@ -106,4 +106,12 @@ config RK29_LAST_LOG
|
||||
help
|
||||
It is only intended for debugging.
|
||||
|
||||
config RK_EARLY_PRINTK
|
||||
bool "Early printk"
|
||||
depends on PRINTK && !DEBUG_LL
|
||||
default y
|
||||
help
|
||||
Say Y here if you want to have an early console using the
|
||||
kernel low-level debugging functions.
|
||||
|
||||
endif
|
||||
|
||||
@@ -3,5 +3,6 @@ obj-$(CONFIG_USB_GADGET) += usb_detect.o
|
||||
obj-$(CONFIG_RK29_VPU) += vpu_service.o
|
||||
obj-$(CONFIG_ARCH_RK30) += dma-pl330.o
|
||||
obj-$(CONFIG_FIQ_DEBUGGER) += rk_fiq_debugger.o
|
||||
obj-$(CONFIG_RK_EARLY_PRINTK) += early_printk.o ../kernel/debug.o
|
||||
obj-y += mem_reserve.o
|
||||
obj-y += sram.o
|
||||
|
||||
@@ -93,6 +93,12 @@ int board_usb_detect_init(unsigned gpio);
|
||||
static int inline board_usb_detect_init(unsigned gpio) { return 0; }
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_RK_EARLY_PRINTK
|
||||
void __init rk29_setup_early_printk(void);
|
||||
#else
|
||||
static void inline rk29_setup_early_printk(void) {}
|
||||
#endif
|
||||
|
||||
/* for wakeup Android */
|
||||
void rk28_send_wakeup_key(void);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user