[PATCH v2] optee: copy FDT OP-TEE related nodes before generic FDT changes

[Patrick Delaunay]

From: Etienne Carriere <etienne.carriere at 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")

Fixes: 6ccb05eae01b ('image: fdt: copy possible optee nodes to a loaded devicetree')
Signed-off-by: Etienne Carriere <etienne.carriere at linaro.org>
Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
---

Changes in v2:
- rebase on master branch
- add Fixes tag

 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 f13eefb061..3d6935ad40 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -557,6 +557,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) {
@@ -576,13 +584,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