mirror of
https://github.com/u-boot/u-boot.git
synced 2025-05-09 03:21:51 +00:00
Revert "Merge patch series "vbe: Series part E""
This reverts commit1fdf53ace1
, reversing changes made toe5aef1bbf1
. I had missed that this caused too much size growth on rcar3_salvator-x. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
1fdf53ace1
commit
a33185173d
18 changed files with 68 additions and 267 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue