GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spl: sata: fix build with DM_SCSI

Browse source 
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>
This commit is contained in:
Baruch Siach 2019-05-16 13:03:54 +03:00 • committed by Stefan Roese
parent a4c61ffde3
commit ab2d415e9b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/spl/spl_sata.c
View file

@ -28,10 +28,12 @@
static int spl_sata_load_image(struct spl_image_info *spl_image, static int spl_sata_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
{ {
int err; int err = 0;
struct blk_desc *stor_dev; struct blk_desc *stor_dev;
#if !defined(CONFIG_DM_SCSI) && !defined(CONFIG_AHCI)
err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE); err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
#endif
if (err) { if (err) {
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
printf("spl: sata init failed: err - %d\n", err); printf("spl: sata init failed: err - %d\n", err);