summaryrefslogtreecommitdiff
path: root/tools/libfdt
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-10-27 09:47:42 -0600
committerSimon Glass <sjg@chromium.org>2019-11-04 18:15:32 -0700
commitf0921f5098d8d98ac38121837aaf7c4b4cb13bb4 (patch)
treeecbd4c33b75188ed1af4b73b9385867c33d0e6d7 /tools/libfdt
parente9bae5c5341aaf9911a776f5b60bf9c0c3c2d59c (diff)
downloadu-boot-f0921f5098d8d98ac38121837aaf7c4b4cb13bb4.tar.gz
u-boot-f0921f5098d8d98ac38121837aaf7c4b4cb13bb4.tar.bz2
u-boot-f0921f5098d8d98ac38121837aaf7c4b4cb13bb4.zip
fdt: Sync up to the latest libfdt
Bring over the fdt from this commit: 430419c (origin/master) tests: fix some python warnings adding in the 'assumptions' series designed to reduce code size. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/libfdt')
-rw-r--r--tools/libfdt/fdt_rw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/libfdt/fdt_rw.c b/tools/libfdt/fdt_rw.c
index 68fc7c8c88..7189f01429 100644
--- a/tools/libfdt/fdt_rw.c
+++ b/tools/libfdt/fdt_rw.c
@@ -11,6 +11,7 @@ int fdt_remove_unused_strings(const void *old, void *new)
const char *str;
int ret;
int tag = FDT_PROP;
+ int allocated;
/* Make a copy and remove the strings */
memcpy(new, old, size);
@@ -25,7 +26,7 @@ int fdt_remove_unused_strings(const void *old, void *new)
new_prop = (struct fdt_property *)(unsigned long)
fdt_get_property_by_offset(new, offset, NULL);
str = fdt_string(old, fdt32_to_cpu(old_prop->nameoff));
- ret = fdt_find_add_string_(new, str);
+ ret = fdt_find_add_string_(new, str, &allocated);
if (ret < 0)
return ret;
new_prop->nameoff = cpu_to_fdt32(ret);