spl: Update fat functions to take an spl_image parameter
authorSimon Glass <sjg@chromium.org>
Sun, 25 Sep 2016 00:20:15 +0000 (18:20 -0600)
committerTom Rini <trini@konsulko.com>
Thu, 6 Oct 2016 19:08:53 +0000 (15:08 -0400)
Update the fat loader to avoid using the spl_image global variable.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
common/spl/spl_fat.c
common/spl/spl_mmc.c
common/spl/spl_sata.c
common/spl/spl_usb.c
include/spl.h

index 68702a2b5ad73cfa6b7f0aa6aa270a1ee5a75c82..e2bb00029c24757662550662d423688c897e3c17 100644 (file)
@@ -54,9 +54,9 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
        return actread;
 }
 
-int spl_load_image_fat(struct blk_desc *block_dev,
-                                               int partition,
-                                               const char *filename)
+int spl_load_image_fat(struct spl_image_info *spl_image,
+                      struct blk_desc *block_dev, int partition,
+                      const char *filename)
 {
        int err;
        struct image_header *header;
@@ -84,12 +84,12 @@ int spl_load_image_fat(struct blk_desc *block_dev,
 
                return spl_load_simple_fit(&load, 0, header);
        } else {
-               err = spl_parse_image_header(&spl_image, header);
+               err = spl_parse_image_header(spl_image, header);
                if (err)
                        goto end;
 
                err = file_fat_read(filename,
-                                   (u8 *)(uintptr_t)spl_image.load_addr, 0);
+                                   (u8 *)(uintptr_t)spl_image->load_addr, 0);
        }
 
 end:
@@ -103,7 +103,8 @@ end:
 }
 
 #ifdef CONFIG_SPL_OS_BOOT
-int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
+int spl_load_image_fat_os(struct spl_image_info *spl_image,
+                         struct blk_desc *block_dev, int partition)
 {
        int err;
        __maybe_unused char *file;
@@ -123,7 +124,8 @@ int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
                }
                file = getenv("falcon_image_file");
                if (file) {
-                       err = spl_load_image_fat(block_dev, partition, file);
+                       err = spl_load_image_fat(spl_image, block_dev,
+                                                partition, file);
                        if (err != 0) {
                                puts("spl: falling back to default\n");
                                goto defaults;
@@ -148,11 +150,12 @@ defaults:
                return -1;
        }
 
-       return spl_load_image_fat(block_dev, partition,
+       return spl_load_image_fat(spl_image, block_dev, partition,
                        CONFIG_SPL_FS_LOAD_KERNEL_NAME);
 }
 #else
-int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
+int spl_load_image_fat_os(struct spl_image_info *spl_image,
+                         struct blk_desc *block_dev, int partition)
 {
        return -ENOSYS;
 }
index 5f5d9d0c3e0626676b9f54e415a6b50d3f0f824b..16a6b49e7a5cf8d148b3e0fd13442cac016e8a2b 100644 (file)
@@ -230,13 +230,13 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc)
 
 #ifdef CONFIG_SPL_FAT_SUPPORT
        if (!spl_start_uboot()) {
-               err = spl_load_image_fat_os(mmc_get_blk_desc(mmc),
+               err = spl_load_image_fat_os(spl_image, mmc_get_blk_desc(mmc),
                        CONFIG_SYS_MMCSD_FS_BOOT_PARTITION);
                if (!err)
                        return err;
        }
 #ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
-       err = spl_load_image_fat(mmc_get_blk_desc(mmc),
+       err = spl_load_image_fat(spl_image, mmc_get_blk_desc(mmc),
                                 CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
                                 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
        if (!err)
index 19b5ba519987164f931485815ad09b78da0dddf8..a3c07cd9cee2a3e6f15fc62da49f9583b9337545 100644 (file)
@@ -41,12 +41,15 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,
        }
 
 #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;
index aaa4f8103fa430474a05514ef726b0a9bbe40851..e37966ed6cefb9a71c281ec9c1939a6231b6840a 100644 (file)
@@ -48,12 +48,15 @@ static int spl_usb_load_image(struct spl_image_info *spl_image,
        debug("boot mode - FAT\n");
 
 #ifdef CONFIG_SPL_OS_BOOT
-               if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
-                                                               CONFIG_SYS_USB_FAT_BOOT_PARTITION))
+       if (spl_start_uboot() ||
+           spl_load_image_fat_os(spl_image, stor_dev,
+                                 CONFIG_SYS_USB_FAT_BOOT_PARTITION))
 #endif
-               err = spl_load_image_fat(stor_dev,
-                               CONFIG_SYS_USB_FAT_BOOT_PARTITION,
-                               CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+       {
+               err = spl_load_image_fat(spl_image, stor_dev,
+                                       CONFIG_SYS_USB_FAT_BOOT_PARTITION,
+                                       CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+       }
 
        if (err) {
                puts("Error loading from USB device\n");
index 5ef9ae6e4bbd3385e3c4978622781f9f9b60dd60..1f4f4e523765941a187cc794692c28604257eb47 100644 (file)
@@ -184,9 +184,11 @@ struct spl_image_loader {
        }
 
 /* SPL FAT image functions */
-int spl_load_image_fat(struct blk_desc *block_dev, int partition,
+int spl_load_image_fat(struct spl_image_info *spl_image,
+                      struct blk_desc *block_dev, int partition,
                       const char *filename);
-int spl_load_image_fat_os(struct blk_desc *block_dev, int partition);
+int spl_load_image_fat_os(struct spl_image_info *spl_image,
+                         struct blk_desc *block_dev, int partition);
 
 void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image);