From: Andreas Färber <afaerber@suse.de>
Date: Thu, 14 Jul 2016 04:22:09 +0000 (+0200)
Subject: rockchip: Exclude rk_timer for ARM64
X-Git-Tag: v2016.09-rc2~202
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ad8fe6b96432d17aca224167338c68dc2f0cf2ae;p=oweals%2Fu-boot.git

rockchip: Exclude rk_timer for ARM64

It conflicts with the generic_timer.

Cc: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
index c08d61bb11..6763af4214 100644
--- a/arch/arm/mach-rockchip/Makefile
+++ b/arch/arm/mach-rockchip/Makefile
@@ -11,6 +11,8 @@ obj-$(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) += save_boot_param.o
 else
 obj-$(CONFIG_ROCKCHIP_RK3288) += board.o
 endif
+ifndef CONFIG_ARM64
 obj-y += rk_timer.o
+endif
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288/
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/