| Message ID | 20220816151607.1569660-5-sean.anderson@seco.com |
|---|---|
| State | Accepted |
| Commit | 7b42bde075c9cec85aa200d2e093d3b2b5641d94 |
| Delegated to: | Peng Fan |
| Headers | show |
| Series | net: fm: Verify Fman microcode | expand |
On Tue, 16 Aug 2022 at 09:16, Sean Anderson <sean.anderson@seco.com> wrote: > > This converts the FIT loading process of the fpga command to use s/This converts/Convert/ > fit_get_data_node. > > Signed-off-by: Sean Anderson <sean.anderson@seco.com> > --- > > Changes in v2: > - New > > cmd/fpga.c | 24 ++++++------------------ > 1 file changed, 6 insertions(+), 18 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> > > diff --git a/cmd/fpga.c b/cmd/fpga.c > index c4651dd403e..9cf7651d8c5 100644 > --- a/cmd/fpga.c > +++ b/cmd/fpga.c > @@ -322,7 +322,7 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc, > case IMAGE_FORMAT_FIT: > { > const void *fit_hdr = (const void *)fpga_data; > - int noffset; > + int err; > const void *fit_data; > > if (!fit_uname) { > @@ -335,23 +335,11 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc, > return CMD_RET_FAILURE; > } > > - /* get fpga component image node offset */ > - noffset = fit_image_get_node(fit_hdr, fit_uname); > - if (noffset < 0) { > - printf("Can't find '%s' FIT subimage\n", fit_uname); > - return CMD_RET_FAILURE; > - } > - > - /* verify integrity */ > - if (!fit_image_verify(fit_hdr, noffset)) { > - puts("Bad Data Hash\n"); > - return CMD_RET_FAILURE; > - } > - > - /* get fpga subimage/external data address and length */ > - if (fit_image_get_data_and_size(fit_hdr, noffset, > - &fit_data, &data_size)) { > - puts("Fpga subimage data not found\n"); > + err = fit_get_data_node(fit_hdr, fit_uname, &fit_data, > + &data_size); > + if (err) { > + printf("Could not load '%s' subimage (err %d)\n", > + fit_uname, err); > return CMD_RET_FAILURE; > } > > -- > 2.35.1.1320.gc452695387.dirty >
diff --git a/cmd/fpga.c b/cmd/fpga.c index c4651dd403e..9cf7651d8c5 100644 --- a/cmd/fpga.c +++ b/cmd/fpga.c @@ -322,7 +322,7 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc, case IMAGE_FORMAT_FIT: { const void *fit_hdr = (const void *)fpga_data; - int noffset; + int err; const void *fit_data; if (!fit_uname) { @@ -335,23 +335,11 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_FAILURE; } - /* get fpga component image node offset */ - noffset = fit_image_get_node(fit_hdr, fit_uname); - if (noffset < 0) { - printf("Can't find '%s' FIT subimage\n", fit_uname); - return CMD_RET_FAILURE; - } - - /* verify integrity */ - if (!fit_image_verify(fit_hdr, noffset)) { - puts("Bad Data Hash\n"); - return CMD_RET_FAILURE; - } - - /* get fpga subimage/external data address and length */ - if (fit_image_get_data_and_size(fit_hdr, noffset, - &fit_data, &data_size)) { - puts("Fpga subimage data not found\n"); + err = fit_get_data_node(fit_hdr, fit_uname, &fit_data, + &data_size); + if (err) { + printf("Could not load '%s' subimage (err %d)\n", + fit_uname, err); return CMD_RET_FAILURE; }
This converts the FIT loading process of the fpga command to use fit_get_data_node. Signed-off-by: Sean Anderson <sean.anderson@seco.com> --- Changes in v2: - New cmd/fpga.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)