diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-13 09:01:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-13 09:01:01 -0400 |
| commit | f9e3d2e147ee3b18dbc09e56d13e6fc8758ac375 (patch) | |
| tree | bd93f43be8a3ea14724aeb5686fbdcb80125623e /scripts | |
| parent | 8a1292ce3e21205645a155b23ac083a3fc6b64c1 (diff) | |
| parent | cea8f2c995b9d87af6ef42f967402e1c8a3506db (diff) | |
Merge tag 'dm-pull-12jun20' of git://git.denx.de/u-boot-dm into next
patman improvements to allow it to work with Zephyr
change to how sequence numbers are assigned to devices
minor fixes and improvements
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dtc/libfdt/fdt_overlay.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/dtc/libfdt/fdt_overlay.c b/scripts/dtc/libfdt/fdt_overlay.c index c090e6991ec..bd75e3dd786 100644 --- a/scripts/dtc/libfdt/fdt_overlay.c +++ b/scripts/dtc/libfdt/fdt_overlay.c @@ -757,7 +757,7 @@ static int overlay_symbol_update(void *fdt, void *fdto) && (memcmp(s, "/__overlay__", len - 1) == 0)) { /* /<fragment-name>/__overlay__ */ rel_path = ""; - rel_path_len = 0; + rel_path_len = 1; /* Include NUL character */ } else { /* Symbol refers to something that won't end * up in the target tree */ @@ -794,7 +794,7 @@ static int overlay_symbol_update(void *fdt, void *fdto) } ret = fdt_setprop_placeholder(fdt, root_sym, name, - len + (len > 1) + rel_path_len + 1, &p); + len + (len > 1) + rel_path_len, &p); if (ret < 0) return ret; @@ -820,7 +820,6 @@ static int overlay_symbol_update(void *fdt, void *fdto) buf[len] = '/'; memcpy(buf + len + 1, rel_path, rel_path_len); - buf[len + 1 + rel_path_len] = '\0'; } return 0; |