From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 16 May 2019 10:03:54 +0000 (+0300)
Subject: spl: sata: fix build with DM_SCSI
X-Git-Tag: v2019.10-rc1~33^2~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ab2d415e9bbab64431e6475fbb5a5c62303f8163;p=oweals%2Fu-boot.git

spl: sata: fix build with DM_SCSI

The init_sata() routine is only present when DM_SCSI is not enabled.
Don't call init_sata() when DM_SCSI is enabled. The code will fall back
to scsi_scan() in this case.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>
---

diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index b08efc8419..2fb46108a5 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -28,10 +28,12 @@
 static int spl_sata_load_image(struct spl_image_info *spl_image,
 			       struct spl_boot_device *bootdev)
 {
-	int err;
+	int err = 0;
 	struct blk_desc *stor_dev;
 
+#if !defined(CONFIG_DM_SCSI) && !defined(CONFIG_AHCI)
 	err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
+#endif
 	if (err) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
 		printf("spl: sata init failed: err - %d\n", err);