From: Chali Anis <[email protected]> add x86 linux filetype to be used to boot with efi stub bootm image handler.
Signed-off-by: Chali Anis <[email protected]> --- common/filetype.c | 4 ++++ include/filetype.h | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/common/filetype.c b/common/filetype.c index eb397a175cb6..8735d3b16723 100644 --- a/common/filetype.c +++ b/common/filetype.c @@ -87,6 +87,8 @@ static const struct filetype_str filetype_str[] = { [filetype_zstd_compressed] = { "ZSTD compressed", "zstd" }, [filetype_rockchip_rkss_image] = { "Rockchip signed boot image", "rk-image" }, + [filetype_x86_efi_linux_image] = { "X86 Linux/EFI image", + "x86-efi-linux" }, }; static const char *file_type_to_nr_string(enum filetype f) @@ -435,6 +437,8 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize) return is_dos_exe(buf8) ? filetype_riscv_efi_linux_image : filetype_riscv_linux_image; if (is_riscv_linux_bootimage(buf) && !memcmp(&buf[12], "barebox", 8)) return filetype_riscv_barebox_image; + if (bufsize > 0x206 && is_x86_linux_bootimage(buf)) + return filetype_x86_efi_linux_image; if (le32_to_cpu(buf[5]) == 0x504d5453) return filetype_mxs_bootstream; diff --git a/include/filetype.h b/include/filetype.h index 6f4a103df304..7ca9fe2158cb 100644 --- a/include/filetype.h +++ b/include/filetype.h @@ -67,6 +67,7 @@ enum filetype { filetype_nxp_fspi_image, filetype_zstd_compressed, filetype_rockchip_rkss_image, + filetype_x86_efi_linux_image, filetype_max, }; @@ -150,4 +151,9 @@ static inline bool is_riscv_linux_bootimage(const void *header) return le32_to_cpup(header + 56) == 0x05435352; } +static inline bool is_x86_linux_bootimage(const void *header) +{ + return le32_to_cpup(header + 0x202) == 0x53726448; +} + #endif /* __FILE_TYPE_H */ -- 2.34.1
