| Message ID | YwmMIm4jtyfdowpk@makrotopia.org |
|---|---|
| State | Accepted |
| Commit | 0cd57f29e49a99135660a65d21da8e6b3d5cb52a |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [v4,1/2] bootm: fix typo imape_comp -> image_comp | expand |
On Fri, 26 Aug 2022 at 21:15, Daniel Golle <daniel@makrotopia.org> wrote: > > Chage variable name 'imape_comp' to the supposedly intended name Change > '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(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, Aug 29, 2022 at 08:30:14PM -0600, Simon Glass wrote: > On Fri, 26 Aug 2022 at 21:15, Daniel Golle <daniel@makrotopia.org> wrote: > > > > Chage variable name 'imape_comp' to the supposedly intended name > > Change Can you fix that on-the-fly while comitting or should I repost with that typo in the patch description fixed? > > > '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(-) > > > > Reviewed-by: Simon Glass <sjg@chromium.org>
Hi Daniel, On Mon, 29 Aug 2022 at 21:04, Daniel Golle <daniel@makrotopia.org> wrote: > > On Mon, Aug 29, 2022 at 08:30:14PM -0600, Simon Glass wrote: > > On Fri, 26 Aug 2022 at 21:15, Daniel Golle <daniel@makrotopia.org> wrote: > > > > > > Chage variable name 'imape_comp' to the supposedly intended name > > > > Change > > Can you fix that on-the-fly while comitting or should I repost with > that typo in the patch description fixed? Yes I suspect Tom can do that. Regards, Simon > > > > > > '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(-) > > > > > > > Reviewed-by: Simon Glass <sjg@chromium.org>
On Tue, Aug 30, 2022 at 09:56:56AM -0600, Simon Glass wrote: > Hi Daniel, > > On Mon, 29 Aug 2022 at 21:04, Daniel Golle <daniel@makrotopia.org> wrote: > > > > On Mon, Aug 29, 2022 at 08:30:14PM -0600, Simon Glass wrote: > > > On Fri, 26 Aug 2022 at 21:15, Daniel Golle <daniel@makrotopia.org> wrote: > > > > > > > > Chage variable name 'imape_comp' to the supposedly intended name > > > > > > Change > > > > Can you fix that on-the-fly while comitting or should I repost with > > that typo in the patch description fixed? > > Yes I suspect Tom can do that. Yes, that's fine.
On Sat, Aug 27, 2022 at 04:14:42AM +0100, Daniel Golle wrote: > Change variable name 'imape_comp' to the supposedly intended name > 'image_comp'. > > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
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; }
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(-)