diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-30 14:49:17 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-30 14:49:17 -0500 |
| commit | 76404f86a24aa28efc26a296bf6ab9d697c60b9f (patch) | |
| tree | 94d44ddf983d8b5b9cdeeae6df5c9d7cff1142ab /arch/arm | |
| parent | 472a716b8fdfd88a27cb675e4ea8e12cb4f79fc3 (diff) | |
| parent | 18dd984c56b339be74e390df80fd3dc21b7a9b58 (diff) | |
Merge tag 'efi-2021-04-rc1-4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-04-rc1-4
Bug fixes:
* re-read the partition table after writing GPT
* fix a problem booting ARMv7 boards with PSCI without UEFI
* make aarch64 UEFI test programs compatible with GRUB linux command
* correct the alignment check in the EFI_BLOCK_IO_PROTOCOL
* check EFI_BLOCK_IO_PROTOCOL.Media->LastBlock in unit test
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/lib/crt0_aarch64_efi.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/lib/crt0_aarch64_efi.S b/arch/arm/lib/crt0_aarch64_efi.S index 368933ecf2..492195f765 100644 --- a/arch/arm/lib/crt0_aarch64_efi.S +++ b/arch/arm/lib/crt0_aarch64_efi.S @@ -18,7 +18,8 @@ .globl ImageBase ImageBase: .short IMAGE_DOS_SIGNATURE /* 'MZ' */ - .skip 58 /* 'MZ' + pad + offset == 64 */ + .skip 54 /* 'MZ' + pad + offset == 64 */ + .long LINUX_ARM64_MAGIC /* For GRUB's linux command */ .long pe_header - ImageBase /* Offset to the PE header */ pe_header: .long IMAGE_NT_SIGNATURE /* 'PE' */ |