summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap-common
diff options
context:
space:
mode:
authorMugunthan V N <mugunthanvnm@ti.com>2015-12-24 16:08:04 +0530
committerSimon Glass <sjg@chromium.org>2016-01-20 19:06:21 -0700
commit28a6c01187d30f0e7b7dbe6e4e198e76ce6246f1 (patch)
treea41e030c999f891b88baf6235b39542f2fc715b3 /arch/arm/cpu/armv7/omap-common
parentc275dfefebb95c1ffdca630a65055a850b83adc7 (diff)
downloadtalos-obmc-uboot-28a6c01187d30f0e7b7dbe6e4e198e76ce6246f1.tar.gz
talos-obmc-uboot-28a6c01187d30f0e7b7dbe6e4e198e76ce6246f1.zip
arm: omap-common: do not build timer when CONFIG_TIMER defined
To prepare timer driver to DM/DT conversion do not build the exiting timer driver when CONFIG_TIMER is defined. But since omap's SPL doesn't support DM yet so built timer driver only for SPL build when CONFIG_TIMER is defined. Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common')
-rw-r--r--arch/arm/cpu/armv7/omap-common/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 464a5d1d73..87a7ac03f9 100644
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -6,7 +6,13 @@
#
obj-y := reset.o
+ifeq ($(CONFIG_TIMER),)
obj-y += timer.o
+else
+ifdef CONFIG_SPL_BUILD
+obj-y += timer.o
+endif
+endif
obj-y += utils.o
ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
OpenPOWER on IntegriCloud