From: Jean-Jacques Hiblot <jjhiblot@ti.com>
Date: Fri, 7 Apr 2017 11:42:01 +0000 (+0200)
Subject: arm: omap: sata: compile out board-level sata code when CONFIG_DM_SCSI is defined
X-Git-Tag: v2017.05-rc2~2^2~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fd138ca1bddc803ff1ec0da63e2c215668fecaeb;p=u-boot

arm: omap: sata: compile out board-level sata code when CONFIG_DM_SCSI is defined

When CONFIG_DM_SCSI is defined, the SATA initialization will be implemented
in the scsi-uclass driver.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index e814eb008e..aa3986dddb 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -29,9 +29,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