diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-05 07:59:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-05 07:59:28 -0500 |
| commit | b62553736e0131b88befad128a2dd40c75e3293c (patch) | |
| tree | 8164b210b7788aae0e86ce143e35240013b9d0c6 /tools/libfdt/fdt_rw.c | |
| parent | 73b6e6ad254b36763419cdd3fdf406c0094517b7 (diff) | |
| parent | 388560134b99dc4cc752627d3a7e9f8c8c2a89a7 (diff) | |
Merge tag 'fdt-pull-5nov19' of git://git.denx.de/u-boot-fdt
Update to latest libfdt and pylibfdt, with added size control
Update binman, dtoc, patman, buildman to Python 3
Update move_config, rkmux, microcode_tool to Python 3
Diffstat (limited to 'tools/libfdt/fdt_rw.c')
| -rw-r--r-- | tools/libfdt/fdt_rw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/libfdt/fdt_rw.c b/tools/libfdt/fdt_rw.c index 68fc7c8c887..7189f014295 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); |