From: Tom Rini <trini@konsulko.com>
Date: Fri, 13 May 2022 17:37:30 +0000 (-0400)
Subject: spl: Remove CONFIG_SPL_SATA_BOOT_DEVICE
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=d498c670541a010899b25f9653713a804575606e;p=u-boot.git

spl: Remove CONFIG_SPL_SATA_BOOT_DEVICE

This is only referenced in non-SPL_DM cases, of which there are
currently none.  Remove this option and slightly re-organize the code is
there is now never an if/else at the start of spl_sata_load_image()

Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 1f3a144cdf..d03f86344e 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -73,21 +73,11 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,
 	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);
-#endif
-		return err;
-	} else {
-		/* try to recognize storage devices immediately */
-		scsi_scan(false);
-		stor_dev = blk_get_devnum_by_type(IF_TYPE_SCSI, 0);
-		if (!stor_dev)
-			return -ENODEV;
-	}
+	/* try to recognize storage devices immediately */
+	scsi_scan(false);
+	stor_dev = blk_get_devnum_by_type(IF_TYPE_SCSI, 0);
+	if (!stor_dev)
+		return -ENODEV;
 
 #if CONFIG_IS_ENABLED(OS_BOOT)
 	if (spl_start_uboot() ||
diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
index 234aacb3b9..7215bda973 100644
--- a/include/configs/imx6_spl.h
+++ b/include/configs/imx6_spl.h
@@ -60,7 +60,6 @@
 
 /* SATA support */
 #if defined(CONFIG_SPL_SATA)
-#define CONFIG_SPL_SATA_BOOT_DEVICE		0
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1
 #endif