diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-03 12:27:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-03 12:27:56 -0400 |
| commit | a0115ceb56ad71c3c34091d9d8ba5938708c900d (patch) | |
| tree | a5a434d90cab87552a360598995569b2defb573a /arch/x86/config.mk | |
| parent | 22781fca1d5aa9270a42271f9c20d97b85f72b73 (diff) | |
| parent | 80483b2ab62ca7cd200db445b6920ee96d17df88 (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-06-03
A number of fixes and feature completeness work this time around:
- Fix sunxi GOP reservation
- Fix cursor position
- Fix efi_get_variable
- Allow more selftest parts to build on x86_64
- Allow unaligned memory access on armv7
- Implement ReinstallProtocolInterface
- More sandbox preparation
Diffstat (limited to 'arch/x86/config.mk')
| -rw-r--r-- | arch/x86/config.mk | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 97db03deee..5f77f98e60 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -86,9 +86,9 @@ else PLATFORM_CPPFLAGS += -D__I386__ endif -ifneq ($(CONFIG_EFI_STUB)$(CONFIG_CMD_BOOTEFI_HELLO_COMPILE),) +ifdef CONFIG_EFI_STUB -ifneq ($(CONFIG_EFI_STUB_64BIT),) +ifdef CONFIG_EFI_STUB_64BIT EFI_LDS := elf_x86_64_efi.lds EFI_CRT0 := crt0_x86_64_efi.o EFI_RELOC := reloc_x86_64_efi.o @@ -98,10 +98,22 @@ EFI_CRT0 := crt0_ia32_efi.o EFI_RELOC := reloc_ia32_efi.o endif +else + ifdef CONFIG_X86_64 -EFI_TARGET := --target=efi-app-x86_64 +EFI_LDS := elf_x86_64_efi.lds +EFI_CRT0 := crt0_x86_64_efi.o +EFI_RELOC := reloc_x86_64_efi.o else -EFI_TARGET := --target=efi-app-ia32 +EFI_LDS := elf_ia32_efi.lds +EFI_CRT0 := crt0_ia32_efi.o +EFI_RELOC := reloc_ia32_efi.o +endif + endif +ifdef CONFIG_X86_64 +EFI_TARGET := --target=efi-app-x86_64 +else +EFI_TARGET := --target=efi-app-ia32 endif |