* [U-Boot] [PATCH] rockchip: Exclude rk_timer for ARM64
@ 2016-07-14 4:22 Andreas Färber
2016-07-15 3:20 ` Simon Glass
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Färber @ 2016-07-14 4:22 UTC (permalink / raw)
To: u-boot
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/
--
2.6.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] rockchip: Exclude rk_timer for ARM64
2016-07-14 4:22 [U-Boot] [PATCH] rockchip: Exclude rk_timer for ARM64 Andreas Färber
@ 2016-07-15 3:20 ` Simon Glass
2016-07-15 3:56 ` Simon Glass
0 siblings, 1 reply; 3+ messages in thread
From: Simon Glass @ 2016-07-15 3:20 UTC (permalink / raw)
To: u-boot
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] rockchip: Exclude rk_timer for ARM64
2016-07-15 3:20 ` Simon Glass
@ 2016-07-15 3:56 ` Simon Glass
0 siblings, 0 replies; 3+ messages in thread
From: Simon Glass @ 2016-07-15 3:56 UTC (permalink / raw)
To: u-boot
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-15 3:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-14 4:22 [U-Boot] [PATCH] rockchip: Exclude rk_timer for ARM64 Andreas Färber
2016-07-15 3:20 ` Simon Glass
2016-07-15 3:56 ` Simon Glass
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.