Merge git://git.denx.de/u-boot-imx

[oweals/u-boot.git] / arch / arm / mach-omap2 / Makefile

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index e814eb008e44308db39468d926302d14ee2d48de..d86643db34a7afa308785ec32504a9553431eba8 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -20,6 +20,7 @@ endif
 endif
 obj-y  += utils.o
 
+obj-y  += sysinfo-common.o
 ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
 obj-y  += hwinit-common.o
 obj-y  += clocks-common.o
@@ -29,9 +30,11 @@ obj-y        += abb.o
 endif
 
 ifneq ($(CONFIG_OMAP54XX),)
+ifeq ($(CONFIG_DM_SCSI),)
 obj-y  += pipe3-phy.o
 obj-$(CONFIG_SCSI_AHCI_PLAT) += sata.o
 endif
+endif
 
 ifeq ($(CONFIG_SYS_DCACHE_OFF),)
 obj-y  += omap-cache.o
@@ -42,4 +45,6 @@ obj-y += lowlevel_init.o
 
 obj-y  += mem-common.o
 
+obj-y  += fdt-common.o
+
 obj-$(CONFIG_TI_SECURE_DEVICE) += sec-common.o