diff options
| author | Tom Rini <trini@konsulko.com> | 2023-02-14 15:11:37 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-14 15:11:37 -0500 |
| commit | 2bfd217a16978794b43f0a30111b7472fba232b6 (patch) | |
| tree | dfac18d00740bfc8c29da90e62dfb18765bb2143 /drivers | |
| parent | faac9dee8e0629326dc122f4624fc4897e3f38b0 (diff) | |
| parent | 9a8a27a76ad7ab51f19c7f019d7cdac8a3f9f3c9 (diff) | |
| download | u-boot-2bfd217a16978794b43f0a30111b7472fba232b6.zip u-boot-2bfd217a16978794b43f0a30111b7472fba232b6.tar.gz u-boot-2bfd217a16978794b43f0a30111b7472fba232b6.tar.bz2 | |
Merge tag 'dm-next-valentine' of https://source.denx.de/u-boot/custodians/u-boot-dm into nextWIP/14Feb2023-next
Move U-Boot over to the new schema for driver model tags
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/core/ofnode.c | 22 | ||||
| -rw-r--r-- | drivers/video/video-uclass.c | 4 |
2 files changed, 19 insertions, 7 deletions
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index d08578e..f49ee49 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -1312,24 +1312,36 @@ bool ofnode_pre_reloc(ofnode node) { #if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD) /* for SPL and TPL the remaining nodes after the fdtgrep 1st pass - * had property dm-pre-reloc or u-boot,dm-spl/tpl. + * had property bootph-all or bootph-pre-sram/bootph-pre-ram. * They are removed in final dtb (fdtgrep 2nd pass) */ return true; #else - if (ofnode_read_bool(node, "u-boot,dm-pre-reloc")) + if (ofnode_read_bool(node, "bootph-all")) return true; - if (ofnode_read_bool(node, "u-boot,dm-pre-proper")) + if (ofnode_read_bool(node, "bootph-some-ram")) return true; /* * In regular builds individual spl and tpl handling both * count as handled pre-relocation for later second init. */ - if (ofnode_read_bool(node, "u-boot,dm-spl") || - ofnode_read_bool(node, "u-boot,dm-tpl")) + if (ofnode_read_bool(node, "bootph-pre-ram") || + ofnode_read_bool(node, "bootph-pre-sram")) return true; + if (IS_ENABLED(CONFIG_OF_TAG_MIGRATE)) { + /* detect and handle old tags */ + if (ofnode_read_bool(node, "u-boot,dm-pre-reloc") || + ofnode_read_bool(node, "u-boot,dm-pre-proper") || + ofnode_read_bool(node, "u-boot,dm-spl") || + ofnode_read_bool(node, "u-boot,dm-tpl") || + ofnode_read_bool(node, "u-boot,dm-vpl")) { + gd->flags |= GD_FLG_OF_TAG_MIGRATE; + return true; + } + } + return false; #endif } diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 6aaacff..ab482f1 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -529,8 +529,8 @@ static int video_post_bind(struct udevice *dev) addr = uc_priv->video_ptr; size = alloc_fb(dev, &addr); if (addr < gd->video_bottom) { - /* Device tree node may need the 'u-boot,dm-pre-reloc' or - * 'u-boot,dm-pre-proper' tag + /* Device tree node may need the 'bootph-all' or + * 'bootph-some-ram' tag */ printf("Video device '%s' cannot allocate frame buffer memory -ensure the device is set up before relocation\n", dev->name); |