Message ID | 20200730042215.409016-3-patrick.oppenlander@gmail.com |
---|---|
State | Accepted |
Commit | 04aeebb131081698204ad38bd8aba7140cd3ba22 |
Delegated to: | Tom Rini |
Headers | show |
Series | [v2,1/3] mkimage: fit: only process one cipher node | expand |
Hi Patrick, > From: Patrick Oppenlander <patrick.oppenlander@gmail.com> > > Also replace fdt_delprop/fdt_setprop with fdt_setprop as fdt_setprop can > replace an existing property value. Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com> > Signed-off-by: Patrick Oppenlander <patrick.oppenlander@gmail.com> Regards, Philippe > --- > tools/image-host.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/tools/image-host.c b/tools/image-host.c > index dd7ecc4b60..b4603c5f01 100644 > --- a/tools/image-host.c > +++ b/tools/image-host.c > @@ -399,23 +399,24 @@ int fit_image_write_cipher(void *fit, int image_noffset, > int noffset, > { > int ret = -1; > > - /* Remove unciphered data */ > - ret = fdt_delprop(fit, image_noffset, FIT_DATA_PROP); > - if (ret) { > - printf("Can't remove data (err = %d)\n", ret); > - goto out; > - } > - > - /* Add ciphered data */ > + /* Replace data with ciphered data */ > ret = fdt_setprop(fit, image_noffset, FIT_DATA_PROP, > data_ciphered, data_ciphered_len); > + if (ret == -FDT_ERR_NOSPACE) { > + ret = -ENOSPC; > + goto out; > + } > if (ret) { > - printf("Can't add ciphered data (err = %d)\n", ret); > + printf("Can't replace data with ciphered data (err = %d)\n", ret); > goto out; > } > > /* add non ciphered data size */ > ret = fdt_setprop_u32(fit, image_noffset, "data-size-unciphered", size); > + if (ret == -FDT_ERR_NOSPACE) { > + ret = -ENOSPC; > + goto out; > + } > if (ret) { > printf("Can't add unciphered data size (err = %d)\n", ret); > goto out; > -- > 2.27.0
On Thu, Jul 30, 2020 at 02:22:14PM +1000, patrick.oppenlander@gmail.com wrote: > From: Patrick Oppenlander <patrick.oppenlander@gmail.com> > > Also replace fdt_delprop/fdt_setprop with fdt_setprop as fdt_setprop can > replace an existing property value. > > Signed-off-by: Patrick Oppenlander <patrick.oppenlander@gmail.com> > Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com> Applied to u-boot/master, thanks!
diff --git a/tools/image-host.c b/tools/image-host.c index dd7ecc4b60..b4603c5f01 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -399,23 +399,24 @@ int fit_image_write_cipher(void *fit, int image_noffset, int noffset, { int ret = -1; - /* Remove unciphered data */ - ret = fdt_delprop(fit, image_noffset, FIT_DATA_PROP); - if (ret) { - printf("Can't remove data (err = %d)\n", ret); - goto out; - } - - /* Add ciphered data */ + /* Replace data with ciphered data */ ret = fdt_setprop(fit, image_noffset, FIT_DATA_PROP, data_ciphered, data_ciphered_len); + if (ret == -FDT_ERR_NOSPACE) { + ret = -ENOSPC; + goto out; + } if (ret) { - printf("Can't add ciphered data (err = %d)\n", ret); + printf("Can't replace data with ciphered data (err = %d)\n", ret); goto out; } /* add non ciphered data size */ ret = fdt_setprop_u32(fit, image_noffset, "data-size-unciphered", size); + if (ret == -FDT_ERR_NOSPACE) { + ret = -ENOSPC; + goto out; + } if (ret) { printf("Can't add unciphered data size (err = %d)\n", ret); goto out;