summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorSimon Glass <[email protected]>2024-11-15 16:19:16 -0700
committerTom Rini <[email protected]>2025-01-15 08:48:42 -0600
commitd4c60aa91b8a3a7b880c2a6ec24664108cd67730 (patch)
tree09351cc915a5bf61a484c5cd6a8d8188b2fdae0f /boot
parent8777ae2b957151cd4fc299b84055150c531e6333 (diff)
bootmeth_efi: Simplify reading files by using the common function
The efiload_read_file() does similar things to a common function, so update it to use that instead. Signed-off-by: Simon Glass <[email protected]> Acked-by: Ilias Apalodimas <[email protected]>
Diffstat (limited to 'boot')
-rw-r--r--boot/bootmeth_efi.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c
index f836aa655f5..47a22d5bd0a 100644
--- a/boot/bootmeth_efi.c
+++ b/boot/bootmeth_efi.c
@@ -89,18 +89,17 @@ static void set_efi_bootdev(struct blk_desc *desc, struct bootflow *bflow)
static int efiload_read_file(struct bootflow *bflow, ulong addr)
{
struct blk_desc *desc = NULL;
- loff_t bytes_read;
+ ulong size;
int ret;
if (bflow->blk)
desc = dev_get_uclass_plat(bflow->blk);
- ret = bootmeth_setup_fs(bflow, desc);
- if (ret)
- return log_msg_ret("set", ret);
- ret = fs_read(bflow->fname, addr, 0, bflow->size, &bytes_read);
+ size = SZ_1G;
+ ret = bootmeth_common_read_file(bflow->method, bflow, bflow->fname,
+ addr, &size);
if (ret)
- return log_msg_ret("read", ret);
+ return log_msg_ret("rdf", ret);
bflow->buf = map_sysmem(addr, bflow->size);
set_efi_bootdev(desc, bflow);