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 --- common/spl/spl_sata.c | 20 +++++--------------- include/configs/imx6_spl.h | 1 - 2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 1f3a144cdfbf..d03f86344e05 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 234aacb3b914..7215bda973ff 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