spl: fix debug print in spl_common_init()

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

diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index d9eb2d6687b3fb8e4bcc66ad3d139e772a29721e..adfce1d527f60aec8546da69f9b204eb1b2290d2 100644 (file)
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2013
  * Texas Instruments, <www.ti.com>
  *
  * Dan Murphy <dmurphy@ti.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Derived work from spl_usb.c
  */
 
@@ -14,38 +13,45 @@
 #include <asm/u-boot.h>
 #include <sata.h>
 #include <scsi.h>
+#include <errno.h>
 #include <fat.h>
-#include <version.h>
 #include <image.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
-void spl_sata_load_image(void)
+static int spl_sata_load_image(struct spl_image_info *spl_image,
+                              struct spl_boot_device *bootdev)
 {
        int err;
-       block_dev_desc_t *stor_dev;
+       struct blk_desc *stor_dev;
 
        err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
        if (err) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                printf("spl: sata init failed: err - %d\n", err);
 #endif
-               hang();
+               return err;
        } else {
                /* try to recognize storage devices immediately */
-               scsi_scan(0);
-               stor_dev = scsi_get_dev(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");
-               hang();
+               return err;
        }
+
+       return 0;
 }
+SPL_LOAD_IMAGE_METHOD("SATA", 0, BOOT_DEVICE_SATA, spl_sata_load_image);