diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-15 15:58:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-15 18:30:33 -0400 |
| commit | 6a86f1212656d4497b8980048907535f5294fabe (patch) | |
| tree | 0b57b0ce989476384c052e75d8314f1bc6e232d4 /lib/optee/optee.c | |
| parent | 86acfc96642b5de98ab1df90ee57e17453f47079 (diff) | |
| parent | a0ba216ed420a8953f57f777256f310370b95338 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-tegra
On merge, fixup order of fdtdec_add_reserved_memory parameters in
arch/arm/cpu/armv8/fsl-layerscape/soc.c
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'lib/optee/optee.c')
| -rw-r--r-- | lib/optee/optee.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/optee/optee.c b/lib/optee/optee.c index 766d0d9e3fa..b0362240446 100644 --- a/lib/optee/optee.c +++ b/lib/optee/optee.c @@ -161,6 +161,7 @@ int optee_copy_fdt_nodes(void *new_blob) .start = res.start, .end = res.end, }; + unsigned long flags = FDTDEC_RESERVED_MEMORY_NO_MAP; char *oldname, *nodename, *tmp; oldname = strdup(name); @@ -177,7 +178,8 @@ int optee_copy_fdt_nodes(void *new_blob) ret = fdtdec_add_reserved_memory(new_blob, nodename, &carveout, - NULL, true); + NULL, 0, + NULL, flags); free(oldname); if (ret < 0) |