From: Fabio Estevam <[email protected]> Upgrade to U-Boot 2023.07.
Remove the patch that is now upstream. Signed-off-by: Fabio Estevam <[email protected]> --- ...mkimage-Use-PATH_MAX-for-path-length.patch | 40 ------------------- meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +- .../u-boot/u-boot-tools_2023.04.bb | 6 --- .../u-boot/u-boot-tools_2023.07.bb | 2 + .../{u-boot_2023.04.bb => u-boot_2023.07.bb} | 0 5 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/0001-mkimage-Use-PATH_MAX-for-path-length.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot-tools_2023.04.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-tools_2023.07.bb rename meta/recipes-bsp/u-boot/{u-boot_2023.04.bb => u-boot_2023.07.bb} (100%) diff --git a/meta/recipes-bsp/u-boot/files/0001-mkimage-Use-PATH_MAX-for-path-length.patch b/meta/recipes-bsp/u-boot/files/0001-mkimage-Use-PATH_MAX-for-path-length.patch deleted file mode 100644 index 9f38736bcd..0000000000 --- a/meta/recipes-bsp/u-boot/files/0001-mkimage-Use-PATH_MAX-for-path-length.patch +++ /dev/null @@ -1,40 +0,0 @@ -From dcd3d272975863128e25a4e25453cb6521cddc53 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <[email protected]> -Date: Wed, 14 Jun 2023 16:09:59 +0800 -Subject: [PATCH] mkimage: Use PATH_MAX for path length - -Fixed when build xilinx_zynqmp in long directory ( >256): - | /buildarea1/testtest/wr_build/wr1023test_secureboot/test1-what/test2-what/test3-what/test4-what/test5-what/test6-what/test7-what/test8-what/test9-what/test10-what/test11-what/test12-what/build/tmp-glibc/work/xilinx_zynqmp-wrs-linux/u-boot-xlnx/1_v2023.01-xilinx-v2023.1+gitAUTOINC+40a08d69e7-r0/build/fitImage-linux: Image file name (uboot-mkimage) too long, can't create tmpfile. - | Error: Bad parameters for FIT image type - -Upstream-Status: Backport [https://source.denx.de/u-boot/u-boot/-/commit/99d430f344bfdb0641022fd3efa26c29c957df02] - -Signed-off-by: Mingli Yu <[email protected]> ---- - tools/mkimage.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/mkimage.h b/tools/mkimage.h -index f5ca65e2ed..d92a3ff811 100644 ---- a/tools/mkimage.h -+++ b/tools/mkimage.h -@@ -17,6 +17,7 @@ - #include <sys/stat.h> - #include <time.h> - #include <unistd.h> -+#include <limits.h> - #include <u-boot/sha1.h> - #include "fdt_host.h" - #include "imagetool.h" -@@ -44,7 +45,7 @@ static inline ulong map_to_sysmem(void *ptr) - #define ALLOC_CACHE_ALIGN_BUFFER(type, name, size) type name[size] - - #define MKIMAGE_TMPFILE_SUFFIX ".tmp" --#define MKIMAGE_MAX_TMPFILE_LEN 256 -+#define MKIMAGE_MAX_TMPFILE_LEN PATH_MAX - #define MKIMAGE_DEFAULT_DTC_OPTIONS "-I dts -O dtb -p 500" - #define MKIMAGE_MAX_DTC_CMDLINE_LEN 2 * MKIMAGE_MAX_TMPFILE_LEN + 35 - --- -2.25.1 - diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 8a2e9aef94..eefa6cd8f4 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 = "fd4ed6b7e83ec3aea9a2ce21baea8ca9676f40dd" +SRCREV = "05aa6516c6bb419d01d69fac457c0de563bfd694" SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2023.04.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2023.04.bb deleted file mode 100644 index b77a49af87..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-tools_2023.04.bb +++ /dev/null @@ -1,6 +0,0 @@ -require u-boot-common.inc -require u-boot-tools.inc - -SRC_URI += " \ - file://0001-mkimage-Use-PATH_MAX-for-path-length.patch \ -" diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2023.07.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2023.07.bb new file mode 100644 index 0000000000..7eaf721ca8 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-tools_2023.07.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_2023.04.bb b/meta/recipes-bsp/u-boot/u-boot_2023.07.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot_2023.04.bb rename to meta/recipes-bsp/u-boot/u-boot_2023.07.bb -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#184093): https://lists.openembedded.org/g/openembedded-core/message/184093 Mute This Topic: https://lists.openembedded.org/mt/100064063/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
