1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00

u-boot: Upgrade to 2023.07

Upgrade to U-Boot 2023.07.

Remove the patch that is now upstream.

(From OE-Core rev: 396f66ce025a5b2ae15cc82f2ac53664fd3d9dad)

Signed-off-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Fabio Estevam
2023-07-10 15:45:41 -03:00
committed by Richard Purdie
parent f18cee609b
commit 1911850576
5 changed files with 3 additions and 47 deletions
@@ -1,40 +0,0 @@
From dcd3d272975863128e25a4e25453cb6521cddc53 Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com>
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 <mingli.yu@windriver.com>
---
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
+1 -1
View 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 = "fd4ed6b7e83ec3aea9a2ce21baea8ca9676f40dd"
SRCREV = "05aa6516c6bb419d01d69fac457c0de563bfd694"
SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
@@ -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 \
"
@@ -0,0 +1,2 @@
require u-boot-common.inc
require u-boot-tools.inc