[U-Boot] [PATCH] 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 --- 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/
On 13 July 2016 at 22:22, Andreas Färber afaerber@suse.de wrote:
It conflicts with the generic_timer.
Cc: Kever Yang kever.yang@rock-chips.com Signed-off-by: Andreas Färber afaerber@suse.de
arch/arm/mach-rockchip/Makefile | 2 ++ 1 file changed, 2 insertions(+)
Acked-by: Simon Glass sjg@chromium.org
On 14 July 2016 at 21:20, Simon Glass sjg@chromium.org wrote:
On 13 July 2016 at 22:22, Andreas Färber afaerber@suse.de wrote:
It conflicts with the generic_timer.
Cc: Kever Yang kever.yang@rock-chips.com Signed-off-by: Andreas Färber afaerber@suse.de
arch/arm/mach-rockchip/Makefile | 2 ++ 1 file changed, 2 insertions(+)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-rockchip, thanks!
participants (2)
-
Andreas Färber -
Simon Glass