* [[PATCH] tools: image-host: fix wrong return value
@ 2021-05-31 7:04 liu.ming50
2021-07-13 15:35 ` Igor Opaniuk
2021-07-15 1:27 ` Tom Rini
0 siblings, 2 replies; 4+ messages in thread
From: liu.ming50 @ 2021-05-31 7:04 UTC (permalink / raw)
To: u-boot; +Cc: sergio.prado, max.krummenacher, Ming Liu
From: Ming Liu <liu.ming50@gmail.com>
The return value '-ENOSPC' of fit_set_timestamp function does not match
the caller fit_image_write_sig's expection which is '-FDT_ERR_NOSPACE'.
Fix it by not calling fit_set_timestamp, but call fdt_setprop instead.
This fixes a following mkimage error:
| Can't write signature for 'signature@1' signature node in
| 'conf@imx6ull-colibri-wifi-eval-v3.dtb' conf node: <unknown error>
| mkimage Can't add hashes to FIT blob: -1
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
---
tools/image-host.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/image-host.c b/tools/image-host.c
index 270d36fe45..73095461a7 100644
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -132,8 +132,10 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value,
if (!ret) {
time_t timestamp = imagetool_get_source_date(cmdname,
time(NULL));
+ uint32_t t = cpu_to_uimage(timestamp);
- ret = fit_set_timestamp(fit, noffset, timestamp);
+ ret = fdt_setprop(fit, noffset, FIT_TIMESTAMP_PROP, &t,
+ sizeof(uint32_t));
}
if (region_prop && !ret) {
uint32_t strdata[2];
--
2.29.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [[PATCH] tools: image-host: fix wrong return value
2021-05-31 7:04 [[PATCH] tools: image-host: fix wrong return value liu.ming50
@ 2021-07-13 15:35 ` Igor Opaniuk
2021-07-15 1:27 ` Tom Rini
1 sibling, 0 replies; 4+ messages in thread
From: Igor Opaniuk @ 2021-07-13 15:35 UTC (permalink / raw)
To: liu.ming50
Cc: U-Boot Mailing List, sergio.prado, max.krummenacher,
Ricardo Salveti
Hi Ming,
On Mon, May 31, 2021 at 10:05 AM <liu.ming50@gmail.com> wrote:
>
> From: Ming Liu <liu.ming50@gmail.com>
>
> The return value '-ENOSPC' of fit_set_timestamp function does not match
> the caller fit_image_write_sig's expection which is '-FDT_ERR_NOSPACE'.
>
> Fix it by not calling fit_set_timestamp, but call fdt_setprop instead.
>
> This fixes a following mkimage error:
> | Can't write signature for 'signature@1' signature node in
> | 'conf@imx6ull-colibri-wifi-eval-v3.dtb' conf node: <unknown error>
> | mkimage Can't add hashes to FIT blob: -1
>
> Signed-off-by: Ming Liu <liu.ming50@gmail.com>
> ---
> tools/image-host.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/image-host.c b/tools/image-host.c
> index 270d36fe45..73095461a7 100644
> --- a/tools/image-host.c
> +++ b/tools/image-host.c
> @@ -132,8 +132,10 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value,
> if (!ret) {
> time_t timestamp = imagetool_get_source_date(cmdname,
> time(NULL));
> + uint32_t t = cpu_to_uimage(timestamp);
>
> - ret = fit_set_timestamp(fit, noffset, timestamp);
> + ret = fdt_setprop(fit, noffset, FIT_TIMESTAMP_PROP, &t,
> + sizeof(uint32_t));
> }
> if (region_prop && !ret) {
> uint32_t strdata[2];
> --
> 2.29.0
>
I've hit exactly the same issue on my side today :)
Tested-by: Igor Opaniuk <igor.opaniuk@foundries.io>
--
Best regards - Freundliche Grüsse - Meilleures salutations
Igor Opaniuk
Embedded Software Engineer
T: +380 938364067
E: igor.opaniuk@foundries.io
W: www.foundries.io
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [[PATCH] tools: image-host: fix wrong return value
2021-05-31 7:04 [[PATCH] tools: image-host: fix wrong return value liu.ming50
2021-07-13 15:35 ` Igor Opaniuk
@ 2021-07-15 1:27 ` Tom Rini
1 sibling, 0 replies; 4+ messages in thread
From: Tom Rini @ 2021-07-15 1:27 UTC (permalink / raw)
To: liu.ming50; +Cc: u-boot, sergio.prado, max.krummenacher
[-- Attachment #1: Type: text/plain, Size: 730 bytes --]
On Mon, May 31, 2021 at 09:04:51AM +0200, liu.ming50@gmail.com wrote:
> From: Ming Liu <liu.ming50@gmail.com>
>
> The return value '-ENOSPC' of fit_set_timestamp function does not match
> the caller fit_image_write_sig's expection which is '-FDT_ERR_NOSPACE'.
>
> Fix it by not calling fit_set_timestamp, but call fdt_setprop instead.
>
> This fixes a following mkimage error:
> | Can't write signature for 'signature@1' signature node in
> | 'conf@imx6ull-colibri-wifi-eval-v3.dtb' conf node: <unknown error>
> | mkimage Can't add hashes to FIT blob: -1
>
> Signed-off-by: Ming Liu <liu.ming50@gmail.com>
> Tested-by: Igor Opaniuk <igor.opaniuk@foundries.io>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [[PATCH] tools: image-host: fix wrong return value
@ 2021-05-30 8:56 liu.ming50
0 siblings, 0 replies; 4+ messages in thread
From: liu.ming50 @ 2021-05-30 8:56 UTC (permalink / raw)
To: u-boot; +Cc: sergio.prado, max.krummenacher, Ming Liu
From: Ming Liu <liu.ming50@gmail.com>
The return value '-ENOSPC' of fit_set_timestamp function does not match
the caller fit_image_write_sig's expection which is '-FDT_ERR_NOSPACE'.
Fix it by not calling fit_set_timestamp, but call fdt_setprop instead.
This fixes a following mkimage error:
| Can't write signature for 'signature@1' signature node in
| 'conf@imx6ull-colibri-wifi-eval-v3.dtb' conf node: <unknown error>
| mkimage Can't add hashes to FIT blob: -1
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
---
tools/image-host.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/image-host.c b/tools/image-host.c
index 270d36fe45..73095461a7 100644
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -132,8 +132,10 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value,
if (!ret) {
time_t timestamp = imagetool_get_source_date(cmdname,
time(NULL));
+ uint32_t t = cpu_to_uimage(timestamp);
- ret = fit_set_timestamp(fit, noffset, timestamp);
+ ret = fdt_setprop(fit, noffset, FIT_TIMESTAMP_PROP, &t,
+ sizeof(uint32_t));
}
if (region_prop && !ret) {
uint32_t strdata[2];
--
2.29.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-15 1:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-31 7:04 [[PATCH] tools: image-host: fix wrong return value liu.ming50
2021-07-13 15:35 ` Igor Opaniuk
2021-07-15 1:27 ` Tom Rini
-- strict thread matches above, loose matches on Subject: below --
2021-05-30 8:56 liu.ming50
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox