Merge branch 'marex@denx.de' of git://git.denx.de/u-boot-staging

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

diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 07087964e6acc0d8c1f883ae2fad2e3a0e01f3e3..447fcd5eff12316e97a0162dab2ac6038b0e1924 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -29,9 +29,38 @@ SOBJS        := reset.o
 
 COBJS  := timer.o
 COBJS  += utils.o
+ifdef CONFIG_OMAP
+COBJS  += gpio.o
+endif
+
+ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
+COBJS  += hwinit-common.o
+COBJS  += clocks-common.o
+COBJS  += emif-common.o
+endif
+
+ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
+COBJS  += boot-common.o
+SOBJS  += lowlevel_init.o
+endif
 
 ifdef CONFIG_SPL_BUILD
 COBJS  += spl.o
+ifdef CONFIG_SPL_NAND_SUPPORT
+COBJS  += spl_nand.o
+endif
+ifdef CONFIG_SPL_MMC_SUPPORT
+COBJS  += spl_mmc.o
+endif
+ifdef CONFIG_SPL_YMODEM_SUPPORT
+COBJS  += spl_ymodem.o
+endif
+endif
+
+ifndef CONFIG_SPL_BUILD
+ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
+COBJS  += mem-common.o
+endif
 endif
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)