diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-17 21:15:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-17 21:15:23 -0500 |
| commit | fd8adc33b8f999cb09c3ba8ea8860ded28e8d6ca (patch) | |
| tree | 0928b768f2cf5951384fedb5aa25ce9260a6d6b2 /lib/fdtdec.c | |
| parent | 14b254b5f5a841e1227e3667cf94fbcdadaf720e (diff) | |
| parent | 677dac23d8ebfc0342f903aeee2a75e737fd4d7e (diff) | |
Merge tag 'dm-pull-14nov19' of git://git.denx.de/u-boot-dm
Add OP-TEE test swuit
Fix patman cc_file output
Minor sandbox/pinctrl changes
Diffstat (limited to 'lib/fdtdec.c')
| -rw-r--r-- | lib/fdtdec.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 125d9dbf26..61af3472e6 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1309,7 +1309,8 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename, } if (addr == carveout->start && (addr + size) == carveout->end) { - *phandlep = fdt_get_phandle(blob, node); + if (phandlep) + *phandlep = fdt_get_phandle(blob, node); return 0; } } @@ -1338,13 +1339,15 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename, if (node < 0) return node; - err = fdt_generate_phandle(blob, &phandle); - if (err < 0) - return err; + if (phandlep) { + err = fdt_generate_phandle(blob, &phandle); + if (err < 0) + return err; - err = fdtdec_set_phandle(blob, node, phandle); - if (err < 0) - return err; + err = fdtdec_set_phandle(blob, node, phandle); + if (err < 0) + return err; + } /* store one or two address cells */ if (na > 1) |