summaryrefslogtreecommitdiff
path: root/lib/libfdt
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-07-09 21:30:17 -0600
committerTom Rini <trini@konsulko.com>2017-07-10 08:39:24 -0400
commit2bf94120e9a1827ddaa1f11f4e9b909b2c03bc37 (patch)
treee1340164970bb9d79925e5f9196638c600246c73 /lib/libfdt
parentde88e4ba9f7d20292181c84252a1a6f7fa654072 (diff)
downloadu-boot-2bf94120e9a1827ddaa1f11f4e9b909b2c03bc37.tar.gz
u-boot-2bf94120e9a1827ddaa1f11f4e9b909b2c03bc37.tar.bz2
u-boot-2bf94120e9a1827ddaa1f11f4e9b909b2c03bc37.zip
libfdt: Drop -FDT_ERR_TOODEEP
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> Tested-by: Peter Robinson <pbrobinson@gmail.com>
Diffstat (limited to 'lib/libfdt')
-rw-r--r--lib/libfdt/fdt_region.c2
-rw-r--r--lib/libfdt/libfdt.h7
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) */