summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-07-20 12:23:59 -0600
committerSimon Glass <sjg@chromium.org>2019-07-29 09:38:06 -0600
commit89d66907b37b2578b0e998faf3ba8ef66c6a7606 (patch)
tree0e0267724e1bdc7b3751b24fcd9f429bd048eefd
parent61ec04f9eda413664e5c11a6099c89a44b73b5b9 (diff)
libfdt: Copy the struct region in fdt_resize()
At present this function appears to copy only the data before the struct region and the data in the string region. It does not seem to copy the struct region itself. >From the arguments of this function it seems that it should support fdt and buf being different. This patch attempts to fix this problem. Upstream commit: c72fa77 libfdt: Copy the struct region in fdt_resize() Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--scripts/dtc/libfdt/fdt_sw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/dtc/libfdt/fdt_sw.c b/scripts/dtc/libfdt/fdt_sw.c
index 6d33cc29d0..d8ef748a72 100644
--- a/scripts/dtc/libfdt/fdt_sw.c
+++ b/scripts/dtc/libfdt/fdt_sw.c
@@ -114,7 +114,7 @@ int fdt_resize(void *fdt, void *buf, int bufsize)
FDT_SW_CHECK_HEADER(fdt);
- headsize = fdt_off_dt_struct(fdt);
+ headsize = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt);
tailsize = fdt_size_dt_strings(fdt);
if ((headsize + tailsize) > bufsize)