smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootm: efi: Drop special call to bootm_find_other()

Browse Source 
The normal bootm flow calls bootm_find_other() can call the
BOOTM_STATE_FINDOTHER state as part of its processing. Fix the
condition there so that this hack can be removed.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2023-11-18 14:05:14 -07:00
committed by Tom Rini
parent 46aee252af
commit e2fc90e5ad
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
boot/bootm.c
View File

@@ -580,11 +580,11 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start,
static int bootm_find_other(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
if (((images.os.type == IH_TYPE_KERNEL) ||
(images.os.type == IH_TYPE_KERNEL_NOLOAD) ||
(images.os.type == IH_TYPE_MULTI)) &&
(images.os.os == IH_OS_LINUX ||
images.os.os == IH_OS_VXWORKS))
if ((images.os.type == IH_TYPE_KERNEL ||
images.os.type == IH_TYPE_KERNEL_NOLOAD ||
images.os.type == IH_TYPE_MULTI) &&
(images.os.os == IH_OS_LINUX || images.os.os == IH_OS_VXWORKS ||
images.os.os == IH_OS_EFI))
return bootm_find_images(flag, argc, argv, 0, 0);
return 0;

6
boot/bootm_os.c
View File

@@ -486,18 +486,12 @@ static int do_bootm_tee(int flag, int argc, char *const argv[],
static int do_bootm_efi(int flag, int argc, char *const argv[],
struct bootm_headers *images)
{
int ret;
efi_status_t efi_ret;
void *image_buf;
if (flag != BOOTM_STATE_OS_GO)
return 0;
/* Locate FDT, if provided */
ret = bootm_find_images(flag, argc, argv, 0, 0);
if (ret)
return ret;
/* Initialize EFI drivers */
efi_ret = efi_init_obj_list();
if (efi_ret != EFI_SUCCESS) {