Skip to content

Commit

Permalink
x86/boot: Fix non-EFI build
Browse files Browse the repository at this point in the history
The kbuild test robot reported the following errors, introduced with
commit 54b52d8 ("x86/efi: Build our own EFI services pointer
table"),

 arch/x86/boot/compressed/head_32.o: In function `efi32_config':
>> (.data+0x58): undefined reference to `efi_call_phys'

 arch/x86/boot/compressed/head_64.o: In function `efi64_config':
>> (.data+0x90): undefined reference to `efi_call6'

Wrap the efi*_config structures in #ifdef CONFIG_EFI_STUB so that we
don't make references to EFI functions if they're not compiled in.

Signed-off-by: Matt Fleming <matt.fleming@intel.com>
  • Loading branch information
Matt Fleming committed Mar 5, 2014
1 parent b663a68 commit 3db4caf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/x86/boot/compressed/head_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions arch/x86/boot/compressed/head_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ gdt:
.quad 0x0000000000000000 /* TS continued */
gdt_end:

#ifdef CONFIG_EFI_STUB
efi_config:
.quad 0

Expand All @@ -456,6 +457,8 @@ efi64_config:
.fill 11,8,0
.quad efi_call6
.byte 1
#endif /* CONFIG_EFI_STUB */

/*
* Stack and heap for uncompression
*/
Expand Down

0 comments on commit 3db4caf

Please sign in to comment.