* [PATCH] optee: copy FDT OP-TEE related nodes before generic FDT changes
@ 2020-06-05 7:22 Patrick Delaunay
2020-09-30 18:35 ` Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Patrick Delaunay @ 2020-06-05 7:22 UTC (permalink / raw)
To: u-boot
From: Etienne Carriere <etienne.carriere@linaro.org>
Move call to optee_copy_fdt_nodes() introduced by [1] before generic
changes in kernel FDT so that platform specific changes are not
overridden by the changes made by this function.
Link: [1] commit 6ccb05eae01b ("image: fdt: copy possible optee nodes to a loaded devicetree")
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---
common/image-fdt.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/common/image-fdt.c b/common/image-fdt.c
index b63e772bd6..041382447e 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -547,6 +547,14 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
printf("ERROR: arch-specific fdt fixup failed\n");
goto err;
}
+
+ fdt_ret = optee_copy_fdt_nodes(gd->fdt_blob, blob);
+ if (fdt_ret) {
+ printf("ERROR: transfer of optee nodes to new fdt failed: %s\n",
+ fdt_strerror(fdt_ret));
+ goto err;
+ }
+
/* Update ethernet nodes */
fdt_fixup_ethernet(blob);
if (IMAGE_OF_BOARD_SETUP) {
@@ -566,13 +574,6 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
}
}
- fdt_ret = optee_copy_fdt_nodes(gd->fdt_blob, blob);
- if (fdt_ret) {
- printf("ERROR: transfer of optee nodes to new fdt failed: %s\n",
- fdt_strerror(fdt_ret));
- goto err;
- }
-
/* Delete the old LMB reservation */
if (lmb)
lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob,
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] optee: copy FDT OP-TEE related nodes before generic FDT changes
2020-06-05 7:22 [PATCH] optee: copy FDT OP-TEE related nodes before generic FDT changes Patrick Delaunay
@ 2020-09-30 18:35 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2020-09-30 18:35 UTC (permalink / raw)
To: u-boot
On Fri, Jun 05, 2020 at 09:22:54AM +0200, Patrick Delaunay wrote:
> From: Etienne Carriere <etienne.carriere@linaro.org>
>
> Move call to optee_copy_fdt_nodes() introduced by [1] before generic
> changes in kernel FDT so that platform specific changes are not
> overridden by the changes made by this function.
>
> Link: [1] commit 6ccb05eae01b ("image: fdt: copy possible optee nodes to a loaded devicetree")
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
With a slight reword to uses a Fixes tag:
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200930/8a30b3b1/attachment.sig>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-30 18:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-05 7:22 [PATCH] optee: copy FDT OP-TEE related nodes before generic FDT changes Patrick Delaunay
2020-09-30 18:35 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.