mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-03 11:41:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

riscv: Fix efi header size for RV32

Browse Source 
This patch depends on Atish's patch.
(https://patchwork.ozlabs.org/project/uboot/patch/20201013192331.3236458-1-atish.patra@wdc.com/)

Modify the size of the Optional Header "Windows-Specific Fields" to fit with the specification.
(https://docs.microsoft.com/en-us/windows/win32/debug/pe-format)

Signed-off-by: Leo Yu-Chi Liang <ycliang@andestech.com>
Cc: rick@andestech.com
Cc: alankao@andestech.com
Cc: atish.patra@wdc.com
Cc: xypron.glpk@gmx.de
Cc: bmeng.cn@gmail.com
This commit is contained in:
Leo Yu-Chi Liang 2020-11-12 10:09:52 +08:00 committed by Andes
parent 84c3db2ea3
commit 9ea6952a9a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/riscv/lib/crt0_riscv_efi.S
View File

@ -15,13 +15,13 @@
#define SAVE_LONG(reg, idx) sd reg, (idx*SIZE_LONG)(sp) #define SAVE_LONG(reg, idx) sd reg, (idx*SIZE_LONG)(sp)
#define LOAD_LONG(reg, idx) ld reg, (idx*SIZE_LONG)(sp) #define LOAD_LONG(reg, idx) ld reg, (idx*SIZE_LONG)(sp)
#define PE_MACHINE IMAGE_FILE_MACHINE_RISCV64 #define PE_MACHINE IMAGE_FILE_MACHINE_RISCV64
#define PE_MAGIC IMAGE_NT_OPTIONAL_HDR64_MAGIC #define PE_MAGIC IMAGE_NT_OPTIONAL_HDR64_MAGIC
#else #else
#define SIZE_LONG 4 #define SIZE_LONG 4
#define SAVE_LONG(reg, idx) sw reg, (idx*SIZE_LONG)(sp) #define SAVE_LONG(reg, idx) sw reg, (idx*SIZE_LONG)(sp)
#define LOAD_LONG(reg, idx) lw reg, (idx*SIZE_LONG)(sp) #define LOAD_LONG(reg, idx) lw reg, (idx*SIZE_LONG)(sp)
#define PE_MACHINE IMAGE_FILE_MACHINE_RISCV32 #define PE_MACHINE IMAGE_FILE_MACHINE_RISCV32
#define PE_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC #define PE_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC
#endif #endif
@ -50,7 +50,7 @@ coff_header:
IMAGE_FILE_LOCAL_SYMS_STRIPPED | \ IMAGE_FILE_LOCAL_SYMS_STRIPPED | \
IMAGE_FILE_DEBUG_STRIPPED) IMAGE_FILE_DEBUG_STRIPPED)
optional_header: optional_header:
.short PE_MAGIC /* PE32+ format */ .short PE_MAGIC /* PE32(+) format */
.byte 0x02 /* MajorLinkerVersion */ .byte 0x02 /* MajorLinkerVersion */
.byte 0x14 /* MinorLinkerVersion */ .byte 0x14 /* MinorLinkerVersion */
.long _edata - _start /* SizeOfCode */ .long _edata - _start /* SizeOfCode */
@ -63,7 +63,11 @@ optional_header:
#endif #endif
extra_header_fields: extra_header_fields:
#if __riscv_xlen == 32
.long 0 /* ImageBase */
#else
.quad 0 /* ImageBase */ .quad 0 /* ImageBase */
#endif
.long 0x20 /* SectionAlignment */ .long 0x20 /* SectionAlignment */
.long 0x8 /* FileAlignment */ .long 0x8 /* FileAlignment */
.short 0 /* MajorOperatingSystemVersion */ .short 0 /* MajorOperatingSystemVersion */
@ -83,10 +87,17 @@ extra_header_fields:
.long 0 /* CheckSum */ .long 0 /* CheckSum */
.short IMAGE_SUBSYSTEM_EFI_APPLICATION /* Subsystem */ .short IMAGE_SUBSYSTEM_EFI_APPLICATION /* Subsystem */
.short 0 /* DllCharacteristics */ .short 0 /* DllCharacteristics */
#if __riscv_xlen == 32
.long 0 /* SizeOfStackReserve */
.long 0 /* SizeOfStackCommit */
.long 0 /* SizeOfHeapReserve */
.long 0 /* SizeOfHeapCommit */
#else
.quad 0 /* SizeOfStackReserve */ .quad 0 /* SizeOfStackReserve */
.quad 0 /* SizeOfStackCommit */ .quad 0 /* SizeOfStackCommit */
.quad 0 /* SizeOfHeapReserve */ .quad 0 /* SizeOfHeapReserve */
.quad 0 /* SizeOfHeapCommit */ .quad 0 /* SizeOfHeapCommit */
#endif
.long 0 /* LoaderFlags */ .long 0 /* LoaderFlags */
.long 0x6 /* NumberOfRvaAndSizes */ .long 0x6 /* NumberOfRvaAndSizes */