From: Mugunthan V N Date: Thu, 24 Dec 2015 10:38:04 +0000 (+0530) Subject: arm: omap-common: do not build timer when CONFIG_TIMER defined X-Git-Tag: v2016.03-rc1~243^2~67 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=28a6c01187d30f0e7b7dbe6e4e198e76ce6246f1;p=u-boot 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 Reviewed-by: Tom Rini --- 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),)