]> code.ossystems Code Review - openembedded-core.git/commitdiff
u-boot: upgrade 2021.07 -> 2021.10
authorAlexander Kanavin <alex.kanavin@gmail.com>
Tue, 19 Oct 2021 15:33:32 +0000 (17:33 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 27 Oct 2021 08:44:59 +0000 (09:44 +0100)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch [deleted file]
meta/recipes-bsp/u-boot/u-boot-common.inc
meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb [deleted file]
meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb [new file with mode: 0644]
meta/recipes-bsp/u-boot/u-boot_2021.10.bb [moved from meta/recipes-bsp/u-boot/u-boot_2021.07.bb with 99% similarity]

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
deleted file mode 100644 (file)
index 8168720..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From 77fe3ad2ab2953ccdf6e9417cbecc060b45d3e55 Mon Sep 17 00:00:00 2001
-From: Ming Liu <liu.ming50@gmail.com>
-Date: Sun, 30 May 2021 10:32:08 +0200
-Subject: [PATCH] tools: image-host: fix wrong return value
-
-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
-
-Upstream-Status: Submitted [ https://patchwork.ozlabs.org/project/uboot/patch/20210531070451.6561-1-liu.ming50@gmail.com ]
-
-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
-
index 6b9253806f9f8a52222dac6707e3d370519f5596..e41a4b5096068e96b822811770ed7d4571d0998d 100644 (file)
@@ -12,7 +12,7 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "840658b093976390e9537724f802281c9c8439f5"
+SRCREV = "d80bb749fab53da72c4a0e09b8c2d2aaa3103c91"
 
 SRC_URI = "git://git.denx.de/u-boot.git \
           "
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb
deleted file mode 100644 (file)
index d0c0f30..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-require u-boot-common.inc
-require u-boot-tools.inc
-
-SRC_URI:append = " file://0001-tools-image-host-fix-wrong-return-value.patch"
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb
new file mode 100644 (file)
index 0000000..7eaf721
--- /dev/null
@@ -0,0 +1,2 @@
+require u-boot-common.inc
+require u-boot-tools.inc
similarity index 99%
rename from meta/recipes-bsp/u-boot/u-boot_2021.07.bb
rename to meta/recipes-bsp/u-boot/u-boot_2021.10.bb
index c8dbe477e04fe182c23caeed1c5f598967ed4366..617827ff083e66ed2fa80f75ea364790c4893de9 100644 (file)
@@ -4,3 +4,4 @@ require u-boot.inc
 SRC_URI:append = " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch"
 
 DEPENDS += "bc-native dtc-native python3-setuptools-native"
+