X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=arch%2Farm%2Fmach-rockchip%2FMakefile;h=d8a0484b97aa8edfb7f15f6795271f4a50fb402c;hb=5013a8fe9733d7906daf046cd164bb2028a63fea;hp=ce6bf257f39828128813167aea8ceb7474072a97;hpb=0ffd56dafe02b40ec2a7a61e8c74b0061add0677;p=firefly-linux-kernel-4.4.55.git

diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
old mode 100755
new mode 100644
index ce6bf257f398..d8a0484b97aa
--- a/arch/arm/mach-rockchip/Makefile
+++ b/arch/arm/mach-rockchip/Makefile
@@ -1,9 +1,19 @@
 obj-y += common.o
 obj-y += cpu.o
+obj-y += rk3036.o
+obj-y += rk312x.o
+obj-y += rk3126b.o
 obj-y += rk3188.o
 obj-y += rk3288.o
+obj-y += rk3228.o
+obj-$(CONFIG_ARM_PSCI) += psci.o
+ifneq ($(CONFIG_ARM_TRUSTZONE),y)
 obj-y += ddr_freq.o
-obj-$(CONFIG_PM) += pm.o sleep.o
+endif
+obj-y += efuse.o
+obj-y += pvtm.o
+obj-y += rk_system_status.o
+obj-$(CONFIG_PM) += rockchip_pm.o sleep.o rk312x_sleep.o
 obj-$(CONFIG_RK_FPGA) += fpga.o
 obj-$(CONFIG_CPU_IDLE) += cpuidle.o
 obj-$(CONFIG_SMP) += platsmp.o
@@ -12,7 +22,8 @@ obj-$(CONFIG_FIQ_DEBUGGER) += rk_fiq_debugger.o
 obj-$(CONFIG_RK_LAST_LOG) += last_log.o
 obj-$(CONFIG_DVFS) += dvfs.o
 obj-$(CONFIG_RK_VCODEC) += vcodec_service.o
-obj-$(CONFIG_RK_VPU) += vpu_service.o
 obj-$(CONFIG_RK_PL330_DMA_TEST) += dma_memcpy_test.o
 obj-$(CONFIG_BLOCK_RKNAND) += rknandbase.o
+obj-$(CONFIG_DDR_TEST) += ddr_test.o
 obj-$(CONFIG_RK_PM_TESTS) += rk_pm_tests/
+obj-$(CONFIG_ROCK_CHIP_SOC_CAMERA) += rk_camera.o