hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mixed-mode' into efi-for-mingo

This commit is contained in:
Matt Fleming 2014-03-05 18:18:50 +00:00
parent 994448f1af 3db4cafdfd
commit 617b3c37da
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/boot/compressed/head_32.S
View File

@ -229,12 +229,14 @@ relocated:
xorl %ebx, %ebx xorl %ebx, %ebx
jmp *%eax jmp *%eax
#ifdef CONFIG_EFI_STUB
.data .data
efi32_config: efi32_config:
.fill 11,8,0 .fill 11,8,0
.long efi_call_phys .long efi_call_phys
.long 0 .long 0
.byte 0 .byte 0
#endif
/* /*
* Stack and heap for uncompression * Stack and heap for uncompression

3
arch/x86/boot/compressed/head_64.S
View File

@ -440,6 +440,7 @@ gdt:
.quad 0x0000000000000000 /* TS continued */ .quad 0x0000000000000000 /* TS continued */
gdt_end: gdt_end:
#ifdef CONFIG_EFI_STUB
efi_config: efi_config:
.quad 0 .quad 0
@ -456,6 +457,8 @@ efi64_config:
.fill 11,8,0 .fill 11,8,0
.quad efi_call6 .quad efi_call6
.byte 1 .byte 1
#endif /* CONFIG_EFI_STUB */
/* /*
* Stack and heap for uncompression * Stack and heap for uncompression
*/ */

7
arch/x86/boot/tools/build.c
View File

@ -256,10 +256,11 @@ static void efi_stub_entry_update(void)
#else #else
static inline void update_pecoff_setup_and_reloc(unsigned int) {} static inline void update_pecoff_setup_and_reloc(unsigned int size) {}
static inline void update_pecoff_text(unsigned int, unsigned int) {} static inline void update_pecoff_text(unsigned int text_start,
unsigned int file_sz) {}
static inline void efi_stub_defaults(void) {} static inline void efi_stub_defaults(void) {}
static inline void efi_stup_entry_update(void) {} static inline void efi_stub_entry_update(void) {}
static inline int reserve_pecoff_reloc_section(int c) static inline int reserve_pecoff_reloc_section(int c)
{ {