fdt: Allow indicating a node is for U-Boot proper only

This add missing parts for previous commit 06f94461a9f4
("fdt: Allow indicating a node is for U-Boot proper only")

At present it is not possible to specify that a node should be used before
relocation (in U-Boot proper) without it also ending up in SPL and TPL
device trees. Add a new "u-boot,dm-pre-proper" boolean property for this.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/util.c b/drivers/core/util.c
index 96e47dc70709d473c134b4dc6427bc98035ff427..60b939a92401fee3bf4a5a36a3992f1f4dfd8292 100644 (file)
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -42,6 +42,8 @@ bool dm_ofnode_pre_reloc(ofnode node)
 #else
        if (ofnode_read_bool(node, "u-boot,dm-pre-reloc"))
                return true;
+       if (ofnode_read_bool(node, "u-boot,dm-pre-proper"))
+               return true;
 
        /*
         * In regular builds individual spl and tpl handling both

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index b19bfb4f2ff587e821c959afd511ad289737da8d..d4071c06615e82fc03806c46e01c77f2f3f2acc3 100644 (file)
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -291,7 +291,9 @@ static int video_post_bind(struct udevice *dev)
                return 0;
        size = alloc_fb(dev, &addr);
        if (addr < gd->video_bottom) {
-               /* Device tree node may need the 'u-boot,dm-pre-reloc' tag */
+               /* Device tree node may need the 'u-boot,dm-pre-reloc' or
+                * 'u-boot,dm-pre-proper' tag
+                */
                printf("Video device '%s' cannot allocate frame buffer memory -ensure the device is set up before relocation\n",
                       dev->name);
                return -ENOSPC;