From: Daniel Golle <daniel@makrotopia.org>
To: Tom Rini <trini@konsulko.com>
Cc: u-boot@lists.denx.de, Simon Glass <sjg@chromium.org>,
Alexandru Gagniuc <mr.nuke.me@gmail.com>,
Chia-Wei Wang <chiawei_wang@aspeedtech.com>,
Sean Anderson <sean.anderson@seco.com>,
Heinrich Schuchardt <xypron.glpk@gmx.de>,
Joel Stanley <joel@jms.id.au>
Subject: [PATCH v4 1/2] bootm: fix typo imape_comp -> image_comp
Date: Sat, 27 Aug 2022 04:14:42 +0100 [thread overview]
Message-ID: <YwmMIm4jtyfdowpk@makrotopia.org> (raw)
In-Reply-To: <CAPnjgZ2RZSA-gv1qRpGcR4v6jt_x90rxopybHURGP_o61PPyCQ@mail.gmail.com>
Chage variable name 'imape_comp' to the supposedly intended name
'image_comp'.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
v4: add missing name replacement
boot/bootm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/boot/bootm.c b/boot/bootm.c
index 86dbfbcfed..63c79a9cfc 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -1006,7 +1006,7 @@ static int bootm_host_load_image(const void *fit, int req_image_type,
int noffset;
ulong load_end, buf_size;
uint8_t image_type;
- uint8_t imape_comp;
+ uint8_t image_comp;
void *load_buf;
int ret;
@@ -1024,7 +1024,7 @@ static int bootm_host_load_image(const void *fit, int req_image_type,
return -EINVAL;
}
- if (fit_image_get_comp(fit, noffset, &imape_comp)) {
+ if (fit_image_get_comp(fit, noffset, &image_comp)) {
puts("Can't get image compression!\n");
return -EINVAL;
}
@@ -1032,12 +1032,12 @@ static int bootm_host_load_image(const void *fit, int req_image_type,
/* Allow the image to expand by a factor of 4, should be safe */
buf_size = (1 << 20) + len * 4;
load_buf = malloc(buf_size);
- ret = image_decomp(imape_comp, 0, data, image_type, load_buf,
+ ret = image_decomp(image_comp, 0, data, image_type, load_buf,
(void *)data, len, buf_size, &load_end);
free(load_buf);
if (ret) {
- ret = handle_decomp_error(imape_comp, load_end - 0, buf_size, ret);
+ ret = handle_decomp_error(image_comp, load_end - 0, buf_size, ret);
if (ret != BOOTM_ERR_UNIMPLEMENTED)
return ret;
}
--
2.37.2
next prev parent reply other threads:[~2022-08-27 3:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-15 10:38 [PATCH] image-fit: don't set compression if it can't be read Daniel Golle
2022-08-15 17:37 ` Simon Glass
2022-08-26 21:11 ` Tom Rini
2022-08-26 21:27 ` [PATCH v2] " Daniel Golle
2022-08-27 0:21 ` Simon Glass
2022-08-27 3:09 ` [PATCH v3 1/2] bootm: fix typo imape_comp -> image_comp Daniel Golle
2022-08-27 3:09 ` [PATCH v3 2/2] image-fit: don't set compression if it can't be read Daniel Golle
2022-08-27 3:14 ` Daniel Golle [this message]
2022-08-30 2:30 ` [PATCH v4 1/2] bootm: fix typo imape_comp -> image_comp Simon Glass
2022-08-30 3:03 ` Daniel Golle
2022-08-30 15:56 ` Simon Glass
2022-08-30 16:54 ` Tom Rini
2022-08-31 23:34 ` Tom Rini
2022-08-27 3:17 ` [PATCH v4 2/2] image-fit: don't set compression if it can't be read Daniel Golle
2022-08-30 2:30 ` Simon Glass
2022-08-31 23:34 ` Tom Rini
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=YwmMIm4jtyfdowpk@makrotopia.org \
--to=daniel@makrotopia.org \
--cc=chiawei_wang@aspeedtech.com \
--cc=joel@jms.id.au \
--cc=mr.nuke.me@gmail.com \
--cc=sean.anderson@seco.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.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.