dm: pci: Support selected device/driver binding before relocation

[u-boot] / common / spl / spl_sata.c

diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 2e7adca0ca6d903da35f5966b2a0a6afc755954a..2a5eb2985721104e035be19a8ca7a696f813ae8c 100644 (file)
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -13,8 +13,8 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <sata.h>
+#include <scsi.h>
 #include <fat.h>
-#include <version.h>
 #include <image.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -32,6 +32,7 @@ void spl_sata_load_image(void)
                hang();
        } else {
                /* try to recognize storage devices immediately */
+               scsi_scan(0);
                stor_dev = scsi_get_dev(0);
        }
 
@@ -41,7 +42,7 @@ void spl_sata_load_image(void)
 #endif
        err = spl_load_image_fat(stor_dev,
                                CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
-                               CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+                               CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
        if (err) {
                puts("Error loading sata device\n");
                hang();