diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2019-05-21 19:19:12 +0200 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2019-07-10 16:52:58 -0600 |
| commit | 6998974926df9b41b299cd9f1aaff37649ca9971 (patch) | |
| tree | 123e5b6a057dcd5efcd703ae1454737f16904318 | |
| parent | 099ed45c6c6e88eb2783589027b610f2b9a2f71f (diff) | |
| download | u-boot-6998974926df9b41b299cd9f1aaff37649ca9971.tar.gz | |
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>
| -rw-r--r-- | drivers/core/util.c | 2 | ||||
| -rw-r--r-- | drivers/video/video-uclass.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/core/util.c b/drivers/core/util.c index 96e47dc707..60b939a924 100644 --- 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 b19bfb4f2f..d4071c0661 100644 --- 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; |