projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5f30bf7
)
rockchip: Exclude rk_timer for ARM64
author
Andreas Färber
<afaerber@suse.de>
Thu, 14 Jul 2016 04:22:09 +0000
(06:22 +0200)
committer
Simon Glass
<sjg@chromium.org>
Tue, 26 Jul 2016 02:44:19 +0000
(20:44 -0600)
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>
arch/arm/mach-rockchip/Makefile
patch
|
blob
|
history
diff --git
a/arch/arm/mach-rockchip/Makefile
b/arch/arm/mach-rockchip/Makefile
index c08d61bb1182c8870ebc9c01924a64a0f6da4260..6763af4214c37a51929c1be182d5f1ef4b086e32 100644
(file)
--- 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/