Convert CONFIG_SPL_FS_LOAD_PAYLOAD_NAME et al to Kconfig

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

diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 535a921..1351d78 100644 (file)
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -21,16 +21,13 @@
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION     1
 #endif
 
-#ifndef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
-#endif
-
 #ifndef CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR
 /* Dummy value to make the compiler happy */
 #define CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR 0x100
 #endif
 
 static int spl_sata_load_image_raw(struct spl_image_info *spl_image,
+               struct spl_boot_device *bootdev,
                struct blk_desc *stor_dev, unsigned long sector)
 {
        struct image_header *header;
@@ -45,7 +42,7 @@ static int spl_sata_load_image_raw(struct spl_image_info *spl_image,
        if (count == 0)
                return -EIO;
 
-       ret = spl_parse_image_header(spl_image, header);
+       ret = spl_parse_image_header(spl_image, bootdev, header);
        if (ret)
                return ret;
 
@@ -72,36 +69,26 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,
        int err = 0;
        struct blk_desc *stor_dev;
 
-#if !defined(CONFIG_DM_SCSI) && !defined(CONFIG_AHCI)
-       err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
-#endif
-       if (err) {
-#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-               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;
-       }
+       /* 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;
 
-#ifdef CONFIG_SPL_OS_BOOT
+#if CONFIG_IS_ENABLED(OS_BOOT)
        if (spl_start_uboot() ||
-           spl_load_image_fat_os(spl_image, stor_dev,
+           spl_load_image_fat_os(spl_image, bootdev, stor_dev,
                                  CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
 #endif
        {
                err = -ENOSYS;
 
                if (IS_ENABLED(CONFIG_SPL_FS_FAT)) {
-                       err = spl_load_image_fat(spl_image, stor_dev,
+                       err = spl_load_image_fat(spl_image, bootdev, stor_dev,
                                        CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
                                        CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
                } else if (IS_ENABLED(CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR)) {
-                       err = spl_sata_load_image_raw(spl_image, stor_dev,
+                       err = spl_sata_load_image_raw(spl_image, bootdev, stor_dev,
                                CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR);
                }
        }