diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2023-06-13 08:18:27 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2023-06-16 06:45:20 +0200 |
| commit | 4533b3d0a346ab974b59badc61c904f3adb55a84 (patch) | |
| tree | 7b5a026c3cc9844fdd55bc806327f8fdc70edd14 | |
| parent | a61e6ad76914a30a562ac01339c5d21f3283def8 (diff) | |
bootm: don't call booti_setup for EFI images
On the arm64 architecture booti_setup() is called for EFI FIT images.
This function call fails because EFI images typically do not have a
kernel signature.
Check that the operating system property "os" of the image is "linux"
before invoking booti_setup().
Fixes: 487b5fa6deb1 ("bootm: Handle kernel_noload on arm64")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | boot/bootm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/boot/bootm.c b/boot/bootm.c index 4144ff3b0318..75f0b4a9af8a 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -240,7 +240,8 @@ static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc, if (images.os.type == IH_TYPE_KERNEL_NOLOAD) { if (IS_ENABLED(CONFIG_CMD_BOOTI) && - images.os.arch == IH_ARCH_ARM64) { + images.os.arch == IH_ARCH_ARM64 && + images.os.os == IH_OS_LINUX) { ulong image_addr; ulong image_size; |