From 24a4b34e25548d71bd430224adb58d87015674a7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 19 Oct 2021 17:33:32 +0200 Subject: u-boot: upgrade 2021.07 -> 2021.10 Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...1-tools-image-host-fix-wrong-return-value.patch | 41 ---------------------- meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +- meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb | 4 --- meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb | 2 ++ meta/recipes-bsp/u-boot/u-boot_2021.07.bb | 6 ---- meta/recipes-bsp/u-boot/u-boot_2021.10.bb | 7 ++++ 6 files changed, 10 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2021.07.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot_2021.10.bb (limited to 'meta') 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 index 81687203e4..0000000000 --- a/meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 77fe3ad2ab2953ccdf6e9417cbecc060b45d3e55 Mon Sep 17 00:00:00 2001 -From: Ming Liu -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: -| 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 ---- - 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 - diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 6b9253806f..e41a4b5096 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -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 index d0c0f30a98..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb +++ /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 index 0000000000..7eaf721ca8 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb @@ -0,0 +1,2 @@ +require u-boot-common.inc +require u-boot-tools.inc diff --git a/meta/recipes-bsp/u-boot/u-boot_2021.07.bb b/meta/recipes-bsp/u-boot/u-boot_2021.07.bb deleted file mode 100644 index c8dbe477e0..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot_2021.07.bb +++ /dev/null @@ -1,6 +0,0 @@ -require u-boot-common.inc -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" diff --git a/meta/recipes-bsp/u-boot/u-boot_2021.10.bb b/meta/recipes-bsp/u-boot/u-boot_2021.10.bb new file mode 100644 index 0000000000..617827ff08 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot_2021.10.bb @@ -0,0 +1,7 @@ +require u-boot-common.inc +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" + -- cgit 1.2.3-korg