From adc621bf15cf7478e2ac46985216703219ebe778 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 15 Nov 2024 16:19:14 -0700 Subject: bootstd: Update bootmeth_alloc_file() to record images As a first step to recording images and where they came from, update this function to do so, since it is used by two bootmeths Create a helper function in the bootflow system, since recorded images are always associated with bootflows. Signed-off-by: Simon Glass --- boot/bootmeth_extlinux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot/bootmeth_extlinux.c') diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index be8fbf4df63..6c158c2a6c6 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -159,7 +159,7 @@ static int extlinux_read_bootflow(struct udevice *dev, struct bootflow *bflow) return log_msg_ret("try", ret); size = bflow->size; - ret = bootmeth_alloc_file(bflow, 0x10000, 1); + ret = bootmeth_alloc_file(bflow, 0x10000, 1, BFI_EXTLINUX_CFG); if (ret) return log_msg_ret("read", ret); -- cgit v1.2.3 From aa0ba7fbda4121fa9f3f11161fb4ebdd7e227299 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 15 Nov 2024 16:19:17 -0700 Subject: bootmeth: Update the read_file() method to include a type We want to record the type of each file which is loaded. Add an new parameter for this, to the read_file() method. Update all users. Make bootmeth_common_read_file() store information about the image that is read. Signed-off-by: Simon Glass Reviewed-by: Mattijs Korpershoek --- boot/bootmeth_extlinux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot/bootmeth_extlinux.c') diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index 6c158c2a6c6..ae5ae4dbb34 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -79,7 +79,7 @@ static int extlinux_getfile(struct pxe_context *ctx, const char *file_path, /* Allow up to 1GB */ *sizep = 1 << 30; ret = bootmeth_read_file(info->dev, info->bflow, file_path, addr, - sizep); + (enum bootflow_img_t)IH_TYPE_INVALID, sizep); if (ret) return log_msg_ret("read", ret); -- cgit v1.2.3 From 3ed218e2ff6386477c8575367dd67613b588750a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 15 Nov 2024 16:19:19 -0700 Subject: boot: Update extlinux pxe_getfile_func() to include type Add a file-type parameter to this function and update all users. Add a proper comment to the function which we are here. This will allow tracking of the file types loaded by the extlinux bootmeth. Signed-off-by: Simon Glass --- boot/bootmeth_extlinux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'boot/bootmeth_extlinux.c') diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index ae5ae4dbb34..63cb9a4a8af 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -68,7 +68,8 @@ static int extlinux_get_state_desc(struct udevice *dev, char *buf, int maxsize) } static int extlinux_getfile(struct pxe_context *ctx, const char *file_path, - char *file_addr, ulong *sizep) + char *file_addr, enum bootflow_img_t type, + ulong *sizep) { struct extlinux_info *info = ctx->userdata; ulong addr; @@ -79,7 +80,7 @@ static int extlinux_getfile(struct pxe_context *ctx, const char *file_path, /* Allow up to 1GB */ *sizep = 1 << 30; ret = bootmeth_read_file(info->dev, info->bflow, file_path, addr, - (enum bootflow_img_t)IH_TYPE_INVALID, sizep); + type, sizep); if (ret) return log_msg_ret("read", ret); -- cgit v1.2.3