diff options
| author | Andreas Färber <afaerber@suse.de> | 2016-07-14 06:22:09 +0200 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-07-25 20:44:19 -0600 |
| commit | ad8fe6b96432d17aca224167338c68dc2f0cf2ae (patch) | |
| tree | 13294dd031ae3bb49ac41f436954261da3d1376d | |
| parent | 5f30bf764ba496ca9921d4242715dfd8d761f4cf (diff) | |
| download | u-boot-imx-ad8fe6b96432d17aca224167338c68dc2f0cf2ae.zip u-boot-imx-ad8fe6b96432d17aca224167338c68dc2f0cf2ae.tar.gz u-boot-imx-ad8fe6b96432d17aca224167338c68dc2f0cf2ae.tar.bz2 | |
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>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/arm/mach-rockchip/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index c08d61b..6763af4 100644 --- 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/ |