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

[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 ea2545dca8f530dffa9ce2842015be3b6bb91598..447fcd5eff12316e97a0162dab2ac6038b0e1924 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -33,10 +33,14 @@ ifdef CONFIG_OMAP
 COBJS  += gpio.o
 endif
 
-ifdef CONFIG_OMAP44XX
+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
 
@@ -48,10 +52,13 @@ 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
-ifdef CONFIG_OMAP44XX
+ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
 COBJS  += mem-common.o
 endif
 endif