Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 617b3c37 authored by Matt Fleming's avatar Matt Fleming
Browse files

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

parents 994448f1 3db4cafd

arch/x86/boot/compressed/head_32.S

+2 −0
Original line number Diff line number Diff line
@@ -229,12 +229,14 @@ relocated: 
	xorl	%ebx, %ebx

	jmp	*%eax



#ifdef CONFIG_EFI_STUB

	.data

efi32_config:

	.fill 11,8,0

	.long efi_call_phys

	.long 0

	.byte 0

#endif



/*

 * Stack and heap for uncompression

arch/x86/boot/compressed/head_64.S

+3 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ gdt: 
	.quad   0x0000000000000000	/* TS continued */

gdt_end:



#ifdef CONFIG_EFI_STUB

efi_config:

	.quad	0
@@ -456,6 +457,8 @@ efi64_config: 
	.fill	11,8,0

	.quad	efi_call6

	.byte	1

#endif /* CONFIG_EFI_STUB */



/*

 * Stack and heap for uncompression

 */

arch/x86/boot/tools/build.c

+4 −3
Original line number Diff line number Diff line
@@ -256,10 +256,11 @@ static void efi_stub_entry_update(void) 


#else



static inline void update_pecoff_setup_and_reloc(unsigned int) {}

static inline void update_pecoff_text(unsigned int, unsigned int) {}

static inline void update_pecoff_setup_and_reloc(unsigned int size) {}

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_stup_entry_update(void) {}

static inline void efi_stub_entry_update(void) {}



static inline int reserve_pecoff_reloc_section(int c)

{