[U-Boot] [PATCH] rockchip: Exclude rk_timer for ARM64

Andreas Färber afaerber at suse.de
Thu Jul 14 06:22:09 CEST 2016


It conflicts with the generic_timer.

Cc: Kever Yang <kever.yang at rock-chips.com>
Signed-off-by: Andreas Färber <afaerber at suse.de>
---
 arch/arm/mach-rockchip/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
index 55567cb..b8046bc 100644
--- a/arch/arm/mach-rockchip/Makefile
+++ b/arch/arm/mach-rockchip/Makefile
@@ -10,6 +10,8 @@ obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.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/
-- 
2.6.6



More information about the U-Boot mailing list