diff options
| author | Simon Glass <sjg@chromium.org> | 2016-09-24 18:20:15 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-06 15:08:53 -0400 |
| commit | 710e9ca5795c9762b09028f1e151981c9052d012 (patch) | |
| tree | 19e51d8764f39280ed0c9fa154ae12894fcfbf69 /common/spl/spl_sata.c | |
| parent | b4a6c2aae6165782dd9fa4944b38c2c2a7419af1 (diff) | |
spl: Update fat functions to take an spl_image parameter
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>
Diffstat (limited to 'common/spl/spl_sata.c')
| -rw-r--r-- | common/spl/spl_sata.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 19b5ba5199..a3c07cd9ce 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -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; |