From: Sean Anderson <sean.anderson@seco.com>
To: Simon Glass <sjg@chromium.org>
Cc: "Pali Rohár" <pali@kernel.org>,
"Marek Behún" <marek.behun@nic.cz>,
u-boot@lists.denx.de, "Stefan Roese" <sr@denx.de>,
"Marek Vasut" <marex@denx.de>,
"Sean Anderson" <sean.anderson@seco.com>
Subject: [PATCH v2 2/9] spl: Convert ext to use spl_load
Date: Fri, 22 Apr 2022 14:27:40 -0400 [thread overview]
Message-ID: <20220422182748.2309992-3-sean.anderson@seco.com> (raw)
In-Reply-To: <20220422182748.2309992-1-sean.anderson@seco.com>
This converts the ext load method to use spl_load. As a consequence, it
also adds support for FIT and IMX images.
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Stefan Roese <sr@denx.de>
---
(no changes since v1)
common/spl/spl_ext.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index ebd914c492..1384842776 100644
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -9,6 +9,18 @@
#include <errno.h>
#include <image.h>
+static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
+ ulong size, void *buf)
+{
+ int ret;
+ loff_t actlen;
+
+ ret = ext4fs_read(buf, file_offset, size, &actlen);
+ if (ret)
+ return ret;
+ return actlen;
+}
+
int spl_load_image_ext(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev,
struct blk_desc *block_dev, int partition,
@@ -18,6 +30,10 @@ int spl_load_image_ext(struct spl_image_info *spl_image,
struct image_header *header;
loff_t filelen, actlen;
struct disk_partition part_info = {};
+ struct spl_load_info load = {
+ .read = spl_fit_read,
+ .bl_len = 1,
+ };
header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
@@ -47,13 +63,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image,
goto end;
}
- err = spl_parse_image_header(spl_image, bootdev, header);
- if (err < 0) {
- puts("spl: ext: failed to parse image header\n");
- goto end;
- }
-
- err = ext4fs_read((char *)spl_image->load_addr, 0, filelen, &actlen);
+ err = spl_load(spl_image, bootdev, &load, header, filelen, 0);
end:
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
--
2.35.1.1320.gc452695387.dirty
next prev parent reply other threads:[~2022-04-22 18:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-22 18:27 [PATCH v2 0/9] spl: Use common function for loading/parsing images Sean Anderson
2022-04-22 18:27 ` [PATCH v2 1/9] spl: Add generic spl_load function Sean Anderson
2022-04-22 18:27 ` Sean Anderson [this message]
2022-04-22 18:27 ` [PATCH v2 3/9] spl: Convert fat to spl_load Sean Anderson
2022-05-05 0:06 ` Tom Rini
2022-05-05 14:51 ` Sean Anderson
2022-05-05 15:38 ` Tom Rini
2022-05-05 18:53 ` Sean Anderson
2022-05-05 18:58 ` Tom Rini
2022-05-05 19:05 ` Sean Anderson
2022-05-05 19:12 ` Tom Rini
2022-04-22 18:27 ` [PATCH v2 4/9] spl: Convert mmc " Sean Anderson
2022-04-22 18:27 ` [PATCH v2 5/9] spl: Convert net " Sean Anderson
2022-04-22 18:27 ` [PATCH v2 6/9] spl: Convert nor " Sean Anderson
2022-04-22 18:27 ` [PATCH v2 7/9] spl: Convert semihosting " Sean Anderson
2022-04-22 18:27 ` [PATCH v2 8/9] spl: Convert spi " Sean Anderson
2022-04-22 18:27 ` [PATCH v2 9/9] spl: spi: Consolidate spi_load_image_os into spl_spi_load_image Sean Anderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220422182748.2309992-3-sean.anderson@seco.com \
--to=sean.anderson@seco.com \
--cc=marek.behun@nic.cz \
--cc=marex@denx.de \
--cc=pali@kernel.org \
--cc=sjg@chromium.org \
--cc=sr@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.