diff options
Diffstat (limited to 'common/spl/spl_sata.c')
| -rw-r--r-- | common/spl/spl_sata.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 1f3a144cdf..1351d78612 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -21,10 +21,6 @@ #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION 1 #endif -#ifndef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#endif - #ifndef CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR /* Dummy value to make the compiler happy */ #define CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR 0x100 @@ -73,21 +69,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() || |