diff options
| author | Tom Rini <trini@konsulko.com> | 2024-12-12 21:07:26 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-12-12 21:07:26 -0600 |
| commit | a33185173dce550d6ecb96b7fa625bb5e2183d66 (patch) | |
| tree | add17fdeadcdddc9eb7922c7c09486027812df40 /boot/bootdev-uclass.c | |
| parent | 1fdf53ace13f745fe8ad4d2d4e79eed98088d555 (diff) | |
Revert "Merge patch series "vbe: Series part E""
This reverts commit 1fdf53ace13f745fe8ad4d2d4e79eed98088d555, reversing
changes made to e5aef1bbf11412eebd4c242b46adff5301353c30.
I had missed that this caused too much size growth on rcar3_salvator-x.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'boot/bootdev-uclass.c')
| -rw-r--r-- | boot/bootdev-uclass.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 2e61c853142..64ec4fde493 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -16,7 +16,6 @@ #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> @@ -279,13 +278,8 @@ int bootdev_setup_for_sibling_blk(struct udevice *blk, const char *drv_name) int ret, len; len = bootdev_get_suffix_start(blk, ".blk"); - 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"); - } + 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); |