X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=arch%2Farm%2Fmach-rockchip%2FMakefile;h=d8a0484b97aa8edfb7f15f6795271f4a50fb402c;hb=5013a8fe9733d7906daf046cd164bb2028a63fea;hp=1c5d87f3f4d845e71c71a30646cbd9683efe758f;hpb=08b84034cce0da0bc6ce7390d71cbd56e664857c;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 1c5d87f3f4d8..d8a0484b97aa
--- a/arch/arm/mach-rockchip/Makefile
+++ b/arch/arm/mach-rockchip/Makefile
@@ -5,11 +5,15 @@ 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
+endif
 obj-y += efuse.o
 obj-y += pvtm.o
 obj-y += rk_system_status.o
-obj-$(CONFIG_PM) += rockchip_pm.o sleep.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