From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 14 Jul 2016 06:22:09 +0200 Subject: [U-Boot] [PATCH] rockchip: Exclude rk_timer for ARM64 Message-ID: <1468470130-12794-1-git-send-email-afaerber@suse.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de It conflicts with the generic_timer. Cc: Kever Yang Signed-off-by: Andreas F?rber --- 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