diff options
| author | Sean Anderson <seanga2@gmail.com> | 2023-11-08 11:48:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-16 13:49:14 -0500 |
| commit | afdd2d98c29c443f348fd88198e59b78d50f4e2c (patch) | |
| tree | 7ded72270622c1ecbe340989452ce9763ea6aa16 /common/spl/spl_blk_fs.c | |
| parent | b63664be6a3d829639f8635365f22f4e1dd30aa1 (diff) | |
spl: Remove filename from spl_load_info
For filesystems, filename serves the same purpose as priv. However,
spl_load_fit_image also uses it to determine whether to use a DMA-aligned
buffer. This is beneficial for FAT, which uses a bounce-buffer if the
destination is not DMA-aligned. However, this is unnecessary now that
filesystems set bl_len to ARCH_DMA_MINALIGN instead. With this done, we can
remove filename entirely.
Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/spl/spl_blk_fs.c')
| -rw-r--r-- | common/spl/spl_blk_fs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index c105c55877..4975ce4d6e 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -14,6 +14,7 @@ struct blk_dev { const char *ifname; + const char *filename; char dev_part_str[8]; }; @@ -31,11 +32,11 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset, return ret; } - ret = fs_read(load->filename, virt_to_phys(buf), file_offset, size, + ret = fs_read(dev->filename, virt_to_phys(buf), file_offset, size, &actlen); if (ret < 0) { printf("spl: error reading image %s. Err - %d\n", - load->filename, ret); + dev->filename, ret); return ret; } @@ -87,8 +88,8 @@ int spl_blk_load_image(struct spl_image_info *spl_image, debug("Found FIT\n"); load.read = spl_fit_read; load.bl_len = ARCH_DMA_MINALIGN; - load.filename = (void *)filename; load.priv = &dev; + dev.filename = filename; return spl_load_simple_fit(spl_image, &load, 0, header); } |