Andrew Geissler | 0903674 | 2021-06-25 14:25:14 -0500 | [diff] [blame] | 1 | From 77fe3ad2ab2953ccdf6e9417cbecc060b45d3e55 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ming Liu <liu.ming50@gmail.com> |
| 3 | Date: Sun, 30 May 2021 10:32:08 +0200 |
| 4 | Subject: [PATCH] tools: image-host: fix wrong return value |
| 5 | |
| 6 | The return value '-ENOSPC' of fit_set_timestamp function does not match |
| 7 | the caller fit_image_write_sig's expection which is '-FDT_ERR_NOSPACE'. |
| 8 | |
| 9 | Fix it by not calling fit_set_timestamp, but call fdt_setprop instead. |
| 10 | |
| 11 | This fixes a following mkimage error: |
| 12 | | Can't write signature for 'signature@1' signature node in |
| 13 | | 'conf@imx6ull-colibri-wifi-eval-v3.dtb' conf node: <unknown error> |
| 14 | | mkimage Can't add hashes to FIT blob: -1 |
| 15 | |
| 16 | Upstream-Status: Submitted [ https://patchwork.ozlabs.org/project/uboot/patch/20210531070451.6561-1-liu.ming50@gmail.com ] |
| 17 | |
| 18 | Signed-off-by: Ming Liu <liu.ming50@gmail.com> |
| 19 | --- |
| 20 | tools/image-host.c | 4 +++- |
| 21 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 22 | |
| 23 | diff --git a/tools/image-host.c b/tools/image-host.c |
| 24 | index 270d36fe45..73095461a7 100644 |
| 25 | --- a/tools/image-host.c |
| 26 | +++ b/tools/image-host.c |
| 27 | @@ -132,8 +132,10 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value, |
| 28 | if (!ret) { |
| 29 | time_t timestamp = imagetool_get_source_date(cmdname, |
| 30 | time(NULL)); |
| 31 | + uint32_t t = cpu_to_uimage(timestamp); |
| 32 | |
| 33 | - ret = fit_set_timestamp(fit, noffset, timestamp); |
| 34 | + ret = fdt_setprop(fit, noffset, FIT_TIMESTAMP_PROP, &t, |
| 35 | + sizeof(uint32_t)); |
| 36 | } |
| 37 | if (region_prop && !ret) { |
| 38 | uint32_t strdata[2]; |
| 39 | -- |
| 40 | 2.29.0 |
| 41 | |