From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 17 Mar 2014 11:41:25 +0000 (+0800)
Subject: ARM: rockchip: fix some build error when some configs no selected
X-Git-Tag: firefly_0821_release~6045
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7ed7f0ae15493883d1f8b1fafa348e1c6f9bde4b;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip: fix some build error when some configs no selected
---

diff --git a/arch/arm/mach-rockchip/common.c b/arch/arm/mach-rockchip/common.c
index a9fea3dab329..74736af56976 100755
--- a/arch/arm/mach-rockchip/common.c
+++ b/arch/arm/mach-rockchip/common.c
@@ -270,7 +270,9 @@ extern int __init rockchip_ion_find_reserve_mem(unsigned long node,
 				const char *uname, int depth, void *data);
 void __init rockchip_ion_reserve(void)
 {
+#ifdef CONFIG_ION_ROCKCHIP
 	printk("%s\n", __func__);
 	of_scan_flat_dt(rockchip_ion_find_reserve_mem, NULL);
+#endif
 }
 
diff --git a/arch/arm/mach-rockchip/rk3188.c b/arch/arm/mach-rockchip/rk3188.c
index 042686335074..c7992ef594e6 100755
--- a/arch/arm/mach-rockchip/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188.c
@@ -315,7 +315,9 @@ DT_MACHINE_START(RK3188_DT, "RK30board")
 	.map_io		= rk3188_dt_map_io,
 	.init_time	= rk3188_dt_init_timer,
 	.dt_compat	= rk3188_dt_compat,
+#ifdef CONFIG_PM
 	.init_late	= rockchip_suspend_init,
+#endif
 	.reserve	= rk3188_reserve,
 	.restart	= rk3188_restart,
 MACHINE_END
@@ -370,6 +372,7 @@ static int __init rk3188_ddr_init(void)
 }
 arch_initcall_sync(rk3188_ddr_init);
 
+#ifdef CONFIG_PM
 #include "pm-rk3188.c"
-
+#endif
 
diff --git a/arch/arm/mach-rockchip/rk3288.c b/arch/arm/mach-rockchip/rk3288.c
index 052ebe2daf5b..aa1d37692e09 100755
--- a/arch/arm/mach-rockchip/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288.c
@@ -90,8 +90,6 @@ static void __init rk3288_boot_mode_init(void)
 	rockchip_boot_mode_init(flag, mode);
 }
 
-extern void secondary_startup(void);
-
 static void usb_uart_init(void)
 {
     u32 soc_status2;
@@ -107,6 +105,8 @@ static void usb_uart_init(void)
 #endif // end of CONFIG_RK_USB_UART
 }
 
+extern void secondary_startup(void);
+
 static void __init rk3288_dt_map_io(void)
 {
 	iotable_init(rk3288_io_desc, ARRAY_SIZE(rk3288_io_desc));
@@ -117,9 +117,11 @@ static void __init rk3288_dt_map_io(void)
 	/* rkpwm is used instead of old pwm */
 	//writel_relaxed(0x00010001, RK_GRF_VIRT + RK3288_GRF_SOC_CON2);
 
+#ifdef CONFIG_SMP
 	/* enable fast boot */
 	writel_relaxed(0x01000100, RK_SGRF_VIRT + RK3288_SGRF_SOC_CON0);
 	writel_relaxed(virt_to_phys(secondary_startup), RK_SGRF_VIRT + RK3288_SGRF_FAST_BOOT_ADDR);
+#endif
 
 	rk3288_boot_mode_init();
 }
@@ -343,7 +345,9 @@ DT_MACHINE_START(RK3288_DT, "RK30board")
 	.map_io		= rk3288_dt_map_io,
 	.init_time	= rk3288_dt_init_timer,
 	.dt_compat	= rk3288_dt_compat,
+#ifdef CONFIG_PM
 	.init_late	= rockchip_suspend_init,
+#endif
 	.reserve	= rk3288_reserve,
 	.restart	= rk3288_restart,
 MACHINE_END