From: Simon Glass <sjg@chromium.org>
Date: Tue, 11 Oct 2022 15:47:15 +0000 (-0600)
Subject: boot: Pass the correct FDT to the EVT_FT_FIXUP event
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=33ba72700b586babfad7f5ef1e408b6b399fe0ec;p=u-boot.git

boot: Pass the correct FDT to the EVT_FT_FIXUP event

Now that we support multiple device trees with the ofnode interface, we
can pass the correct FDT to this event. This allows the 'working' FDT to
be fixed up, as expected, so long as OFNODE_MULTI_TREE is enabled.

Also make sure we don't try to do this with livetree, which does not
support fixups yet.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/boot/image-fdt.c b/boot/image-fdt.c
index f651940d9b..b830a0ab41 100644
--- a/boot/image-fdt.c
+++ b/boot/image-fdt.c
@@ -665,15 +665,18 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob,
 			goto err;
 		}
 	}
-	if (CONFIG_IS_ENABLED(EVENT)) {
+	if (!of_live_active() && CONFIG_IS_ENABLED(EVENT)) {
 		struct event_ft_fixup fixup;
 
-		fixup.tree = oftree_default();
+		fixup.tree = oftree_from_fdt(blob);
 		fixup.images = images;
-		ret = event_notify(EVT_FT_FIXUP, &fixup, sizeof(fixup));
-		if (ret) {
-			printf("ERROR: fdt fixup event failed: %d\n", ret);
-			goto err;
+		if (oftree_valid(fixup.tree)) {
+			ret = event_notify(EVT_FT_FIXUP, &fixup, sizeof(fixup));
+			if (ret) {
+				printf("ERROR: fdt fixup event failed: %d\n",
+				       ret);
+				goto err;
+			}
 		}
 	}