colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spl: Remove CONFIG_SPL_SATA_BOOT_DEVICE

Browse Source 
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>
This commit is contained in:
Tom Rini
2022-05-13 13:37:30 -04:00
parent aa473e70ac
commit d498c67054
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/spl/spl_sata.c
View File

@@ -73,21 +73,11 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,
int err = 0; int err = 0;
struct blk_desc *stor_dev; struct blk_desc *stor_dev;
#if !defined(CONFIG_DM_SCSI) && !defined(CONFIG_AHCI) /* try to recognize storage devices immediately */
err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE); scsi_scan(false);
#endif stor_dev = blk_get_devnum_by_type(IF_TYPE_SCSI, 0);
if (err) { if (!stor_dev)
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT return -ENODEV;
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;
}
#if CONFIG_IS_ENABLED(OS_BOOT) #if CONFIG_IS_ENABLED(OS_BOOT)
if (spl_start_uboot() || if (spl_start_uboot() ||

1
include/configs/imx6_spl.h
View File

@@ -60,7 +60,6 @@
/* SATA support */ /* SATA support */
#if defined(CONFIG_SPL_SATA) #if defined(CONFIG_SPL_SATA)
#define CONFIG_SPL_SATA_BOOT_DEVICE 0
#define CONFIG_SYS_SATA_FAT_BOOT_PARTITION 1 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION 1
#endif #endif