diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-03 15:39:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-03 15:39:46 -0400 |
| commit | 2d4591353452638132d711551fec3495b7644731 (patch) | |
| tree | e12058de7f553e84f8d13e545f130c7a48973589 /lib/of_live.c | |
| parent | 4debc57a3da6c3f4d3f89a637e99206f4cea0a96 (diff) | |
| parent | 6ee6e15975cad3c99fad3a66223f3fd9287a369b (diff) | |
| download | u-boot-WIP/03Oct2022.zip u-boot-WIP/03Oct2022.tar.gz u-boot-WIP/03Oct2022.tar.bz2 | |
Merge branch 'next'WIP/03Oct2022
Diffstat (limited to 'lib/of_live.c')
| -rw-r--r-- | lib/of_live.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/of_live.c b/lib/of_live.c index 30cae9a..1b5964d 100644 --- a/lib/of_live.c +++ b/lib/of_live.c @@ -97,6 +97,10 @@ static void *unflatten_dt_node(const void *blob, void *mem, int *poffset, char *fn; fn = (char *)np + sizeof(*np); + if (new_format) { + np->name = pathp; + has_name = 1; + } np->full_name = fn; if (new_format) { /* rebuild full path for new format */ @@ -202,7 +206,8 @@ static void *unflatten_dt_node(const void *blob, void *mem, int *poffset, } if (!dryrun) { *prev_pp = NULL; - np->name = of_get_property(np, "name", NULL); + if (!has_name) + np->name = of_get_property(np, "name", NULL); np->type = of_get_property(np, "device_type", NULL); if (!np->name) |