Merge branch 'master' of git://git.denx.de/u-boot-x86

[oweals/u-boot.git] / arch / arm / cpu / armv7 / omap3 / Makefile

diff --git a/arch/arm/cpu/armv7/omap3/Makefile b/arch/arm/cpu/armv7/omap3/Makefile
index 522bcd2325ed5535838ebcc943dec9656d6bede9..ac597be25aaebe8557057d86e7b8cd483ce0dade 100644 (file)
--- a/arch/arm/cpu/armv7/omap3/Makefile
+++ b/arch/arm/cpu/armv7/omap3/Makefile
@@ -29,10 +29,13 @@ SOBJS       := lowlevel_init.o
 
 COBJS  += board.o
 COBJS  += clock.o
-COBJS  += gpio.o
 COBJS  += mem.o
 COBJS  += sys_info.o
+ifdef CONFIG_SPL_BUILD
+COBJS-$(CONFIG_SPL_OMAP3_ID_NAND)      += spl_id_nand.o
+endif
 
+COBJS-$(CONFIG_DRIVER_TI_EMAC) += emac.o
 COBJS-$(CONFIG_EMIF4)  += emif4.o
 COBJS-$(CONFIG_SDRC)   += sdrc.o