diff options
| author | Tom Rini <trini@konsulko.com> | 2024-12-12 16:35:47 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-12-12 16:35:47 -0600 |
| commit | 1fdf53ace13f745fe8ad4d2d4e79eed98088d555 (patch) | |
| tree | 94f48a0eb15db6ce3da3953ae4e6d98623d6edae /boot/bootdev-uclass.c | |
| parent | e5aef1bbf11412eebd4c242b46adff5301353c30 (diff) | |
| parent | f0315babfb43c6d1f5d4ff0ea7554ec2c27bf7b1 (diff) | |
Merge patch series "vbe: Series part E"
Simon Glass <sjg@chromium.org> says:
This includes various patches towards implementing the VBE abrec
bootmeth in U-Boot. It mostly focuses on SPL tweaks and adjusting what
fatures are available in VPL.
Link: https://lore.kernel.org/r/20241207172412.1124558-1-sjg@chromium.org
Diffstat (limited to 'boot/bootdev-uclass.c')
| -rw-r--r-- | boot/bootdev-uclass.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 64ec4fde493..2e61c853142 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -16,6 +16,7 @@ #include <malloc.h> #include <part.h> #include <sort.h> +#include <spl.h> #include <dm/device-internal.h> #include <dm/lists.h> #include <dm/uclass-internal.h> @@ -278,8 +279,13 @@ int bootdev_setup_for_sibling_blk(struct udevice *blk, const char *drv_name) int ret, len; len = bootdev_get_suffix_start(blk, ".blk"); - snprintf(dev_name, sizeof(dev_name), "%.*s.%s", len, blk->name, - "bootdev"); + if (xpl_phase() < PHASE_BOARD_R) { + strlcpy(dev_name, blk->name, sizeof(dev_name) - 5); + strcat(dev_name, ".sib"); + } else { + snprintf(dev_name, sizeof(dev_name), "%.*s.%s", len, blk->name, + "bootdev"); + } parent = dev_get_parent(blk); ret = device_find_child_by_name(parent, dev_name, &dev); |