diff options
| author | Tom Rini <[email protected]> | 2021-08-15 13:42:42 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-08-15 13:42:42 -0400 |
| commit | fdc4fda33051bcb9eb782001afe2bdd3c0d09eae (patch) | |
| tree | 24dac98ec7eb2c13c8d35275c4cd2a8a37debf44 /arch | |
| parent | 85ccbf666e549f0b06c29d565b9e4fdd87cf6600 (diff) | |
| parent | 61ee780352e054df587d8781f23b323c967b5d2a (diff) | |
Merge tag 'efi-2021-10-rc2-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2021-10-rc2-2
Documentation:
* Require Sphinx >= 2.4.4 for 'make htmldocs'
* Move devicetree documentation to restructured text and update it
* Document stm32mp1 devicetree bindings
UEFI
* Extend measurement to UEFI variables and ExitBootServices()
* Support Uri() node in devicetree to text protocol
* Add Linux magic token to RISC-V EFI test binaries
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/riscv/lib/crt0_riscv_efi.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/riscv/lib/crt0_riscv_efi.S b/arch/riscv/lib/crt0_riscv_efi.S index e7c4d99c21c..b0a7a39a722 100644 --- a/arch/riscv/lib/crt0_riscv_efi.S +++ b/arch/riscv/lib/crt0_riscv_efi.S @@ -33,7 +33,10 @@ .globl ImageBase ImageBase: .short IMAGE_DOS_SIGNATURE /* 'MZ' */ - .skip 58 /* 'MZ' + pad + offset == 64 */ + .skip 46 /* 'MZ' + pad + offset == 64 */ + .long 0x43534952 /* Linux magic "RISCV */ + .long 0x00000056 + .long 0x05435352 /* Linux magic2 "RSC\x05*/ .long pe_header - ImageBase /* Offset to the PE header */ pe_header: .long IMAGE_NT_SIGNATURE /* 'PE' */ @@ -72,7 +75,7 @@ extra_header_fields: .long 0x8 /* FileAlignment */ .short 0 /* MajorOperatingSystemVersion */ .short 0 /* MinorOperatingSystemVersion */ - .short 0 /* MajorImageVersion */ + .short 1 /* MajorImageVersion */ .short 0 /* MinorImageVersion */ .short 0 /* MajorSubsystemVersion */ .short 0 /* MinorSubsystemVersion */ |