diff options
| author | Simon Glass <sjg@chromium.org> | 2023-11-18 14:05:15 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-12-13 11:51:24 -0500 |
| commit | b020254d71ed0873baddb9b9bc6ec5bf1e82b26c (patch) | |
| tree | 608232e33cc5d42a2833d31ad7bff7538fc75f7d | |
| parent | e2fc90e5ad469b10c0d7abe54f5689957c88a518 (diff) | |
bootm: optee: Drop special call to bootm_find_other()
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>
| -rw-r--r-- | boot/bootm.c | 2 | ||||
| -rw-r--r-- | boot/bootm_os.c | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/boot/bootm.c b/boot/bootm.c index dc64de952c2..45491e3f30a 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -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_MULTI) && (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 0; diff --git a/boot/bootm_os.c b/boot/bootm_os.c index af25c9e7c81..b92422171a8 100644 --- a/boot/bootm_os.c +++ b/boot/bootm_os.c @@ -460,11 +460,6 @@ static int do_bootm_tee(int flag, int argc, char *const argv[], { int ret; - /* Verify OS type */ - if (images->os.os != IH_OS_TEE) { - return 1; - }; - /* Validate OPTEE header */ ret = optee_verify_bootm_image(images->os.image_start, images->os.load, @@ -472,11 +467,6 @@ static int do_bootm_tee(int flag, int argc, char *const argv[], if (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 */ return do_bootm_linux(flag, argc, argv, images); } |