GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Rex-BC Chen 2021-07-15 17:47:47 +08:00 committed by Stefan Reinauer
parent 880acbe2f4
commit 5020fe3449
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/cbfstool/cbfs-mkpayload.c
View File

@ -359,7 +359,7 @@ int parse_fv_to_payload(const struct buffer *input, struct buffer *output,
loadaddress = ph->image_addr - dh_offset; loadaddress = ph->image_addr - dh_offset;
entrypoint = ph->image_addr + ph->entry_point; 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; pe_opt_header_64_t *ph;
ph = (pe_opt_header_64_t *)&ch[1]; ph = (pe_opt_header_64_t *)&ch[1];
if (ph->signature != PE_HDR_64_MAGIC) { 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; loadaddress = ph->image_addr - dh_offset;
entrypoint = ph->image_addr + ph->entry_point; entrypoint = ph->image_addr + ph->entry_point;
} else { } else {
ERROR("Machine type not x86 or x64.\n"); ERROR("Machine type not x86, x64, or arm64.\n");
return -1; return -1;
} }

1
util/cbfstool/coff.h
View File

@ -25,6 +25,7 @@ typedef struct {
#define MACHINE_TYPE_X86 0x014c #define MACHINE_TYPE_X86 0x014c
#define MACHINE_TYPE_X64 0x8664 #define MACHINE_TYPE_X64 0x8664
#define MACHINE_TYPE_ARM64 0xAA64
typedef struct { typedef struct {
uint8_t signature[4]; uint8_t signature[4];
uint16_t machine; uint16_t machine;