diff options
| author | Rex-BC Chen <rex-bc.chen@mediatek.corp-partner.google.com> | 2021-07-15 17:47:47 +0800 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2021-10-04 02:31:01 +0000 |
| commit | 5020fe34493e6ac693cf5c2bf9f97ecbdfafe7bb (patch) | |
| tree | fe2569b0a15a7fa714ebd80f65fcc28edfbbef3e | |
| parent | 880acbe2f4f644f427968badef2c57fb415b9c3a (diff) | |
util/cbfstool: Add support for ARM64 UefiPayload
UEFI payload is supported on some ARM64 platforms, for example MT8195.
As a result, add MACHINE_TYPE_ARM64 to support ARM SystemReady.
Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
Change-Id: I4c0c6e263bd2f518a62ff9db44d72dd31086756a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58055
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
| -rw-r--r-- | util/cbfstool/cbfs-mkpayload.c | 4 | ||||
| -rw-r--r-- | util/cbfstool/coff.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c index 5341337a85..e1a3272ca9 100644 --- a/util/cbfstool/cbfs-mkpayload.c +++ b/util/cbfstool/cbfs-mkpayload.c @@ -359,7 +359,7 @@ int parse_fv_to_payload(const struct buffer *input, struct buffer *output, loadaddress = ph->image_addr - dh_offset; entrypoint = ph->image_addr + ph->entry_point; - } else if (ch->machine == MACHINE_TYPE_X64) { + } else if (ch->machine == MACHINE_TYPE_X64 || ch->machine == MACHINE_TYPE_ARM64) { pe_opt_header_64_t *ph; ph = (pe_opt_header_64_t *)&ch[1]; if (ph->signature != PE_HDR_64_MAGIC) { @@ -372,7 +372,7 @@ int parse_fv_to_payload(const struct buffer *input, struct buffer *output, loadaddress = ph->image_addr - dh_offset; entrypoint = ph->image_addr + ph->entry_point; } else { - ERROR("Machine type not x86 or x64.\n"); + ERROR("Machine type not x86, x64, or arm64.\n"); return -1; } diff --git a/util/cbfstool/coff.h b/util/cbfstool/coff.h index 316bfd30a4..37cbfd3ddb 100644 --- a/util/cbfstool/coff.h +++ b/util/cbfstool/coff.h @@ -25,6 +25,7 @@ typedef struct { #define MACHINE_TYPE_X86 0x014c #define MACHINE_TYPE_X64 0x8664 +#define MACHINE_TYPE_ARM64 0xAA64 typedef struct { uint8_t signature[4]; uint16_t machine; |