Merge branch 'master' of git://git.denx.de/u-boot-rockchip

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

diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 9d8cc7c2ddf7a75eb9da4c61f1ca38216277f153..bac11f64f13c21e037470503c88798c2b3b3abc0 100644 (file)
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -20,7 +20,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int spl_sata_load_image(void)
+static int spl_sata_load_image(struct spl_image_info *spl_image,
+                              struct spl_boot_device *bootdev)
 {
        int err;
        struct blk_desc *stor_dev;
@@ -33,19 +34,22 @@ int spl_sata_load_image(void)
                return err;
        } else {
                /* try to recognize storage devices immediately */
-               scsi_scan(0);
+               scsi_scan(false);
                stor_dev = blk_get_devnum_by_type(IF_TYPE_SCSI, 0);
                if (!stor_dev)
                        return -ENODEV;
        }
 
 #ifdef CONFIG_SPL_OS_BOOT
-       if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
-                                                                       CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
+       if (spl_start_uboot() ||
+           spl_load_image_fat_os(spl_image, stor_dev,
+                                 CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
 #endif
-       err = spl_load_image_fat(stor_dev,
-                               CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
+       {
+               err = spl_load_image_fat(spl_image, stor_dev,
+                                       CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
                                CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+       }
        if (err) {
                puts("Error loading sata device\n");
                return err;
@@ -53,3 +57,4 @@ int spl_sata_load_image(void)
 
        return 0;
 }
+SPL_LOAD_IMAGE_METHOD("SATA", 0, BOOT_DEVICE_SATA, spl_sata_load_image);