mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
efi_selftest: allow building relocation code on x86_64
Variables EFI_RELOC and EFI_CRT0 have to be defined to build the EFI unit tests. This patch ensures this for the x86 architecure. If we compile with EFI_STUB, the bitness depends on CONFIG_EFI_STUB_64BIT. Otherwise the bitness depends on CONFIG_X86_64. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
a4aa7bef3c
commit
508d856704
1 changed files with 16 additions and 4 deletions
|
@ -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_LDS := elf_x86_64_efi.lds
|
||||
EFI_CRT0 := crt0_x86_64_efi.o
|
||||
EFI_RELOC := reloc_x86_64_efi.o
|
||||
else
|
||||
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
|
||||
|
||||
endif
|
||||
|
|
Loading…
Add table
Reference in a new issue