summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2021-06-21 13:16:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-22 15:18:11 +0100
commite9fa8f9001471bb240e997cb4537d2f617f22957 (patch)
tree6a0b65bccd803eaca1afe42f08f86c544cc970e3 /meta
parent456191f9370801c24ed71f2e3a010f60c619f028 (diff)
downloadpoky-e9fa8f9001471bb240e997cb4537d2f617f22957.tar.gz
u-boot-tools: fix a mkimage signature issue
A following error was observed: | Can't write signature for 'signature@1' signature node in 'conf@imx6ull-colibri-wifi-eval-v3.dtb' conf node: <unknown error> | uboot-mkimage Can't add hashes to FIT blob: -1 This is caused by a wrong return value being used in uboot source. 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. (From OE-Core rev: 8628a276a01e994e84d3c6ac8397860e8e2bbb5b) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch41
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-tools_2021.04.bb1
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch b/meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch
new file mode 100644
index 0000000000..81687203e4
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch
@@ -0,0 +1,41 @@
1From 77fe3ad2ab2953ccdf6e9417cbecc060b45d3e55 Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Sun, 30 May 2021 10:32:08 +0200
4Subject: [PATCH] tools: image-host: fix wrong return value
5
6The return value '-ENOSPC' of fit_set_timestamp function does not match
7the caller fit_image_write_sig's expection which is '-FDT_ERR_NOSPACE'.
8
9Fix it by not calling fit_set_timestamp, but call fdt_setprop instead.
10
11This 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
16Upstream-Status: Submitted [ https://patchwork.ozlabs.org/project/uboot/patch/20210531070451.6561-1-liu.ming50@gmail.com ]
17
18Signed-off-by: Ming Liu <liu.ming50@gmail.com>
19---
20 tools/image-host.c | 4 +++-
21 1 file changed, 3 insertions(+), 1 deletion(-)
22
23diff --git a/tools/image-host.c b/tools/image-host.c
24index 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--
402.29.0
41
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2021.04.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2021.04.bb
index ef386f76e6..4e90081911 100644
--- a/meta/recipes-bsp/u-boot/u-boot-tools_2021.04.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-tools_2021.04.bb
@@ -1,3 +1,4 @@
1require u-boot-common.inc 1require u-boot-common.inc
2require u-boot-tools.inc 2require u-boot-tools.inc
3 3
4SRC_URI_append = " file://0001-tools-image-host-fix-wrong-return-value.patch"