add patch to fix build
This commit is contained in:
parent
474fcc7da7
commit
351aa9ad5c
|
@ -0,0 +1,57 @@
|
|||
From patchwork Mon Jul 10 03:30:17 2017
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] libfdt: Drop -FDT_ERR_TOODEEP
|
||||
From: Simon Glass <sjg@chromium.org>
|
||||
X-Patchwork-Id: 786042
|
||||
Message-Id: <20170710033017.161092-1-sjg@chromium.org>
|
||||
To: U-Boot Mailing List <u-boot@lists.denx.de>
|
||||
Cc: Tom Rini <trini@konsulko.com>,
|
||||
Devicetree Compiler <devicetree-compiler@vger.kernel.org>
|
||||
Date: Sun, 9 Jul 2017 21:30:17 -0600
|
||||
|
||||
This error code has not been upstreamed and is not really needed since it
|
||||
is unlikely to be triggered. Drop it to maintain compatability with
|
||||
upstream.
|
||||
|
||||
Reported-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
|
||||
Signed-off-by: Simon Glass <sjg@chromium.org>
|
||||
---
|
||||
|
||||
lib/libfdt/fdt_region.c | 2 +-
|
||||
lib/libfdt/libfdt.h | 7 +------
|
||||
2 files changed, 2 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c
|
||||
index 8b8a547555..63099f1d96 100644
|
||||
--- a/lib/libfdt/fdt_region.c
|
||||
+++ b/lib/libfdt/fdt_region.c
|
||||
@@ -397,7 +397,7 @@ int fdt_next_region(const void *fdt,
|
||||
last_node = offset;
|
||||
p.depth++;
|
||||
if (p.depth == FDT_MAX_DEPTH)
|
||||
- return -FDT_ERR_TOODEEP;
|
||||
+ return -FDT_ERR_BADSTRUCTURE;
|
||||
name = fdt_get_name(fdt, offset, &len);
|
||||
if (p.end - path + 2 + len >= path_len)
|
||||
return -FDT_ERR_NOSPACE;
|
||||
diff --git a/lib/libfdt/libfdt.h b/lib/libfdt/libfdt.h
|
||||
index 2f7ebf8e06..f3f9cad184 100644
|
||||
--- a/lib/libfdt/libfdt.h
|
||||
+++ b/lib/libfdt/libfdt.h
|
||||
@@ -93,12 +93,7 @@
|
||||
/* FDT_ERR_NOPHANDLES: The device tree doesn't have any
|
||||
* phandle available anymore without causing an overflow */
|
||||
|
||||
-#define FDT_ERR_TOODEEP 18
|
||||
- /* FDT_ERR_TOODEEP: The depth of a node has exceeded the internal
|
||||
- * libfdt limit. This can happen if you have more than
|
||||
- * FDT_MAX_DEPTH nested nodes. */
|
||||
-
|
||||
-#define FDT_ERR_MAX 18
|
||||
+#define FDT_ERR_MAX 17
|
||||
|
||||
/**********************************************************************/
|
||||
/* Low-level functions (you probably don't need these) */
|
|
@ -19,6 +19,7 @@ Patch3: mx6cuboxi-Add-support-for-sata.patch
|
|||
Patch4: mx6-Initial-Hummingboard-2-support.patch
|
||||
Patch5: uefi-fixes.patch
|
||||
Patch6: use-Fedora-specific-EFI-path-name.patch
|
||||
Patch7: U-Boot-libfdt-Drop--FDT_ERR_TOODEEP.patch
|
||||
|
||||
# Patch11: sti-STiH410-B2260-support.patch
|
||||
# Patch12: AW64-add-spl-atf-support.patch
|
||||
|
|
Loading…
Reference in New Issue