mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-08 08:16:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bootm: optee: 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.

Also drop the confusing check for the OS type, since do_bootm_tee() is
only called if the condition is met - see bootm_os_get_boot_func()

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

2
boot/bootm.c
View File

@ -584,7 +584,7 @@ static int bootm_find_other(struct cmd_tbl *cmdtp, int flag, int argc,
images.os.type == IH_TYPE_KERNEL_NOLOAD || images.os.type == IH_TYPE_KERNEL_NOLOAD ||
images.os.type == IH_TYPE_MULTI) && images.os.type == IH_TYPE_MULTI) &&
(images.os.os == IH_OS_LINUX || images.os.os == IH_OS_VXWORKS || (images.os.os == IH_OS_LINUX || images.os.os == IH_OS_VXWORKS ||
images.os.os == IH_OS_EFI)) images.os.os == IH_OS_EFI || images.os.os == IH_OS_TEE))
return bootm_find_images(flag, argc, argv, 0, 0); return bootm_find_images(flag, argc, argv, 0, 0);
return 0; return 0;

10
boot/bootm_os.c
View File

@ -460,11 +460,6 @@ static int do_bootm_tee(int flag, int argc, char *const argv[],
{ {
int ret; int ret;
/* Verify OS type */
if (images->os.os != IH_OS_TEE) {
return 1;
};
/* Validate OPTEE header */ /* Validate OPTEE header */
ret = optee_verify_bootm_image(images->os.image_start, ret = optee_verify_bootm_image(images->os.image_start,
images->os.load, images->os.load,
@ -472,11 +467,6 @@ static int do_bootm_tee(int flag, int argc, char *const argv[],
if (ret) if (ret)
return ret; return ret;
/* Locate FDT etc */
ret = bootm_find_images(flag, argc, argv, 0, 0);
if (ret)
return ret;
/* From here we can run the regular linux boot path */ /* From here we can run the regular linux boot path */
return do_bootm_linux(flag, argc, argv, images); return do_bootm_linux(flag, argc, argv, images);
} }