diff options
| author | Tom Rini <trini@konsulko.com> | 2023-06-16 19:05:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-06-16 19:05:52 -0400 |
| commit | 1c30e10017ec8bcd0ffec0d8c7d17539ae73dfa7 (patch) | |
| tree | 6120a7d1a99c25b50896a7d932d431145570f5a4 /boot/bootm.c | |
| parent | 2f4664f5c3edc55b18d8906f256a4c8e303243c0 (diff) | |
| parent | 5669591dd8d2b21bc79237b161107300eb7f2b12 (diff) | |
Merge tag 'efi-2023-07-rc5' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2023-07-rc5
Documentation:
* man-page for imxtract
* correct EVT_DM_POST_INIT_F description
UEFI:
* bootm: don't call booti_setup for EFI images
* simplify efi_disk_remove
* fix tests that failed when executed repeatedly
Diffstat (limited to 'boot/bootm.c')
| -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 4144ff3b031..75f0b4a9af8 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; |